Add support for WHOIS command on IRCListener

fakenet/listeners/IRCListener.py

@@ -100,6 +100,15 @@ def start(self):
         self.server.config = self.config
         self.server.servername = self.config.get('servername', 'localhost')
 
+        if self.server.servername.startswith('!'):
+            self.server.servername = self.server.servername[1:]
+            if self.server.servername.lower() == "random":
+                self.server.servername = self.randomizeHostname()
+            elif self.server.servername.lower() == "gethostname":
+                self.server.servername = socket.gethostname()
+            else:
+                raise ValueError('ServerName config invalid escape: !%s' % (servername))
+
         self.server_thread = threading.Thread(target=self.server.serve_forever)
         self.server_thread.daemon = True
         self.server_thread.start()
@@ -159,6 +168,12 @@ def irc_DEFAULT(self, cmd, params):
         self.server.logger.info('Client issued an unknown command %s %s', cmd, params)      
         self.irc_send_server("421", "%s :Unknown command" % cmd)          
 
+    def irc_WHOIS(self, cmd, params):
+        output = f"{self.nick} {self.user} {self.server.servername} * {self.realname}"
+        self.irc_send_server("311", output)
+        self.server.logger.info("Client has issued WHOIS command: " + output)
+        self.irc_send_server("318", "%s :End of /WHOIS list" % self.nick)
+
     def irc_NICK(self, cmd, params):
 
         self.nick = params

test/test.py

@@ -129,6 +129,9 @@ def _irc_evt_handler(self, srv, evt):
             if (evt.arguments[0].startswith(self.black_market) and
                 evt.target == self.pub_chan):
                 self.pubmsg_ok = True
+        elif evt.type == "whois":
+            if (evt.arguments[0].startswith(self.nick)):
+                self.whois_ok = True
 
     def _irc_script(self, srv):
         """Callback manages individual test cases for IRC."""
@@ -137,12 +140,14 @@ def _irc_script(self, srv):
         self.join_ok = False
         self.privmsg_ok = False
         self.pubmsg_ok = False
+        self.whois_ok = False
 
         # This handler should set the success flags in success cases
         srv.add_global_handler('join', self._irc_evt_handler)
         srv.add_global_handler('welcome', self._irc_evt_handler)
         srv.add_global_handler('privmsg', self._irc_evt_handler)
         srv.add_global_handler('pubmsg', self._irc_evt_handler)
+        srv.add_global_handler('whois', self._irc_evt_handler)
 
         # Issue all commands, indirectly invoking the event handler for each
         # flag
@@ -156,6 +161,9 @@ def _irc_script(self, srv):
         srv.privmsg(self.clouseau, self.safehouse)
         srv.process_data()
 
+        srv.whois([self.clouseau])
+        srv.process_data()
+
         srv.quit()
         srv.process_data()
 
@@ -171,11 +179,15 @@ def _irc_script(self, srv):
         if not self.pubmsg_ok:
             raise FakeNetTestException('pubmsg test failed')
 
+        if not self.whois_ok:
+            raise FakeNetTestException('whois test failed')
+
         return all([
             self.welcome_ok,
             self.join_ok,
             self.privmsg_ok,
-            self.pubmsg_ok
+            self.pubmsg_ok,
+            self.whois_ok
            ])
 
     def _run_irc_script(self, nm, callback):