From 1d143a020f178c44de6c81d7e25c48a158fee5cc Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Wed, 9 Feb 2011 15:31:15 -0700
Subject: [PATCH] More rlyeh work, add posters category

---
 doc/2011-TF3/categories.txt            |  1 +
 doc/2011-TF3/schedule.txt              | 31 ++++++++++++++++++++++++++
 packages/mcp/service/tokend/run        |  2 +-
 packages/posters/posters.mk            |  5 +++++
 packages/posters/tokens.txt            |  6 +++++
 packages/rlyeh/rlyeh.mk                |  1 +
 packages/rlyeh/service/rlyeh/rlyeh-ctf | 10 +++++----
 packages/rlyeh/service/rlyeh/run       |  3 ++-
 8 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 doc/2011-TF3/schedule.txt
 create mode 100644 packages/posters/posters.mk
 create mode 100644 packages/posters/tokens.txt

diff --git a/doc/2011-TF3/categories.txt b/doc/2011-TF3/categories.txt
index cb5401b..fe23384 100644
--- a/doc/2011-TF3/categories.txt
+++ b/doc/2011-TF3/categories.txt
@@ -13,3 +13,4 @@ This year we have:
     hackme, logger, net-re, octopus, printf, pwnables, sequence, skynet,
     steg, tanks, webapp
 
+    rlyeh
diff --git a/doc/2011-TF3/schedule.txt b/doc/2011-TF3/schedule.txt
new file mode 100644
index 0000000..48530d8
--- /dev/null
+++ b/doc/2011-TF3/schedule.txt
@@ -0,0 +1,31 @@
+March 7
+-------
+
+8:00-9:00   Registration
+9:00-12:00  Classes
+  Host Forensics: Ballroom North
+  Network RE: Ballroom South
+  Malware RE: New Mexico Room
+  Pen testing: Stiha Room
+12:00-1:00  Break
+1:00-5:00   Classes
+
+
+March 8
+-------
+
+8:00-12:00  Classes
+12:00-1:00  Break
+1:00-5:00   Classes
+7:00-8:00   Reception and key signing
+
+March 9
+-------
+7:00-8:00   Registration
+8:00-8:20   Exercise introduction
+8:20-5:00   Exercise
+
+
+March 10
+--------
+8:00-5:00   Exercise
diff --git a/packages/mcp/service/tokend/run b/packages/mcp/service/tokend/run
index 692d02f..e40b9e5 100755
--- a/packages/mcp/service/tokend/run
+++ b/packages/mcp/service/tokend/run
@@ -8,7 +8,7 @@ DB=/var/lib/ctf/tokens.db
 
 if [ ! -f $DB ]; then
     # Append any package-provided tokens
-    cat /opt/*/tokens >$DB 2>/dev/null
+    cat /opt/*/tokens.txt >$DB 2>/dev/null
     chown ctf $DB
 fi
 
diff --git a/packages/posters/posters.mk b/packages/posters/posters.mk
new file mode 100644
index 0000000..d5b4a7b
--- /dev/null
+++ b/packages/posters/posters.mk
@@ -0,0 +1,5 @@
+posters-source:
+posters-build:
+
+posters-install: packages/posters/tokens.txt
+	cp $< $(TARGET)/posters/
diff --git a/packages/posters/tokens.txt b/packages/posters/tokens.txt
new file mode 100644
index 0000000..12debb7
--- /dev/null
+++ b/packages/posters/tokens.txt
@@ -0,0 +1,6 @@
+posters:xylep-nanox
+posters:xanad-polox
+posters:xemoc-socox
+posters:xurat-tulox
+posters:xalep-mikex
+posters:xylen-bubux
diff --git a/packages/rlyeh/rlyeh.mk b/packages/rlyeh/rlyeh.mk
index 60a921f..05ac8ba 100644
--- a/packages/rlyeh/rlyeh.mk
+++ b/packages/rlyeh/rlyeh.mk
@@ -20,6 +20,7 @@ rlyeh-install: rlyeh-build
 	cp $(RLYEH_BUILDDIR)/rlyeh/rlyeh $(RLYEH_PKGDIR)/bin
 
 	$(call COPYTREE, packages/rlyeh/service, $(RLYEH_PKGDIR)/service)
+	$(call COPYTREE, packages/rlyeh/tokens, $(RLYEH_PKGDIR)/tokens)
 
 rlyeh-clean:
 	rm -rf $(RLYEH_BUILDDIR)
diff --git a/packages/rlyeh/service/rlyeh/rlyeh-ctf b/packages/rlyeh/service/rlyeh/rlyeh-ctf
index 1ea6aca..a80b247 100755
--- a/packages/rlyeh/service/rlyeh/rlyeh-ctf
+++ b/packages/rlyeh/service/rlyeh/rlyeh-ctf
@@ -2,7 +2,8 @@
 
 base=${CTF_BASE:-/var/lib/ctf}
 
-read -p "Team password: " -r teamhash
+echo -n "Team password: "
+read -r teamhash
 
 if ! KEY='Too much cheese.' arc4 < $base/teams.txt | grep -q -F -e "$teamhash"; then
     echo 'No such team.'
@@ -20,7 +21,7 @@ if [ -f $teamhash ]; then
         exit
     fi
 else
-    echo 0 > $teamhash
+    echo 1 > $teamhash
 fi
 read level < $teamhash
 
@@ -33,8 +34,9 @@ read level < $teamhash
     echo "Your team is on level $level."
     echo
 
-    if ./rlyeh $level; then
-        echo "10 points for Gryffindor!"
+    if setuidgid nobody rlyeh $level; then
+        arc4 /opt/rlyeh/tokens/rlyeh/enc.key < $base/tokens/rlyeh
+        echo
         expr $level + 1 > $teamhash
     else
 	touch $teamhash
diff --git a/packages/rlyeh/service/rlyeh/run b/packages/rlyeh/service/rlyeh/run
index b8f8962..9b4c8c9 100755
--- a/packages/rlyeh/service/rlyeh/run
+++ b/packages/rlyeh/service/rlyeh/run
@@ -7,4 +7,5 @@ ip addr add $IP label eth0:rlyeh dev eth0
 dir=/var/lib/ctf/rlyeh
 install -o nobody -d $dir
 
-exec setuidgid nobody tcpsvd ${IP%/*} 1928 ./rlyeh-ctf
+PATH=/opt/ctfbase/bin:/opt/rlyeh/bin:/bin:/sbin; export PATH
+exec tcpsvd ${IP%/*} 1928 ./rlyeh-ctf