Merge pull request #2312 from sopel-irc/graceful-userhost-in-names

coretasks: gracefully handle missing hostmask with userhost-in-names

sopel/coretasks.py

@@ -520,11 +520,20 @@ def handle_names(bot, trigger):
 
     names = trigger.split()
     for name in names:
+        username = hostname = None
+
         if uhnames or userhost_in_names:
-            name, mask = name.rsplit('!', 1)
-            username, hostname = mask.split('@', 1)
-        else:
-            username = hostname = None
+            try:
+                name, mask = name.rsplit('!', 1)
+                username, hostname = mask.split('@', 1)
+            except ValueError:
+                # server advertised either UHNAMES or userhost-in-names, but
+                # isn't sending the hostmask with all listed nicks
+                # It's probably ZNC. https://github.com/znc/znc/issues/1224
+                LOGGER.debug(
+                    '%s is enabled, but still got RPL_NAMREPLY item without a hostmask. '
+                    'IRC server/bouncer is not spec compliant.',
+                    'UHNAMES' if uhnames else 'userhost-in-names')
 
         priv = 0
         for prefix, value in mapping.items():

test/test_coretasks.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from datetime import datetime, timezone
+import logging
 
 import pytest
 
@@ -558,3 +559,18 @@ def test_join_time(mockbot):
     assert mockbot.channels["#test"].join_time == datetime(
         2021, 1, 1, 12, 0, 0, 15000, tzinfo=timezone.utc
     )
+
+
+def test_handle_rpl_namreply_with_malformed_uhnames(mockbot, caplog):
+    """Make sure Sopel can cope with expected but missing hostmask in 353"""
+    caplog.set_level(logging.DEBUG)
+    mockbot.on_message(
+        ':somenet.behind.znc 005 Sopel '
+        'UHNAMES '
+        ':are supported by this server')
+    mockbot.on_message(
+        ':somenet.behind.znc 353 Sopel = #sopel '
+        ':[email protected] incorrect')
+
+    assert len(caplog.messages) == 1
+    assert 'RPL_NAMREPLY item without a hostmask' in caplog.messages[0]