From 543b0a5b1baf3f815400063551be87e69d6f7798 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Wed, 19 Oct 2011 16:16:57 -0600
Subject: [PATCH] add router sanity check, fix mcp race condition

---
 packages/mcp/service/httpd/finish  |  4 ----
 packages/mcp/service/httpd/run     | 12 +++++++-----
 packages/mcp/www/ctf.css           |  2 +-
 packages/octopus/solution.sh       |  4 ++--
 packages/router/service/router/run | 14 ++++++++++++--
 packages/router/service/sshd/run   |  2 +-
 6 files changed, 23 insertions(+), 15 deletions(-)
 delete mode 100755 packages/mcp/service/httpd/finish

diff --git a/packages/mcp/service/httpd/finish b/packages/mcp/service/httpd/finish
deleted file mode 100755
index 6317f74..0000000
--- a/packages/mcp/service/httpd/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-IP=$(cat ip.txt)
-ip addr del $IP dev eth0
diff --git a/packages/mcp/service/httpd/run b/packages/mcp/service/httpd/run
index 7a96666..6f875be 100755
--- a/packages/mcp/service/httpd/run
+++ b/packages/mcp/service/httpd/run
@@ -1,17 +1,19 @@
-#! /bin/sh
+#! /bin/sh -e
 
 exec 2>&1
 
+hostname mcp
+
 # Bring up address
 IP=$(cat ip.txt)
-ip addr add $IP dev eth0
-ip monitor | grep -q $IP
+ip addr add $IP dev eth0 || true
 
 # Link in puzzles and web pages
 install -d /var/www
 for d in /opt/*; do
-    if [ -d $d/puzzles ]; then
-        ln -sf $d/puzzles /var/www/$(basename $d)
+    w=/var/www/$(basename $d)
+    if [ -d $d/puzzles ] && ! [ -d $w ]; then
+        ln -sf $d/puzzles $w
     fi
     if [ -d $d/www ]; then
         ln -sf $d/www/* /var/www/
diff --git a/packages/mcp/www/ctf.css b/packages/mcp/www/ctf.css
index c8e571e..0082719 100644
--- a/packages/mcp/www/ctf.css
+++ b/packages/mcp/www/ctf.css
@@ -46,7 +46,7 @@ h1:first-child {
 
 h1:first-child:before {
     letter-spacing: -0.1em;
-    content: "Capture The Flag: ";
+    content: "NSM FIRE: ";
 }
 
 /**** body ****/
diff --git a/packages/octopus/solution.sh b/packages/octopus/solution.sh
index d99139b..7d97293 100755
--- a/packages/octopus/solution.sh
+++ b/packages/octopus/solution.sh
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 port=8888
-host=${1:-[::1]}
+host=[${1:-::1}]
 
-blooper=$(tempfile)
+blooper=/tmp/bloop.$$
 trap "rm $blooper" 0
 
 echo foo | socat -t 0.01 STDIO UDP6:$host:$port | tail -n +5 > $blooper
diff --git a/packages/router/service/router/run b/packages/router/service/router/run
index 8a9c36f..54fd6b9 100755
--- a/packages/router/service/router/run
+++ b/packages/router/service/router/run
@@ -4,9 +4,19 @@ exec 2>&1
 
 PFX=fd84:b410:3441
 
-hostname router
+log () {
+    echo "router: $@"
+    echo "router: $@" > /dev/console
+}
 
-# We're a router
+if [ $(mount | grep -c /opt/) -gt 1 ]; then
+    log "cannot run alongside other packages" > /dev/console
+    exit 1
+fi
+
+
+# I'm a router
+hostname router
 echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
 
 # Bring up main ethernet interface
diff --git a/packages/router/service/sshd/run b/packages/router/service/sshd/run
index 6d4ef96..cfe1216 100755
--- a/packages/router/service/sshd/run
+++ b/packages/router/service/sshd/run
@@ -2,6 +2,6 @@
 
 exec 2>&1
 
-[ -r /etc/passwd ] || echo 'root:$1$xAJ7KwiU$BeKJjYGs9r/hY9Ag4qv4I1:0:0:root:/tmp:/bin/sh' > /etc/passwd
+echo 'root:$1$xAJ7KwiU$BeKJjYGs9r/hY9Ag4qv4I1:0:0:root:/tmp:/bin/sh' > /etc/passwd
 
 exec dropbear -r ./rsa.key -E -F