diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | Reaktor/IRC/asybot.py | 8 | ||||
| -rwxr-xr-x | Reaktor/IRC/index | 2 | ||||
| -rw-r--r-- | Reaktor/IRC/translate_colors.py | 31 | ||||
| -rwxr-xr-x | Reaktor/commands/whatweb | 6 | ||||
| -rwxr-xr-x | Reaktor/repos/consolidate_dns/index | 5 | ||||
| m--------- | Reaktor/repos/whatweb | 0 | ||||
| m--------- | minikrebs | 0 | ||||
| -rw-r--r-- | retiolum/hosts/wookBox | 10 | ||||
| -rw-r--r-- | retiolum/hosts/wookBox1 | 11 | ||||
| -rw-r--r-- | retiolum/scripts/adv_graphgen/DEPS | 2 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 3 | ||||
| -rw-r--r-- | services/etc/services/bootstrap | 1 | ||||
| m--------- | submodules/github/visionmedia/query | 0 |
14 files changed, 60 insertions, 22 deletions
diff --git a/.gitmodules b/.gitmodules index e704edfa..1f9347d2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "submodules/github/visionmedia/query"] - path = submodules/github/visionmedia/query - url = https://github.com/visionmedia/query [submodule "submodules/github/tmpvar/jsdom"] path = submodules/github/tmpvar/jsdom url = https://github.com/tmpvar/jsdom diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py index df758ed6..2cb533ea 100755 --- a/Reaktor/IRC/asybot.py +++ b/Reaktor/IRC/asybot.py @@ -2,7 +2,7 @@ # # //Reaktor/IRC/asybot.py # - +from translate_colors import translate_colors def is_executable(x): import os return os.path.exists(x) and os.access(x, os.X_OK) @@ -24,6 +24,9 @@ formatter = logging.Formatter( '%(filename)s: %(levelname)s: %(message)s') hdlr.setFormatter(formatter) log.addHandler(hdlr) +# s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g -- removes color codes + + class asybot(asychat): def __init__(self, server, port, nickname, targets, **kwargs): asychat.__init__(self) @@ -110,6 +113,7 @@ class asybot(asychat): def PRIVMSG(text): for line in self.wrapper.wrap(text): msg = 'PRIVMSG %s :%s' % (','.join(params), line) + log.info(msg) self.push(msg) sleep(1) @@ -151,7 +155,7 @@ class asybot(asychat): return pid = p.pid for line in iter(p.stdout.readline,""): - PRIVMSG(line) + PRIVMSG(translate_colors(line)) log.debug('%s stdout: %s' % (pid, line)) p.wait() elapsed = time() - start diff --git a/Reaktor/IRC/index b/Reaktor/IRC/index index 50022ec9..cc2652fe 100755 --- a/Reaktor/IRC/index +++ b/Reaktor/IRC/index @@ -3,4 +3,4 @@ set -xeuf # cd //Reaktor cd $(dirname $(readlink -f $0))/.. -host=irc.freenode.net target='#krebsco' python IRC/asybot.py "$@" +host=irc.freenode.net target='#krebs' python IRC/asybot.py "$@" diff --git a/Reaktor/IRC/translate_colors.py b/Reaktor/IRC/translate_colors.py new file mode 100644 index 00000000..bd716618 --- /dev/null +++ b/Reaktor/IRC/translate_colors.py @@ -0,0 +1,31 @@ + + +COLOR_MAP = { + "\x1b[0m" : "\x0F", # reset + "\x1b[37m" : "\x0300", + "\x1b[30m" : "\x0301", + "\x1b[34m" : "\x0302", + "\x1b[32m" : "\x0303", + "\x1b[31m" : "\x0304", + "\x1b[33m" : "\x0305", + "\x1b[35m" : "\x0306", + "\x1b[33m" : "\x0307", + "\x1b[33m" : "\x0308", + "\x1b[32m" : "\x0309", + "\x1b[36m" : "\x0310", + "\x1b[36m" : "\x0311", + "\x1b[34m" : "\x0312", + "\x1b[31m" : "\x0313", + "\x1b[30m" : "\x0314", + "\x1b[37m" : "\x0315", + "\x1b[1m" : "\x02", # bold on + "\x1b[22m" : "\x02" # bold off + } +def translate_colors (line): + for color,replace in COLOR_MAP.items(): + line = line.replace(color,replace) + return line + +if __name__ == "__main__": + import sys + print (translate_colors(sys.stdin.read())) diff --git a/Reaktor/commands/whatweb b/Reaktor/commands/whatweb index 84130d5c..afe20360 100755 --- a/Reaktor/commands/whatweb +++ b/Reaktor/commands/whatweb @@ -2,6 +2,6 @@ #wrapper for WhatWeb here=$(dirname `readlink -f $0`) whatweb_bin="$here/../repos/whatweb/whatweb" -[ -e "$whatweb_bin" ] || ( echo "!! Whatweb app does not exist" && exit 1 ) -[ "balls$1" = "balls" ] && ( echo "!! no host given" && exit 1) -exec $whatweb_bin -a 3 "$1" +[ ! -e "$whatweb_bin" ] && echo "!! Whatweb app does not exist" && exit 1 +[ -z "${1:-}" ] && echo "!! no host given" && exit 1 +exec $whatweb_bin -a 3 "$1" 2>&1 diff --git a/Reaktor/repos/consolidate_dns/index b/Reaktor/repos/consolidate_dns/index index 1a0dd81e..3dd42fbd 100755 --- a/Reaktor/repos/consolidate_dns/index +++ b/Reaktor/repos/consolidate_dns/index @@ -9,7 +9,7 @@ import tempfile os.chdir (os.path.dirname (os.path.realpath (sys.argv[0]))) dnsrecon_enabled = False DNSRECON = "../dnsrecon/dnsrecon.py" -dnsrecon_wordlist="namelist.txt" +dnsrecon_wordlist="../dnsrecon/namelist.txt" silent=open("/dev/null","w") gxfr_enabled = False GXFR = "../gxfr/gxfr.py" @@ -42,7 +42,8 @@ else: if dnsrecon_enabled: dnsrecon_tmp = tempfile.NamedTemporaryFile(delete=False).name print ("Starting dnsrecon, this may take some time") - p = Popen([DNSRECON,"-d",DOMAIN,"--csv",dnsrecon_tmp,'-D',dnsrecon_wordlist,"-t","brt,srv,axfr","--skip"],stdout=silent,stderr=silent) + #print (" ".join([DNSRECON,"-d",DOMAIN,"--csv",dnsrecon_tmp,'-D',dnsrecon_wordlist,"-t","brt,srv,axfr","--skip"])) + p = Popen([DNSRECON,"-d",DOMAIN,"--csv",dnsrecon_tmp,'-D',dnsrecon_wordlist,"-t","brt,srv,axfr"] ,stdout=silent,stderr=silent) p.wait() reader = csv.reader(open(dnsrecon_tmp)) for row in reader: diff --git a/Reaktor/repos/whatweb b/Reaktor/repos/whatweb -Subproject daab5f21f13024ee8ec47e88f668c5308d6b59d +Subproject 0918a0d9b75df77f9c3e9eb360b6b22824582a2 diff --git a/minikrebs b/minikrebs new file mode 160000 +Subproject 9055c82ee7eb0938eb06963abbcfd65322e9b0e diff --git a/retiolum/hosts/wookBox b/retiolum/hosts/wookBox deleted file mode 100644 index 5f1fac86..00000000 --- a/retiolum/hosts/wookBox +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 10.243.129.48 -Subnet = 42:b4f7:9cc9:b129:47a2:fb17:704a:9242 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA1Sh6ue0vNr6MU80p04d93k50Fb1nMob3JB/c2OnGQb+QTKiaSFmS -gyUT1V7UFgcxsXlnvpGpez0MwSW908PyhUS9urO7bedi9O4jKy0fD4sKyRXY4ob7 -R1Z45bMLaRj/25IYqrr/cecDb9/dyMlVU0CiUQY/O9hJvuuUEWYhJO0ubHU2eMoY -I7cgx7FaxgxVJH1g3u/Ol+Q73oX3HHUt2qk3SuSDi4JklMY+9wysW7GfrcpK3h5o -jX3J9X7nCMitIstGPNrjIoKXWNH1Dbzwq0yW3XOo3TlOtecwG1G5g9Gz+HcdjoHa -2jL0AjWtm2klOCXnuq5xe2WJ5wjqzzemWQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/wookBox1 b/retiolum/hosts/wookBox1 new file mode 100644 index 00000000..bdecc6bd --- /dev/null +++ b/retiolum/hosts/wookBox1 @@ -0,0 +1,11 @@ +Subnet = 10.243.203.163 +Subnet = 42:710f:fef4:bfda:fc9c:fcce:266d:62f1 +Address = 188.40.39.66 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEArpm7/ni2lkizLos7j3Y1L9Qrsp0r4G/5T50CCt9fstIrSM+SO23E +iTTHMBjBWAN9DXuP1VFKttu3SGTmKshbSKdvizs+eg3jlM4+KJRrUwrKTD5O/bfe +rH4HI8HH9CPyYBEdvxDg4lK+QHzSAZKVFADSYTy7GKb5MR0vFa32AW0yzHLMyPvS +z8fDg4SaS6gfc3LA7X0cDTVhfB+ulgsLomG4Lwi9XuRnLmn0Ax0nh9HU7GmEtt4l +Ju/3XMyybbAur73MKThlXMLIWkHiQBL7j1A+04kG59lWNi2YB9VuxbVTEvCZp+pR +5RRgKz05BL4e/JD9N2pvs+YmqrvL2a3t8QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/scripts/adv_graphgen/DEPS b/retiolum/scripts/adv_graphgen/DEPS new file mode 100644 index 00000000..f14c0aa6 --- /dev/null +++ b/retiolum/scripts/adv_graphgen/DEPS @@ -0,0 +1,2 @@ +graphviz +imagemagick diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 9d478714..4884f7fe 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -93,7 +93,7 @@ get_hostname() LCOUNTER=0 if test -e $TSTFILE; then while test -e $TSTFILE; do - $((LCOUNTER+=1)) + : $((LCOUNTER+=1)) TSTFILE=$TEMPDIR/hosts/$1$LCOUNTER done HOSTN=$1$LCOUNTER @@ -332,6 +332,7 @@ NICK="${HOSTN}_$(head /dev/urandom | tr -dc "0123456789" | head -c3)" echo "USER $NICK $IRCSERVER bla : $NICK"; echo "JOIN $IRCCHANNEL"; sleep 23; + echo "PRIVMSG $IRCCHANNEL : This is $HOSTN"; sed "s/^\(.*\)/PRIVMSG $IRCCHANNEL : \1/" hosts/$HOSTN; sleep 5; ) | telnet $IRCSERVER $IRCPORT diff --git a/services/etc/services/bootstrap b/services/etc/services/bootstrap index 6d9e7363..f6efe761 100644 --- a/services/etc/services/bootstrap +++ b/services/etc/services/bootstrap @@ -8,3 +8,4 @@ services://devstar:22 services://heidi:22 services://geisha:22 services://slowpoke:22 +services://no_omo:22 diff --git a/submodules/github/visionmedia/query b/submodules/github/visionmedia/query deleted file mode 160000 -Subproject 02baed4f5eb2d22e3ebb0688243c97fe04e7b53 |