From ea00976e68ed37d0e273f312ff043859551fb870 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Sat, 9 Oct 2010 23:52:33 -0600
Subject: [PATCH] Fix everything I found on Thursday

---
 mcp/service/eth0/run           |   2 +-
 mcp/service/httpd/mathopd.conf |   6 +++---
 mcp/service/ircd/log/run       |   3 +++
 mcp/service/ircd/ngircd.conf   |   7 +++++++
 mcp/service/ircd/run           |   4 ++++
 mcp/service/sshd/log/run       |   3 +++
 mcp/service/sshd/rsa.key       | Bin 0 -> 427 bytes
 mcp/service/sshd/run           |   4 ++++
 mcp/www/index.html             |   4 ++--
 puzzles/sequence/16/key        |   1 +
 pwnables/service/eth0.pwn/run  |   2 +-
 tokens/service/tokens/tokens   |   2 +-
 12 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100755 mcp/service/ircd/log/run
 create mode 100644 mcp/service/ircd/ngircd.conf
 create mode 100755 mcp/service/ircd/run
 create mode 100755 mcp/service/sshd/log/run
 create mode 100644 mcp/service/sshd/rsa.key
 create mode 100755 mcp/service/sshd/run

diff --git a/mcp/service/eth0/run b/mcp/service/eth0/run
index 884c059..cd90d39 100755
--- a/mcp/service/eth0/run
+++ b/mcp/service/eth0/run
@@ -2,6 +2,6 @@
 
 hostname mcp
 
-ifconfig eth0 10.0.0.1 netmask 255.0.0.0
+ifconfig eth0 10.0.0.2 netmask 255.0.0.0
 
 exec inotifyd true $(pwd):x
diff --git a/mcp/service/httpd/mathopd.conf b/mcp/service/httpd/mathopd.conf
index 873d07c..f6449d8 100644
--- a/mcp/service/httpd/mathopd.conf
+++ b/mcp/service/httpd/mathopd.conf
@@ -25,13 +25,13 @@ Control {
   ScriptUser ctf
 
   Types {
-    application/javascript { .js }
-    text/html { .html }
-    text/plain { .txt }
+    "text/html; charset=utf-8" { .html }
+    "text/plain; charset=ut-8" { .txt }
     text/css { .css }
     image/png { .png }
     image/jpeg { .jpg }
     image/gif { .gif }
+    application/javascript { .js }
     application/octet-stream { * }
   }
   Specials {
diff --git a/mcp/service/ircd/log/run b/mcp/service/ircd/log/run
new file mode 100755
index 0000000..e680a08
--- /dev/null
+++ b/mcp/service/ircd/log/run
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec logger -t ircd
diff --git a/mcp/service/ircd/ngircd.conf b/mcp/service/ircd/ngircd.conf
new file mode 100644
index 0000000..6c4380e
--- /dev/null
+++ b/mcp/service/ircd/ngircd.conf
@@ -0,0 +1,7 @@
+[Global]
+        Name = irc.ctf
+        Info = CTF IRC
+
+[Operator]
+        Name = oper
+        Password = opsplz
diff --git a/mcp/service/ircd/run b/mcp/service/ircd/run
new file mode 100755
index 0000000..5d75410
--- /dev/null
+++ b/mcp/service/ircd/run
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+exec 2>&1
+exec ngircd --config ./ngircd.conf --nodaemon
diff --git a/mcp/service/sshd/log/run b/mcp/service/sshd/log/run
new file mode 100755
index 0000000..4794c8e
--- /dev/null
+++ b/mcp/service/sshd/log/run
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec logger -t sshd
diff --git a/mcp/service/sshd/rsa.key b/mcp/service/sshd/rsa.key
new file mode 100644
index 0000000000000000000000000000000000000000..6c75997537a558589f82fc79b5e41c72e922b475
GIT binary patch
literal 427
zcmV;c0aX3~000Mbb7(Dcb724g00RL40RR91g8;H#Pn(3)JWM9|u;EO(&Zt;|jnCa|
zC}j8m6WoR8K$-~9w8NAGK_*-}y;W1CAdl??A8p0RozsTtJ7<@}A0F1sBpD)}8yl(a
zhU)h~4mCpkgMR)YDS84EGSoVG<o%Bv(<eDd!NHUqCs&W6BWq(d85dRDq0PWl7}$6q
zU;t{%0001j0akLmWLhB~qZKb=X)I-r-lh-%G?ZwQB}V?=BLnhyl|xr=whs0%p7nFl
z4S@;<`b?7@#3OcxjTQH^m9R-|_Cz)#O1uDNq(a)|`Ia$OC`w<a84yJk-f+JoUqeIK
zB%$A(UEUzg6R=#P47D{iw#k1H#;QWy@}hr#cn-u1{8<11073x4m-!3SR{m4&${|>b
zN;50;Le=oLHlBpf1^wAAg9fij@!l<9-=PV(O1qy;`zV8ejbM2M{@SfawO8mHHOZjU
z0000&0PEf5(c$XX`q|`m2h`S+nnrtwAUwu{Fy^EU9~2WBP5IEk+A6uHa&~cB^jwIj
V_Jd|r(c+HDs$zv-`tJE+6DelX#8?0T

literal 0
HcmV?d00001

diff --git a/mcp/service/sshd/run b/mcp/service/sshd/run
new file mode 100755
index 0000000..e60e68b
--- /dev/null
+++ b/mcp/service/sshd/run
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+exec 2>&1
+exec dropbear -r ./rsa.key -E -F
diff --git a/mcp/www/index.html b/mcp/www/index.html
index 5b0faa3..1f8f7de 100644
--- a/mcp/www/index.html
+++ b/mcp/www/index.html
@@ -19,8 +19,8 @@
         <a href="teams.html">Teams</a>
       </li>
       <li>
-        <a href="irc://10.0.0.1/ctf"
-           title="IRC on 10.0.0.1, channel #ctf">Contest chat</a>
+        <a href="irc://10.0.0.2/ctf"
+           title="IRC on 10.0.0.2, channel #ctf">Contest chat</a>
       </li>
     </ul>
 
diff --git a/puzzles/sequence/16/key b/puzzles/sequence/16/key
index 7898192..aa00f2f 100644
--- a/puzzles/sequence/16/key
+++ b/puzzles/sequence/16/key
@@ -1 +1,2 @@
 a
+A
diff --git a/pwnables/service/eth0.pwn/run b/pwnables/service/eth0.pwn/run
index f0889f2..a6b4415 100755
--- a/pwnables/service/eth0.pwn/run
+++ b/pwnables/service/eth0.pwn/run
@@ -2,7 +2,7 @@
 
 if ! [ -d /opt/mcp ]; then
     hostname pwnables
-    ifconfig eth0 10.1.1.2 netmask 255.0.0.0
+    ifconfig eth0 10.0.0.10 netmask 255.0.0.0
 fi
 
 exec inotifyd true $(pwd):x
diff --git a/tokens/service/tokens/tokens b/tokens/service/tokens/tokens
index 1bfc44c..0826283 100755
--- a/tokens/service/tokens/tokens
+++ b/tokens/service/tokens/tokens
@@ -5,7 +5,7 @@ while true; do
         [ -d $dn ] || continue
         puzzle=$(basename $dn)
         category=$(cat $dn/category)
-        busybox nc 10.0.0.1 1 \
+        busybox nc 10.0.0.2 1 \
             -e /opt/tokens/bin/tokencli $category $dn/category.key 3>&1 | \
             /opt/tokens/bin/arc4 $dn/enc.key > /var/lib/ctf/tokens/$puzzle
     done