Fix some last-minute bugs

This commit is contained in:
Neale Pickett 2010-10-29 00:07:03 -06:00
parent 5fae0ea4a8
commit 3f0c123528
7 changed files with 21 additions and 14 deletions

View File

@ -1,8 +1,5 @@
* claim.cgi not exiting (maybe fixed?)
* mcp/index.html: provide example token
* tanks/designer.cgi: s/token/team hash/
* net-re/3: give example of what the answer would look like
* eth0/run: wrong netmask, no router
* eth0.pwn/run: wrong netmask, no router
* tanks: player directories not getting populated
* teams.txt: Come up with a better solution to creating this at boot

View File

@ -2,6 +2,6 @@
hostname mcp
ifconfig eth0 10.0.0.2 netmask 255.0.0.0
ifconfig eth0 10.0.0.2 netmask 255.255.0.0
exec inotifyd true $(pwd):x

View File

@ -6,4 +6,8 @@ install -o ctf -m 0755 -d /var/lib/ctf/points.new
install -o ctf -m 0755 -d /var/lib/ctf/points.tmp
touch /var/lib/ctf/points.log
# Re-populate teams list for tanks
ls $base/teams/names | KEY="Too much cheese." /opt/mcp/bin/arc4 > $www/teams.txt.$$
mv $www/teams.txt.$$ $www/teams.txt
exec ./pointsd

View File

@ -28,7 +28,7 @@
<form action="claim.cgi" method="post">
<fieldset>
team hash:<input name="t" size="8">
token:<input name="k" size="30">
token:<input name="k" size="30" value="example:xabab-babab-babax">
<input type="submit" value="claim">
</fieldset>
</form>

View File

@ -83,6 +83,9 @@ proxy, it will be a full URL.
`VERSION` is the version of HTTP in use. It always begins with `HTTP/`
and ends with major and minor version numbers, separated by a period.
Many protocols are "HTTP-like", and provide a version beginning with
something other than `HTTP/'. Although they may look like HTTP, they
are not truly HTTP connections.
`METHOD` is typically either `GET`, `HEAD`, or `POST`, but may also be
`OPTIONS`, `PUT`, `DELETE`, `TRACE`, `CONNECT`, or any number of
@ -107,11 +110,14 @@ Sometimes as an analyst, you only get the first few dozen bytes of a
conversation, and you may not even get an indication of whether the
client or server spoke first.
What follows is a list of the first line of text sent in various
different connections. The key for this page is the list of protocols
not described on this page, ordered from lowest (1) to highest (F). In
other words, list everything that isn't the first line of an FTP, SMTP,
or HTTP connection.
You have been given the first line sent in 16 different connections and
asked to determine which warrant further investigation. You need to
rule out things that are clearly not the first line of HTTP, SMTP, or
FTP.
The answer for this page is the list of protocols *not described on this
page*, ordered from lowest (1) to highest (F). The answer should be of
the form "1,2,3,7,8,A,B,C".
1: GET / HTTP/1.1
2: +OK example.com server ready

View File

@ -6,5 +6,5 @@ if [ -d /opt/mcp ]; then
fi
hostname pwnables
ifconfig eth0 10.0.0.10 netmask 255.0.0.0
ifconfig eth0 10.0.0.10 netmask 255.255.0.0
exec inotifyd true $(pwd):x

View File

@ -42,7 +42,7 @@ EOF
while true; do
# Make sure all teams exist
# XXX: pull this out into another daemon
wget -q -O - http://10.0.0.2/teams.txt | \
wget -q -O - http://10.0.0.2/teams.html | \
KEY="Too much cheese." /opt/tokens/bin/arc4 | \
while read hash; do
install -o ctf -d $p/$hash