Merge branch 'refs/heads/admin-verification-update'

Author: Motoko11

motobot/__init__.py

@@ -4,7 +4,7 @@
 from .decorators import hook, command, match, sink, request
 from .priority import Priority
 from .modifiers import Action, CTCP, Target, Command, Notice, Eat
-from .utilities import strip_control_codes, split_response, Context, BotError
+from .utilities import strip_control_codes, split_response, Context, BotError, hostmask_check
 
 
 __VERSION__ = '0.3'

motobot/core_plugins/ctcp.py

@@ -8,12 +8,12 @@ def ctcp_match(bot, context, message, match):
         'VERSION': 'MotoBot Version ' + __VERSION__,
         'FINGER': 'Oh you dirty man!',
         'TIME': strftime('%a %b %d %H:%M:%S UTC', gmtime()),
-        'PING': message
+        'PING': message.strip('\x01')
     }
     try:
-        ctcp_req = match.group(1)
+        ctcp_req = match.group(1).split(' ', 1)[0]
         reply = ctcp_response[ctcp_req]
-        response = (reply, Notice(context.nick), Eat)
+        response = ('\x01{}\x01'.format(reply), Notice(context.nick), Eat)
     except KeyError:
         response = None
     return response

motobot/core_plugins/master_verification.py

@@ -1,95 +1,81 @@
-from motobot import hook, sink, request, Priority
-
-
-def get_master_lists(bot, session):
-    confirmed, unconfirmed = session.get((set(), None))
-
-    if unconfirmed is None:
-        unconfirmed = set(map(str.lower, bot.masters))
-        session.set((confirmed, unconfirmed))
-
-    return confirmed, unconfirmed
+from motobot import hook, request, command, BotError, Notice, hostmask_check, Priority, IRCLevel, split_response
 
 
 @request('IS_MASTER')
-def is_master_request(bot, context, nick):
-    confirmed = get_master_lists(bot, context.session)[0]
-    return nick.lower() in confirmed
-
+def is_master_request(bot, context, nick, host=None):
+    recognised = context.session.get(set())
+    admin_masks = context.database.get([])
+    return nick.lower() in recognised or \
+           any(hostmask_check(nick, host, mask) for mask in admin_masks)
 
-def check(bot, session, nick):
-    """ Check a user by sending a WHOIS query. """
-    confirmed, unconfirmed = get_master_lists(bot, session)
-
-    if nick.lower() in unconfirmed:
-        bot.send('WHOIS ' + nick)
-
-
-def verify(bot, session, nick):
-    """ Mark a master as verified in the bot. """
-    nick = nick.lower()
-    confirmed, unconfirmed = get_master_lists(bot, session)
 
+@command('identify', hidden=True, priority=Priority.max)
+def identify_command(bot, context, message, args):
     try:
-        unconfirmed.remove(nick)
-        confirmed.add(nick)
-    except KeyError:
-        pass
+        password = bot.admin_pass
+    except AttributeError:
+        raise BotError("Error: I've not been configured with a password.", Notice(context.nick))
 
+    input_pass = ' '.join(args[1:])
+    if input_pass == password:
+        recognise(context.session, context.nick)
+        response = 'You are now recognised as a bot admin.'
+    else:
+        response = 'Error: Password incorrect.'
+    return response, Notice(context.nick)
 
-def unverify(bot, session, nick):
-    """ Unmark a user as verified in the bot. """
-    nick = nick.lower()
-    confirmed, unconfirmed = get_master_lists(bot, session)
-
-    try:
-        confirmed.remove(nick)
-        unconfirmed.add(nick)
-    except KeyError:
-        pass
 
+def recognise(session, nick):
+    admins = session.get(set())
+    admins.add(nick.lower())
+    session.set(admins)
 
-@hook('307')
-def registered_nick_confirm_rizon(bot, context, message):
-    """ Hooks the user is registered reply from a WHOIS query and verifies user. """
-    verify(bot, context.session, message.params[1])
 
-
-@hook('330')
-def registered_nick_confirm_freenode(bot, context, message):
-    """ Hooks the user is registered reply from a WHOIS query and verifies user. """
-    if message.params[1] == message.params[2]:
-        verify(bot, context.session, message.params[2])
-
-
-@sink(priority=Priority.max)
-def master_verification_sink(bot, context, message):
-    """ Checks a user that speaks in the channel. """
-    check(bot, context.session, context.nick)
-
-
-@hook('353')
-def handle_names(bot, context, message):
-    """ Check users whom are present in the channel upon joining. """
-    names = message.params[-1].split(' ')
-    for name in names:
-        check(bot, context.session, name.lstrip('+%@&~'))
-
-
-@hook('JOIN')
-def handle_join(bot, context, message):
-    """ Check a user that joins a channel. """
-    check(bot, context.session, message.nick)
+@command('adminmask', level=IRCLevel.master)
+def adminmask_command(bot, context, message, args):
+    try:
+        arg = args[1].lower()
+        if arg == 'add':
+            response = add_mask(context.database, args[2])
+        elif arg in ('del', 'rem'):
+            response = del_mask(context.database, args[2])
+        elif arg in ('show', 'list'):
+            response = show_masks(context.database)
+        else:
+            response = 'Error: Invalid argument;'
+    except IndexError:
+        response = "Not enough arguments provided."
+    return response, Notice(context.nick)
+
+
+def add_mask(database, mask):
+    masks = database.get([])
+    if mask not in masks:
+        masks.append(mask)
+        database.set(masks)
+        response = "Mask added successfully."
+    else:
+        response = "Error: Mask already in masks list."
+    return response
+
+
+def del_mask(database, mask):
+    masks = database.get([])
+    try:
+        masks.remove(mask)
+        database.set(masks)
+        response = "Mask successfully deleted."
+    except ValueError:
+        response = "Error: Mask not in masks list."
+    return response
 
 
-@hook('NICK')
-def handle_nick(bot, context, message):
-    """ Unmark a user as verified in the bot and check new nick. """
-    unverify(bot, context.session, message.nick)
-    check(bot, context.session, message.params[0])
+def show_masks(database):
+    masks = database.get([])
 
+    if masks:
+        response = split_response(masks, "Admin masks: {};")
+    else:
+        response = "I don't have any admin masks."
 
-@hook('QUIT')
-def handle_quit(bot, context, message):
-    """ Unmark a user as verified in the bot upon quit. """
-    unverify(bot, context.session, message.nick)
+    return response

motobot/core_plugins/privmsg_handlers.py

@@ -134,7 +134,7 @@ def handle_command(plugin, bot, context, message):
     test = message.split(' ', 1)[0]
 
     if trigger == test:
-        alt = bot.request('USERLEVEL', context.channel, context.nick) < plugin.level
+        alt = bot.request('USERLEVEL', context.channel, context.nick, context.host) < plugin.level
         func = plugin.func if not alt else plugin.alt
         if func is not None:
             args = message[len(bot.command_prefix):].split(' ')
@@ -144,14 +144,14 @@ def handle_command(plugin, bot, context, message):
 def handle_match(plugin, bot, context, message):
     match = plugin.arg.search(message)
     if match is not None:
-        alt = bot.request('USERLEVEL', context.channel, context.nick) < plugin.level
+        alt = bot.request('USERLEVEL', context.channel, context.nick, context.host) < plugin.level
         func = plugin.func if not alt else plugin.alt
         if func is not None:
             return func(bot, context, message, match)
 
 
 def handle_sink(plugin, bot, context, message):
-    alt = bot.request('USERLEVEL', context.channel, context.nick) < plugin.level
+    alt = bot.request('USERLEVEL', context.channel, context.nick, context.host) < plugin.level
     func = plugin.func if not alt else plugin.alt
     if func is not None:
         return func(bot, context, message)

motobot/core_plugins/userlist_handlers.py

@@ -26,10 +26,10 @@ def userlist_request(bot, context, channel):
 
 
 @request('USERLEVEL')
-def userlevel_request(bot, context, channel, nick):
+def userlevel_request(bot, context, channel, nick, host=None):
     userlevel_data = context.session.get({})
     level = IRCLevel.user
-    if bot.request('IS_MASTER', nick):
+    if bot.request('IS_MASTER', nick, host):
         level = IRCLevel.master
     elif channel.lower() == bot.nick.lower():
         level = IRCLevel.owner

motobot/utilities.py

@@ -1,5 +1,6 @@
 from collections import namedtuple
-from re import compile
+from re import compile, match, IGNORECASE
+from fnmatch import translate
 
 
 Context = namedtuple('Context', 'nick channel host database session')
@@ -35,3 +36,10 @@ def strip_control_codes(input):
     """ Strip the control codes from the input. """
     output = pattern.sub('', input)
     return output
+
+
+def hostmask_check(nick, host, mask):
+    """ Check a nick and host against a hostmask. """
+    nickhost = "{}!{}".format(nick, host)
+    mask_regex = translate(mask)
+    return match(mask_regex, nickhost, IGNORECASE)