Merge remote-tracking branch 'BiohZn/quakenet-auth' into release/2.3

cardinal.py

@@ -63,9 +63,10 @@
     # Define the config spec and create a parser for our internal config
     spec = ConfigSpec()
     spec.add_option('nickname', basestring, 'Cardinal')
-    spec.add_option('password', basestring, None)
     spec.add_option('username', basestring, None)
     spec.add_option('realname', basestring, None)
+    spec.add_option('authname', basestring, None)
+    spec.add_option('password', basestring, None)
     spec.add_option('network', basestring, 'irc.freenode.net')
     spec.add_option('port', int, 6667)
     spec.add_option('server_password', basestring, None)
@@ -167,10 +168,9 @@
     # Instance a new factory, and connect with/without SSL
     logger.debug("Instantiating CardinalBotFactory")
     factory = CardinalBotFactory(config['network'], config['server_password'],
-                                 config['channels'],
-                                 config['nickname'], config['password'],
-                                 config['username'],
-                                 config['realname'],
+                                 config['channels'], config['nickname'],
+                                 config['username'], config['realname'],
+                                 config['authname'], config['password'],
                                  config['plugins'],
                                  storage_path)
 

cardinal/bot.py

@@ -115,9 +115,19 @@ def signedOn(self):
 
         # Set the currently connected network
         self.network = self.factory.network
-
+        self.network_alias = self.factory.network.split('.')[-2]
+
+        if self.network_alias == 'quakenet':
+            if self.factory.authname and self.factory.password:
+                self.logger.info("Attempting to authenticate with Q")
+                self.send(
+                    'AUTH %s %s' % (
+                        self.factory.authname,
+                        self.factory.password
+                    )
+                )
         # Attempt to identify with NickServ, if a password was given
-        if self.factory.password:
+        elif self.factory.password:
             self.logger.info("Attempting to identify with NickServ")
             self.msg("NickServ", "IDENTIFY %s" % (self.factory.password,))
 
@@ -527,8 +537,9 @@ class CardinalBotFactory(protocol.ClientFactory):
     """Keeps track of plugin reloads from within Cardinal"""
 
     def __init__(self, network, server_password=None, channels=None,
-                 nickname='Cardinal', password=None, username=None,
-                 realname=None, plugins=None, storage=None):
+                 nickname='Cardinal', username=None, realname=None,
+                 authname=None, password=None,
+                 plugins=None, storage=None):
         """Boots the bot, triggers connection, and initializes logging.
 
         Keyword arguments:
@@ -550,6 +561,7 @@ def __init__(self, network, server_password=None, channels=None,
         self.logger = logging.getLogger(__name__)
         self.network = network.lower()
         self.server_password = server_password
+        self.authname = authname
         self.password = password
         self.channels = channels
         self.nickname = nickname

config.json.example

@@ -1,6 +1,7 @@
 {
     "nickname": "Cardinal",
-    "password": "NICKSERV PASSWORD",
+    "authname": "USERNAME TO AUTH WITH",
+    "password": "NICKSERV/AUTH PASSWORD",
     "username": "cardinal",
     "realname": "The most awesome irc bot.",
     "network": "irc.darkscience.net",