From 4b6a54f8bff3015d2f6e9cd0ee7cc2a2f0bc528a Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Aug 2015 13:47:13 +0200 Subject: Reaktor: reload config if name change detected --- Reaktor/config.py | 98 ---------------------------------- Reaktor/reaktor/config.py | 130 ++++++++++++++++++++++++++++++++++++++++++++++ Reaktor/reaktor/core.py | 11 ++++ 3 files changed, 141 insertions(+), 98 deletions(-) delete mode 100644 Reaktor/config.py create mode 100644 Reaktor/reaktor/config.py diff --git a/Reaktor/config.py b/Reaktor/config.py deleted file mode 100644 index 8a83b28e..00000000 --- a/Reaktor/config.py +++ /dev/null @@ -1,98 +0,0 @@ -from os.path import abspath, expanduser -import re - -debug = False - -name = 'crabmanner' - -#workdir = expanduser('~') + '/state' -workdir = '/home/reaktor/state' - -irc_alarm_timeout = 300 -irc_hammer_interval = 10 -irc_kill_timeout = 360 -irc_nickname = name -irc_server = 'irc.freenode.org' -irc_port = 6667 -irc_restart_timeout = 5 -irc_channels = [ - '#krebs' -] -admin_file=workdir+'/admin.lst' -auth_file=workdir+'/auth.lst' - -nag_env={ - 'hosts_repo': 'https://github.com/krebscode/hosts', - 'services_repo': 'gitolite@localhost:services', - 'inspect_services': 'false' -} - -config_filename = abspath(__file__) - -# me is used, so name cannot kill our patterns below -me = '\\b' + re.escape(name) + '\\b' -me_or_us = '(?:' + me + '|\\*)' - -def default_command(cap, cmd=None, env=None): - if not env: env = {} - if cmd == None: cmd=cap - return { - 'capname': cap, - 'pattern': '^' + me_or_us + ':\\s*' + cap + '\\s*(?:\\s+(?P.*))?$', - 'argv': [ 'commands/' + cmd ], - 'env': env - } - -def simple_command(cap, cmd=None, env={}): - if cmd == None: cmd=cap - return { - 'capname': cap, - 'pattern': '^' + cap + '\\s*(?:\\s+(?P.*))?$', - 'argv' : [ 'commands/' + cmd ], - 'env': env - } - -public_commands = [ - default_command('caps', env={ - 'config_filename': config_filename - }), - default_command('hello'), - default_command('badcommand'), - default_command('rev'), - default_command('uptime'), - default_command('nocommand'), - default_command('tell', cmd='tell-on_privmsg', env={ - 'state_file': workdir + '/tell.txt' - }), - default_command('nag', env=nag_env), - simple_command('identify', env={ - 'config_filename': config_filename - }), - # command not found - { 'pattern': '^' + me_or_us + ':.*', - 'argv': [ 'commands/respond','You are made of stupid!'] }, - # "highlight" - { 'pattern': '.*' + me + '.*', - 'argv': [ 'commands/say', 'I\'m famous' ] }, - # identify via direct connect -] -commands = [ - default_command('reload'), -] - -on_join = [ - { - 'capname': 'tell', - 'argv': [ 'commands/tell-on_join' ], - 'env': { 'state_file': workdir + '/tell.txt' } - } -] - -on_ping = [ - { - 'capname': 'nag', - 'argv': [ 'commands/nag' ], - 'env': nag_env, - 'targets': irc_channels - } -] diff --git a/Reaktor/reaktor/config.py b/Reaktor/reaktor/config.py new file mode 100644 index 00000000..73daa81f --- /dev/null +++ b/Reaktor/reaktor/config.py @@ -0,0 +1,130 @@ +import os +from os.path import abspath, expanduser,dirname,join +import reaktor # to get the path to the reaktor basedir +import re + +debug = True + +# IRC_NICKNAME is set if the nick changes and the config is getting reloaded +# TODO: do not implement functionality in the config :\ +name = os.environ.get('IRC_NICKNAME','crabmanner') + + +#workdir = expanduser('~') + '/state' +workdir = './state' + +irc_alarm_timeout = 300 +irc_hammer_interval = 10 +irc_kill_timeout = 360 +irc_nickname = name +irc_server = 'irc.freenode.org' +irc_port = 6667 +irc_restart_timeout = 5 +irc_channels = [ + '#krebs' +] +admin_file=workdir+'/admin.lst' +auth_file=workdir+'/auth.lst' + +nag_env={ + 'hosts_repo': 'https://github.com/krebscode/hosts', + 'services_repo': 'gitolite@localhost:services', + 'inspect_services': 'false' +} + +config_filename = abspath(__file__) + +mod_dir=dirname(abspath(reaktor.__file__)) +# the commands dirname ( +dist_dir = abspath(join(mod_dir,"..")) + +# me is used, so name cannot kill our patterns below + +# TODO: name may change after reconnect, then this pattern fails to match +# this may need a complete refactor of how to create patterns and matches +me = '\\b' + re.escape(name) + '\\b' +me_or_us = '(?:' + me + '|\\*)' + +def distc(cmd): + """ builds a path to a cmd in the distribution command folder""" + return join(dist_dir,"commands",cmd) + + +# using partial formatting {{}} +indirect_pattern='^{}:\\s*{{}}\\s*(?:\\s+(?P.*))?$'.format(me_or_us) +def default_command(cap, cmd=None, env=None): + """ (botname|*): cmd args + + query the bot in the channel, e.g.: + crabmanner: hello + *: hello + """ + if not env: env = {} + if cmd == None: cmd=cap + return { + 'capname': cap, + 'pattern': indirect_pattern.format(cap), + 'argv': [ distc(cmd) ], + 'env': env + } + +direct_pattern='^{}\\s*(?:\\s+(?P.*))?$' +def simple_command(cap, cmd=None, env=None): + """ cmd args + + query the bot directly, e.g.: /msg crabmanner identity dick butt + """ + if not env: env = {} + if cmd == None: cmd=cap + return { + 'capname': cap, + 'pattern': direct_pattern.format(cap), + 'argv' : [ distc( cmd ) ], + 'env': env + } + +public_commands = [ + default_command('caps', env={ + 'config_filename': config_filename + }), + default_command('hello'), + default_command('badcommand'), + default_command('rev'), + default_command('uptime'), + default_command('nocommand'), + default_command('tell', cmd='tell-on_privmsg', env={ + 'state_file': workdir + '/tell.txt' + }), + default_command('nag', env=nag_env), + simple_command('identify', env={ + 'config_filename': config_filename + }), + # command not found + { 'pattern': '^' + me_or_us + ':.*', + 'argv': [ distc('respond'),'You are made of stupid!'] }, + # "highlight" + { 'pattern': '.*' + me + '.*', + 'argv': [ distc('say'), 'I\'m famous' ] }, + # identify via direct connect +] + +commands = [ + default_command('reload'), +] + +on_join = [ + { + 'capname': 'tell', + 'argv': [ distc('tell-on_join') ], + 'env': { 'state_file': workdir + '/tell.txt' } + } +] + +on_ping = [ + { + 'capname': 'nag', + 'argv': [ distc('nag') ], + 'env': nag_env, + 'targets': irc_channels + } +] diff --git a/Reaktor/reaktor/core.py b/Reaktor/reaktor/core.py index 15166d9e..327d120a 100755 --- a/Reaktor/reaktor/core.py +++ b/Reaktor/reaktor/core.py @@ -58,6 +58,17 @@ class Reaktor(asybot): self.execute_command(command, None, prefix, params) def on_privmsg(self, prefix, command, params, rest): + if not ( self.nickname == self.getconf('name')): + # reload config if the name changed + # TODO: this sucks, use another sidechannel to tell config the new + # nickname + log.debug("nickname differs ('{}' to '{}')".format( + self.nickname, self.getconf('name'))) + + os.environ['IRC_NICKNAME'] = self.nickname + self.getconf = make_getconf(self.config) + log.info('nickname changed to {}'.format(self.getconf('name'))) + for command in self.getconf('commands'): y = match(command['pattern'], rest) if y: -- cgit v1.2.3