neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Document UNM problems, add in new tanks scripts

This commit is contained in:
Neale Pickett 2011-02-12 20:55:12 -07:00
parent 1884c1947e
commit 7f2c85310a
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/problems.txt
View File

@ -1,7 +1,6 @@
Bugs Bugs
==== ====
* claim.cgi not exiting (maybe fixed?)
* We need some programs so that we never have to edit .db files * We need some programs so that we never have to edit .db files
directly. I truncated tokens.db with > instead of >>. directly. I truncated tokens.db with > instead of >>.
* Get erin to edit net-re * Get erin to edit net-re
@ -16,7 +15,7 @@ Bugs
* can't squirrel away scores * can't squirrel away scores
* All tanks fixes are in LABEL=VAR/fixes * All tanks fixes are in LABEL=VAR/fixes
* Pwnables are generating new tokens way too quickly * Pwnables are generating new tokens way too quickly
* chroot jail is worthless * chroot jail isn't secure under Linux (see man page)
Physical Physical

5
packages/ctfbase/service/ctfd/ctfd
View File

@ -14,7 +14,10 @@ while true; do
done done
# Fetch list of teams # Fetch list of teams
wget -q -P /var/lib/ctf http://10.0.0.2/teams.txt & teams=/var/lib/ctf/teams.txt
rm -f $teams.tmp
wget -q -O $teams.tmp http://10.0.0.2/teams.txt && \
mv $teams.tmp $teams
# Archive state # Archive state
state=/var/www/state.tar.gz.rc4 state=/var/www/state.tar.gz.rc4

2
packages/tanks/service/tanksd/run
View File

@ -8,5 +8,5 @@ ln -sf summary.html /var/www/tanks/index.html
install -o ctf -d /var/lib/ctf/tanks/players install -o ctf -d /var/lib/ctf/tanks/players
PATH=/bin:/opt/ctfbase/bin; export PATH PATH=/bin:/opt/ctfbase/bin:/opt/tanks/bin; export PATH
exec ./tanksd exec ./tanksd

7
packages/tanks/service/tanksd/tanksd
View File

@ -100,15 +100,12 @@ EOF
EOF EOF
# Get a token and add it to the redemption log # Get a token and add it to the redemption log
nc 10.0.0.2 1 -e /opt/tokens/bin/tokencli tanks ./category.key 3> $tfn nc 10.0.0.2 1 -e /opt/ctfbase/bin/tokencli tanks ./category.key 3> $tfn
k=$(cat $tfn) k=$(cat $tfn)
/opt/tanks/bin/winners.awk $rfn | while read winner; do winner.awk $rfn | while read winner; do
hash=$(basename $winner) hash=$(basename $winner)
echo "Round $next winner: $hash" echo "Round $next winner: $hash"
# Squirrel it away just in case
cat $tfn >> $winner/tokens
# XXX: pull this out into another daemon # XXX: pull this out into another daemon
# XXX: this puts the token in /proc/self/cmdline # XXX: this puts the token in /proc/self/cmdline
wget -q -s "http://10.0.0.2/claim.cgi?t=$hash&k=$k" wget -q -s "http://10.0.0.2/claim.cgi?t=$hash&k=$k"