diff --git a/Makefile b/Makefile index 8ce3a5a..084fd70 100644 --- a/Makefile +++ b/Makefile @@ -19,15 +19,15 @@ target: $(PYC) $(INSTALL) -d $(CTFDIR) $(INSTALL) $(PYC) $(CTFDIR) - $(INSTALL) uberserv.py $(CTFDIR) + $(INSTALL) ctfd.py $(CTFDIR) $(INSTALL) -d $(WWWDIR) - $(INSTALL) index.html ctf.css $(WWWDIR) + $(INSTALL) index.html intro.html ctf.css $(WWWDIR) $(FAKE) ln -s /var/lib/ctf/histogram.png $(WWWDIR) $(INSTALL) register.cgi scoreboard.cgi puzzler.cgi $(WWWDIR) $(INSTALL) -d $(DESTDIR)/var/service/ctf - $(INSTALL) run.uberserv $(DESTDIR)/var/service/ctf/run + $(INSTALL) run.ctfd $(DESTDIR)/var/service/ctf/run rm -rf $(WWWDIR)/puzzler $(INSTALL) -d $(WWWDIR)/puzzler diff --git a/ctf.css b/ctf.css index 4078cf0..fa04941 100644 --- a/ctf.css +++ b/ctf.css @@ -1,26 +1,67 @@ +/**** document ****/ + +html { + background: #222 url(http://dirtbags.net/images/grunge.png) no-repeat; +} + body { - background: #000; - color: #0f0; -} -.readme { - background: #444; -} -a:link { - color: #ff0; -} -a:visited { - color: #880; -} -a:hover { - color: #000; - background: #ff0; -} -.error { - color: #000; - background: #f00; -} -input { - border: 2px solid #088; + font-family: sans-serif; color: #fff; - background: #000; -} \ No newline at end of file + margin: 50px 0 0 100px; + padding: 10px; + max-width: 700px; +} + +a img { + border: 0px; +} + +a { + text-decoration: none; + color: #2a2; + font-weight: bold; +} + +a:hover { + color: #fff; + background: #2a2; + font-weight: bold; +} + +code, pre, .readme { + color: #fff; + background-color: #555; + margin: 1em; +} + + +/**** heading ****/ + +h1:first-child { + text-transform: lowercase; + font-size: 1.6em; + letter-spacing: -0.1em; + background-color: #222; + opacity: 0.9; + padding: 3px; + color: #2a2; + margin: 0 0 1em 70px; +} + +h1:first-child:before { + color: #fff; + content: "Capture The Flag: "; +} + +/*** body ***/ + +p { + line-height: 1.4em; + margin-bottom: 20px; + color: #f4f4f4; +} + +h1, h2, h3 { + color: #999; + letter-spacing: -0.05em; +} diff --git a/uberserv.py b/ctfd.py similarity index 97% rename from uberserv.py rename to ctfd.py index 3c04100..8f4abc1 100755 --- a/uberserv.py +++ b/ctfd.py @@ -5,6 +5,7 @@ import pointsd import game import flagd import histogram +import config def main(): pointsrv = pointsd.start() diff --git a/index.html b/index.html index 89fe545..50fce64 100644 --- a/index.html +++ b/index.html @@ -7,16 +7,21 @@ -

Capture The Flag

+

Welcome

    +
  1. Read the introduction to this event
  2. Register your team
    3. -
  3. Scoreboard
    4. +
  4. View the score board
-

- Some challenges are puzzles. Some are - sitting on the network; you must find these yourself! -

+ + diff --git a/intro.html b/intro.html new file mode 100644 index 0000000..0eea942 --- /dev/null +++ b/intro.html @@ -0,0 +1,77 @@ + + + + + Introduction + + + +

Introduction

+ +

+ Welcome to Capture The Flag, blah blah blah. +

+ +

What This Is

+ + + + +

What This Is Not

+ + + +

Rules

+ +

Important Rules

+ + +

Less-Important Rules

+ + +

Hints

+ +

+ If you are really stuck, you can ask for a hint. It will cost you + points, though. For puzzles, you will lose ΒΌ of the points for + that puzzle even if you never solve the puzzle. For + other events, the staff member will decide how many points it will + cost. You can try to bribe us or otherwise fanagle information + out of us, or other contestants. It's a hacking contest. +

+ +

About Us

+ +

+ We are the dirtbags. You might + be better at this than we are, but you're not running the contest. +

+ + diff --git a/mkpuzzles.py b/mkpuzzles.py index fab4e98..f019da6 100755 --- a/mkpuzzles.py +++ b/mkpuzzles.py @@ -61,12 +61,15 @@ for cat in os.listdir(opts.puzzles): f.write('\n') f.write('''
- - - Team:
- Password:
- Key:
- +
+ Your answer: + + + Team:
+ Password:
+ Key:
+ +
diff --git a/register.py b/register.py index 84ac82a..6698306 100755 --- a/register.py +++ b/register.py @@ -30,7 +30,9 @@ def main():
- + Registration information: + + $team_error
diff --git a/run.ctfd b/run.ctfd new file mode 100755 index 0000000..fa143a3 --- /dev/null +++ b/run.ctfd @@ -0,0 +1,4 @@ +#! /bin/sh + +/usr/lib/ctf/ctfd.py 2>&1 | logger -t ctfd + diff --git a/run.uberserv b/run.uberserv deleted file mode 100755 index 94bd8bc..0000000 --- a/run.uberserv +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -/usr/lib/ctf/uberserv.py | logger -t ctf