From 3aa12f6bcaf0ed4d7e55d686e8a0a4dc45301c36 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 13 Sep 2011 17:04:45 +0200 Subject: //Reaktor/IRC: replace irclib with own async bot Unfortunately irclib failed to detect stale connections. Asyboy comes to the rescue (maybe).^_^->deal with it...^_^ --- Reaktor/IRC/asybot.py | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++ Reaktor/IRC/bot.py | 34 ---------- Reaktor/IRC/bot2.py | 130 -------------------------------------- Reaktor/IRC/content | 1 - Reaktor/IRC/index | 2 +- Reaktor/IRC/install | 28 --------- 6 files changed, 170 insertions(+), 194 deletions(-) create mode 100755 Reaktor/IRC/asybot.py delete mode 100755 Reaktor/IRC/bot.py delete mode 100755 Reaktor/IRC/bot2.py delete mode 100644 Reaktor/IRC/content delete mode 100755 Reaktor/IRC/install (limited to 'Reaktor/IRC') diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py new file mode 100755 index 00000000..6e9df1d9 --- /dev/null +++ b/Reaktor/IRC/asybot.py @@ -0,0 +1,169 @@ +#! /usr/bin/env python +# +# //Reaktor/IRC/asybot.py +# + +from __future__ import print_function + +def is_executable(x): + import os + return os.path.exists(x) and os.access(x, os.X_OK) + +from asynchat import async_chat as asychat +from asyncore import loop +from socket import AF_INET, SOCK_STREAM +from signal import SIGALRM, signal, alarm +from datetime import datetime as date, timedelta +from sys import exit +from re import split, search +class asybot(asychat): + def __init__(self, server, port, nickname, targets, **kwargs): + asychat.__init__(self) + self.server = server + self.port = port + self.nickname = nickname + self.targets = targets + self.username = kwargs['username'] if 'username' in kwargs else nickname + self.hostname = kwargs['hostname'] if 'hostname' in kwargs else nickname + self.ircname = kwargs['ircname'] if 'ircname' in kwargs else nickname + self.realname = kwargs['realname'] if 'realname' in kwargs else nickname + self.data = '' + self.set_terminator('\r\n') + self.create_socket(AF_INET, SOCK_STREAM) + self.connect((self.server, self.port)) + self.alarm_timeout = 300 + self.kill_timeout = 360 + self.last_activity = date.now() + signal(SIGALRM, lambda signum, frame: self.alarm_handler()) + alarm(self.alarm_timeout) + loop() + + def alarm_handler(self): + delta = date.now() - self.last_activity + if delta > timedelta(seconds=self.kill_timeout): + print('kill alarm %s' % delta) + exit() + else: + print('alarm %s' % delta) + self.push('PING :asybot') + alarm(self.alarm_timeout) + + def collect_incoming_data(self, data): + self.data += data + + def found_terminator(self): + print('< %s' % self.data) + self.last_activity = date.now() + + message = self.data + self.data = '' + + _, prefix, command, params, rest, _ = \ + split('^(?::(\S+)\s)?(\S+)((?:\s[^:]\S*)*)(?:\s:(.*))?$', message) + params = params.split(' ')[1:] + #print([prefix, command, params, rest]) + + if command == 'PING': + self.push('PONG :%s' % rest) + + elif command == 'PRIVMSG': + self.on_privmsg(prefix, command, params, rest) + + # reset alarm + alarm(self.alarm_timeout) + + def push(self, message): + print('> %s' % message) + asychat.push(self, message + self.get_terminator()) + + def handle_connect(self): + self.push('NICK %s' % self.nickname) + self.push('USER %s %s %s :%s' % + (self.username, self.hostname, self.server, self.realname)) + self.push('JOIN %s' % ','.join(self.targets)) + + def on_privmsg(self, prefix, command, params, rest): + def PRIVMSG(text): + self.push('PRIVMSG %s :%s' % (','.join(params), text)) + + def ME(text): + PRIVMSG('ACTION ' + text + '') + + _from = prefix.split('!', 1)[0] + + try: + _, _handle, _command, _argument, _ = split( + '^(\w+|\*):\s*(\w+)(?:\s+(.*))?$', rest) + except ValueError, error: + if search(self.nickname, rest): + PRIVMSG('I\'m so famous') + return # ignore + + if _handle == self.nickname or _handle == '*': + + from os.path import realpath, dirname, join + from subprocess import Popen as popen, PIPE + + Reaktor_dir = dirname(realpath(dirname(__file__))) + public_commands = join(Reaktor_dir, 'public_commands') + command = join(public_commands, _command) + + if is_executable(command): + + env = {} + if _argument != None: + env['argument'] = _argument + + try: + p = popen([command], stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env) + except OSError, error: + ME('is made of stupid') + print('OSError@%s: %s' % (command, error)) + return + + stdout, stderr = [ x[:len(x)-1] for x in + [ x.split('\n') for x in p.communicate()]] + code = p.returncode + pid = p.pid + + print('command: %s -> %s' % (command, code)) + [print('%s stdout: %s' % (pid, x)) for x in stdout] + [print('%s stderr: %s' % (pid, x)) for x in stderr] + + if code == 0: + [PRIVMSG(x) for x in stdout] + [PRIVMSG(x) for x in stderr] + else: + ME('mimimi') + + else: + if _handle != '*': + PRIVMSG(_from + ': you are made of stupid') + +# retrieve the value of a [singleton] variable from a tinc.conf(5)-like file +def getconf1(x, path): + from re import findall + pattern = '(?:^|\n)\s*' + x + '\s*=\s*(.*\w)\s*(?:\n|$)' + y = findall(pattern, open(path, 'r').read()) + if len(y) < 1: + raise AttributeError("len(getconf1('%s', '%s') < 1)" % (x, path)) + if len(y) > 1: + y = ' '.join(y) + raise AttributeError("len(getconf1('%s', '%s') > 1)\n ====> %s" + % (x, path, y)) + return y[0] + +if __name__ == "__main__": + from os import environ as env + name = getconf1('Name', '/etc/tinc/retiolum/tinc.conf') + hostname = '%s.retiolum' % name + nick = str(env.get('nick', name)) + host = str(env.get('host', 'supernode')) + port = int(env.get('port', 6667)) + target = str(env.get('target', '#retiolum')) + print('====> irc://%s@%s:%s/%s' % (nick, host, port, target)) + + from getpass import getuser + asybot(host, port, nick, [target], username=getuser(), + ircname='//Reaktor running at %s' % hostname, + hostname=hostname) diff --git a/Reaktor/IRC/bot.py b/Reaktor/IRC/bot.py deleted file mode 100755 index af974f4e..00000000 --- a/Reaktor/IRC/bot.py +++ /dev/null @@ -1,34 +0,0 @@ -#! /usr/bin/env python2 - -from irclib import IRC, ServerConnectionError, is_channel -from sys import exit -from os import environ as env - -host = str(env.get('host', 'irc.freenode.org')) -port = int(env.get('port', 6667)) -nick = str(env.get('nick', 'crabspasm')) -channel = str(env.get('channel', '#tincspasm')) -print '====> irc://%s@%s:%s/%s' % (nick, host, port, channel) - -irc = IRC() -try: - client = irc.server().connect(host, port, nick) -except ServerConnectionError, error: - print error - exit - -def on_connect(connection, event): - connection.join(channel) - print 'Es passiert...' - -def on_join(connection, event): - connection.privmsg(channel, 'lol') - -def on_disconnect(connection, event): - exit - -client.add_global_handler('welcome', on_connect) -client.add_global_handler('join', on_join) -client.add_global_handler('disconnect', on_disconnect) - -irc.process_forever() diff --git a/Reaktor/IRC/bot2.py b/Reaktor/IRC/bot2.py deleted file mode 100755 index 326dd8f5..00000000 --- a/Reaktor/IRC/bot2.py +++ /dev/null @@ -1,130 +0,0 @@ -#! /usr/bin/env python -# -# //Reaktor/IRC/bot2.py -# - -from __future__ import print_function -from irclib import SimpleIRCClient, ServerConnectionError, is_channel -from sys import exit -from os import environ as env -import re - -class IRCBot(SimpleIRCClient): - def __init__(self, target): - SimpleIRCClient.__init__(self) - self.target = target - - def on_pubmsg(self, connection, event): - - def PRIVMSG(target, text): - self.connection.privmsg(target, text) - - def ME(target, text): - PRIVMSG(target, 'ACTION ' + text + '') - - def is_executable(x): - import os - return os.path.exists(x) and os.access(x, os.X_OK) - - _nickname = connection.get_nickname() - _source = event.source() - _from = _source.split('!', 1)[0] - _target = event.target() - - try: - _, _handle, _command, _argument, _ = re.split( - '^(\w+|\*):\s*(\w+)(?:\s+(.*))?$', event.arguments()[0]) - except ValueError, error: - if re.search(_nickname, event.arguments()[0]): - PRIVMSG(self.target, 'I\'m so famous') - return # ignore - - if _handle == _nickname or _handle == '*': - - from os.path import realpath, dirname, join - from subprocess import Popen as popen, PIPE - - Reaktor_dir = dirname(realpath(dirname(__file__))) - public_commands = join(Reaktor_dir, 'public_commands') - command = join(public_commands, _command) - - if is_executable(command): - - env = {} - if _argument != None: - env['argument'] = _argument - - try: - p = popen([command], stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env) - except OSError, error: - ME(self.target, 'is made of stupid') - print('OSError@%s: %s' % (command, error)) - return - - stdout, stderr = [ x[:len(x)-1] for x in - [ x.split('\n') for x in p.communicate()]] - code = p.returncode - pid = p.pid - - print('command: %s -> %s' % (command, code)) - [print('%s stdout: %s' % (pid, x)) for x in stdout] - [print('%s stderr: %s' % (pid, x)) for x in stderr] - - if code == 0: - [PRIVMSG(self.target, x) for x in stdout] - [PRIVMSG(_source, x) for x in stderr] - else: - ME(self.target, 'mimimi') - - else: - if _handle != '*': - PRIVMSG(self.target, _from + ': you are made of stupid') - - def on_welcome(self, connection, event): - print('I\'m welcome! :D joining to %s now...' % (self.target)) - if is_channel(self.target): - connection.join(self.target) - else: - self.connection.privmsg(self.target, 'lol') - self.connection.quit('Pong timeout: 423 seconds') - - def on_join(self, connection, event): - print('Es passiert in %s' % (self.target)) - - def on_disconnect(self, connection, event): - # TODO reconnect - exit(0) - -# retrieve the value of a [singleton] variable from a tinc.conf(5)-like file -def getconf1(x, path): - from re import findall - pattern = '(?:^|\n)\s*' + x + '\s*=\s*(.*\w)\s*(?:\n|$)' - y = findall(pattern, open(path, 'r').read()) - if len(y) < 1: - raise AttributeError("len(getconf1('%s', '%s') < 1)" % (x, path)) - if len(y) > 1: - y = ' '.join(y) - raise AttributeError("len(getconf1('%s', '%s') > 1)\n ====> %s" - % (x, path, y)) - return y[0] - -def main(): - name = getconf1('Name', '/etc/tinc/retiolum/tinc.conf') - nick = str(env.get('nick', name)) - host = str(env.get('host', 'supernode')) - port = int(env.get('port', 6667)) - target = str(env.get('target', '#retiolum')) - print('====> irc://%s@%s:%s/%s' % (nick, host, port, target)) - - client = IRCBot(target) - try: - from getpass import getuser - client.connect(host, port, nick, username=getuser(), - ircname='//Reaktor running at %s.retiolum' % (name)) - except ServerConnectionError, error: - print(error) - exit(1) - client.start() - -if __name__ == "__main__": - main() diff --git a/Reaktor/IRC/content b/Reaktor/IRC/content deleted file mode 100644 index e0292376..00000000 --- a/Reaktor/IRC/content +++ /dev/null @@ -1 +0,0 @@ -python-irclib-0.4.6/ircbot.py diff --git a/Reaktor/IRC/index b/Reaktor/IRC/index index 68b6cf33..7b51632a 100755 --- a/Reaktor/IRC/index +++ b/Reaktor/IRC/index @@ -6,4 +6,4 @@ cd $(dirname $(readlink -f $0))/.. IRC/install -exec python IRC/bot2.py "$@" +exec python IRC/asybot.py "$@" diff --git a/Reaktor/IRC/install b/Reaktor/IRC/install deleted file mode 100755 index d5f7a8c1..00000000 --- a/Reaktor/IRC/install +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/sh -set -xeuf - -# cd //Reaktor/IRC -cd $(dirname $(readlink -f $0)) - -# install irclib.py -{ - PV=0.4.6 - PN=python-irclib - P=$PN-$PV - tarball=$P.tar.gz - URL=http://downloads.sourceforge.net/$PN/$tarball - SHA1SUM=c6271e44293ed51c21af0f44ce106667d3006e6f - - file=irclib.py - - if ! echo "$SHA1SUM $file" | sha1sum -c; then - temp=`mktemp` - trap "rm -f $temp" EXIT INT - - echo $P/$file > $temp - curl -LfsS $URL | tar --strip-components=1 -zxT $temp - fi - echo "$SHA1SUM $file" | sha1sum -c -} - - -- cgit v1.2.3 From 25855cfc5356a9f596eb919bbed253f10fd683f9 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 13 Sep 2011 17:10:40 +0200 Subject: //Reaktor/IRC: remove dangling ptr to IRC/install --- Reaktor/IRC/index | 2 -- 1 file changed, 2 deletions(-) (limited to 'Reaktor/IRC') diff --git a/Reaktor/IRC/index b/Reaktor/IRC/index index 7b51632a..24982c76 100755 --- a/Reaktor/IRC/index +++ b/Reaktor/IRC/index @@ -4,6 +4,4 @@ set -xeuf # cd //Reaktor cd $(dirname $(readlink -f $0))/.. -IRC/install - exec python IRC/asybot.py "$@" -- cgit v1.2.3 From ed66e3572fe5f75ea9f6fb900e56d986f18f0a52 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 13 Sep 2011 18:14:40 +0200 Subject: //Reaktor/IRC nickname: increment suffix Append or increment the bot's nickname suffix integer in order to connect to servers that already have users with the same nickname. --- Reaktor/IRC/asybot.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Reaktor/IRC') diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py index 6e9df1d9..6a37daf1 100755 --- a/Reaktor/IRC/asybot.py +++ b/Reaktor/IRC/asybot.py @@ -69,6 +69,14 @@ class asybot(asychat): elif command == 'PRIVMSG': self.on_privmsg(prefix, command, params, rest) + elif command == '433': + # ERR_NICKNAMEINUSE, retry with another name + _, nickname, int, _ = split('^.*[^0-9]([0-9]+)$', self.nickname) \ + if search('[0-9]$', self.nickname) \ + else ['', self.nickname, 0, ''] + self.nickname = nickname + str(int + 1) + self.handle_connect() + # reset alarm alarm(self.alarm_timeout) -- cgit v1.2.3 From 638e731abd026cfde963ee600b2b5c5079e8eda6 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 13 Sep 2011 18:44:13 +0200 Subject: //Reaktor/IRC: implement hammer time --- Reaktor/IRC/asybot.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'Reaktor/IRC') diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py index 6a37daf1..1a84b9d4 100755 --- a/Reaktor/IRC/asybot.py +++ b/Reaktor/IRC/asybot.py @@ -31,29 +31,37 @@ class asybot(asychat): self.set_terminator('\r\n') self.create_socket(AF_INET, SOCK_STREAM) self.connect((self.server, self.port)) + + # When we don't receive data for alarm_timeout seconds then issue a + # PING every hammer_interval seconds until kill_timeout seconds have + # passed without a message. Any incoming message will reset alarm. self.alarm_timeout = 300 + self.hammer_interval = 10 self.kill_timeout = 360 - self.last_activity = date.now() signal(SIGALRM, lambda signum, frame: self.alarm_handler()) - alarm(self.alarm_timeout) + self.reset_alarm() + loop() + def reset_alarm(self): + self.last_activity = date.now() + alarm(self.alarm_timeout) + def alarm_handler(self): delta = date.now() - self.last_activity if delta > timedelta(seconds=self.kill_timeout): - print('kill alarm %s' % delta) - exit() + print('No data for %s. Giving up...' % delta) + exit(2) else: - print('alarm %s' % delta) - self.push('PING :asybot') - alarm(self.alarm_timeout) + print('No data for %s. PINGing server...' % delta) + self.push('PING :%s' % self.nickname) + alarm(self.hammer_interval) def collect_incoming_data(self, data): self.data += data def found_terminator(self): print('< %s' % self.data) - self.last_activity = date.now() message = self.data self.data = '' @@ -77,8 +85,7 @@ class asybot(asychat): self.nickname = nickname + str(int + 1) self.handle_connect() - # reset alarm - alarm(self.alarm_timeout) + self.reset_alarm() def push(self, message): print('> %s' % message) -- cgit v1.2.3 From d39f90f7c19b930b6b5bde0bbb716cbbbdb1d633 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Sep 2011 00:48:36 +0200 Subject: Reaktor/IRC: update asybot logging facility now using python builtin logging DEBUG mode is enabled when the 'debug' environment variable is set on startup. --- Reaktor/IRC/asybot.py | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) (limited to 'Reaktor/IRC') diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py index 1a84b9d4..9021d22f 100755 --- a/Reaktor/IRC/asybot.py +++ b/Reaktor/IRC/asybot.py @@ -3,8 +3,6 @@ # //Reaktor/IRC/asybot.py # -from __future__ import print_function - def is_executable(x): import os return os.path.exists(x) and os.access(x, os.X_OK) @@ -16,6 +14,10 @@ from signal import SIGALRM, signal, alarm from datetime import datetime as date, timedelta from sys import exit from re import split, search + +import logging +log = logging.getLogger() + class asybot(asychat): def __init__(self, server, port, nickname, targets, **kwargs): asychat.__init__(self) @@ -41,7 +43,6 @@ class asybot(asychat): signal(SIGALRM, lambda signum, frame: self.alarm_handler()) self.reset_alarm() - loop() def reset_alarm(self): self.last_activity = date.now() @@ -50,10 +51,10 @@ class asybot(asychat): def alarm_handler(self): delta = date.now() - self.last_activity if delta > timedelta(seconds=self.kill_timeout): - print('No data for %s. Giving up...' % delta) + log.error('No data for %s. Giving up...' % delta) exit(2) else: - print('No data for %s. PINGing server...' % delta) + log.error('No data for %s. PINGing server...' % delta) self.push('PING :%s' % self.nickname) alarm(self.hammer_interval) @@ -61,7 +62,7 @@ class asybot(asychat): self.data += data def found_terminator(self): - print('< %s' % self.data) + log.debug('<< %s' % self.data) message = self.data self.data = '' @@ -73,6 +74,7 @@ class asybot(asychat): if command == 'PING': self.push('PONG :%s' % rest) + log.info("Replying to servers PING with PONG :%s" %rest) elif command == 'PRIVMSG': self.on_privmsg(prefix, command, params, rest) @@ -88,7 +90,7 @@ class asybot(asychat): self.reset_alarm() def push(self, message): - print('> %s' % message) + log.debug('>> %s' % message) asychat.push(self, message + self.get_terminator()) def handle_connect(self): @@ -99,7 +101,8 @@ class asybot(asychat): def on_privmsg(self, prefix, command, params, rest): def PRIVMSG(text): - self.push('PRIVMSG %s :%s' % (','.join(params), text)) + msg = 'PRIVMSG %s :%s' % (','.join(params), text) + self.push(msg) def ME(text): PRIVMSG('ACTION ' + text + '') @@ -132,8 +135,8 @@ class asybot(asychat): try: p = popen([command], stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env) except OSError, error: - ME('is made of stupid') - print('OSError@%s: %s' % (command, error)) + ME('brain damaged') + log.error('OSError@%s: %s' % (command, error)) return stdout, stderr = [ x[:len(x)-1] for x in @@ -141,9 +144,9 @@ class asybot(asychat): code = p.returncode pid = p.pid - print('command: %s -> %s' % (command, code)) - [print('%s stdout: %s' % (pid, x)) for x in stdout] - [print('%s stderr: %s' % (pid, x)) for x in stderr] + log.info('command: %s -> %s' % (command, code)) + [log.debug('%s stdout: %s' % (pid, x)) for x in stdout] + [log.debug('%s stderr: %s' % (pid, x)) for x in stderr] if code == 0: [PRIVMSG(x) for x in stdout] @@ -154,6 +157,7 @@ class asybot(asychat): else: if _handle != '*': PRIVMSG(_from + ': you are made of stupid') + # retrieve the value of a [singleton] variable from a tinc.conf(5)-like file def getconf1(x, path): @@ -170,15 +174,20 @@ def getconf1(x, path): if __name__ == "__main__": from os import environ as env + + lol = logging.DEBUG if env.get('debug',False) else logging.INFO + logging.basicConfig(level=lol) name = getconf1('Name', '/etc/tinc/retiolum/tinc.conf') hostname = '%s.retiolum' % name nick = str(env.get('nick', name)) host = str(env.get('host', 'supernode')) port = int(env.get('port', 6667)) target = str(env.get('target', '#retiolum')) - print('====> irc://%s@%s:%s/%s' % (nick, host, port, target)) + log.info('=> irc://%s@%s:%s/%s' % (nick, host, port, target)) from getpass import getuser asybot(host, port, nick, [target], username=getuser(), ircname='//Reaktor running at %s' % hostname, hostname=hostname) + + loop() -- cgit v1.2.3 From a8ab9dbc2de0ee3aa744485255360b5e5e8b45cd Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Sep 2011 20:36:40 +0200 Subject: Reaktor/asybot: add syslog logging feature --- Reaktor/IRC/asybot.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Reaktor/IRC') diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py index 9021d22f..99cb2fe6 100755 --- a/Reaktor/IRC/asybot.py +++ b/Reaktor/IRC/asybot.py @@ -15,8 +15,12 @@ from datetime import datetime as date, timedelta from sys import exit from re import split, search -import logging -log = logging.getLogger() +import logging,logging.handlers +log = logging.getLogger('asybot') +hdlr = logging.handlers.SysLogHandler(facility=logging.handlers.SysLogHandler.LOG_DAEMON) +formatter = logging.Formatter( '%(filename)s: %(levelname)s: %(message)s') +hdlr.setFormatter(formatter) +log.addHandler(hdlr) class asybot(asychat): def __init__(self, server, port, nickname, targets, **kwargs): -- cgit v1.2.3