Commit Graph

1923 Commits

Author SHA1 Message Date
Curt Hash 3dd84a10f4 In order to make it harder for clients to allow connections from
pollster while blocking everyone else, pollster will now change
IP addresses every minute. The pollster box will need a secondary
interface (default: eth1) in order to do this. Before each poll,
the mac address of the interface is changed to a random address
with a particular vendor code (default: 00:01:c0 (FitPC)) and a
new address is requested via DHCP. All connections made from
pollster are bound to the new address, forcing them out through
the secondary interface. This caused some problems, since the
poll function for cat.cgi previously relied on urllib, which did
not support binding. I ended up having to subclass
http.client.HTTPConnection and override __init__() and connect().
These changes necessitated two new global configuration variables:
	(1) POLL_MAC_VENDOR : the vendor code to use in the random MAC
	(2) POLL_IFACE : the secondary interface to use

I also fixed a bug where an empty string would be interpreted as a
valid team name.
2010-01-22 16:57:45 -07:00
Curt Hash 9b14d50374 changed catcgi poller to use library rather than my socket code 2010-01-21 13:16:52 -07:00
Curt Hash 82cb84ff78 untest 2010-01-19 15:52:25 -07:00
Curt Hash fc4917a7d1 test 2010-01-19 15:52:08 -07:00
Curt Hash 5f6eeeb1b8 more merged changes from server 2010-01-19 15:31:15 -07:00
Curt Hash 1328229708 merged changed from tfi server 2010-01-19 15:11:59 -07:00
Curt Hash 1bd31704e8 testing 2010-01-19 13:33:15 -07:00
Paul S. Ferrell 750e8f4715 Fixed path escaping for tanks.wq 2009-12-16 08:00:10 -07:00
Paul S. Ferrell 39d7b98852 Fixed some formatting issues in some puzzles. 2009-10-15 16:29:52 -06:00
Curt Hash 39ef9d4694 added keys 2009-10-15 16:17:39 -06:00
Paul S. Ferrell cb7f0cc055 Makefile - transfer .py files instead of .pyc
histogram.py - now locks the histogram file before making a new one.
puzzler.py - fixed name error
mkpuzzles.py - now handles subdirectories
2009-10-15 15:22:07 -06:00
Erin M. Ochoa 72b6c9766d Merge cfl:/var/projects/gctf 2009-10-15 14:46:43 -06:00
Erin M. Ochoa 246651313e changed library puzzle 2009-10-15 14:46:13 -06:00
Alexander Brugh 4238aa8636 Merge branch 'master' of cfl.lanl.gov:/var/projects/gctf 2009-10-15 14:32:41 -06:00
Alexander Brugh b038aa926e new puzzle shit 2009-10-15 14:32:23 -06:00
Paul S. Ferrell 00b243b234 Finished the crypto puzzles. 2009-10-15 12:34:58 -06:00
Daniel A. Quist 358145792c Added Kevin Nauer's forensics puzzles 2009-10-15 11:54:29 -06:00
Daniel A. Quist 08671f2b6e Added two entries 2009-10-15 11:22:51 -06:00
Curt Hash 65ceacf3ac fixed typo 2009-10-15 09:48:09 -06:00
Curt Hash f19f096082 removed error check on os.remove 2009-10-15 09:35:42 -06:00
Curt Hash f583b2851e Merge branch 'master' of cfl:/var/projects/gctf 2009-10-14 16:53:30 -06:00
Curt Hash 418f92ae6d changed makedb script to make the db read only 2009-10-14 16:51:56 -06:00
Curt Hash e622fd70b7 forgot key file 2009-10-14 14:20:33 -06:00
Curt Hash e8300a3740 80pt webapp puzzle 2009-10-14 14:16:09 -06:00
Paul S. Ferrell a0a845f0e7 Added lines to clear tanks state to new-contest. 2009-10-13 16:10:59 -06:00
Paul S. Ferrell b658035581 Merge branch 'master' of ssh://cfl.lanl.gov/var/projects/gctf 2009-10-13 16:08:31 -06:00
Paul S. Ferrell d3bdcb044b Added several new crypto puzzles. 2009-10-13 16:08:11 -06:00
Curt Hash 5a8004468e 70pt webapp puzzle 2009-10-13 15:50:08 -06:00
Curt Hash 5ba0e55a18 fixed repeat attribute 2009-10-13 15:00:36 -06:00
Curt Hash bc20a76487 60pt webapp puzzle 2009-10-13 15:00:04 -06:00
Curt Hash 474bbf83fd 50pt webapp puzzle 2009-10-13 14:03:35 -06:00
Paul S. Ferrell ed885cafc5 Added new puzzle category, crypto. 2009-10-13 10:08:03 -06:00
Erin M. Ochoa 518bb2988d added summary file to hispaniola 2009-10-09 10:55:37 -06:00
Erin M. Ochoa f8938a2000 removed posters dir (already added hispaniola) 2009-10-09 10:51:42 -06:00
Neale Pickett 7de6e179ec Histogram will always have a valid png now 2009-10-09 10:28:57 -06:00
Neale Pickett 6db2dd2edf Merge cfl:/var/projects/gctf 2009-10-09 10:15:46 -06:00
Neale Pickett 9fe367ff39 A couple ctfd and pollster fixes 2009-10-09 10:15:24 -06:00
Erin M. Ochoa 4fd2600919 changed symbols puzzle (instructions, but not key) 2009-10-09 10:14:01 -06:00
Erin M. Ochoa 14da31ca65 renamed posters category 2009-10-09 09:35:15 -06:00
Erin M. Ochoa 1c4e550dd2 updated interrobang key 2009-10-09 09:32:32 -06:00
Neale Pickett fdf76ed847 Pollster does much quicker HTML updates now 2009-10-09 08:55:51 -06:00
Neale Pickett 93c9306ea5 Tanks now using HTML template 2009-10-09 08:47:19 -06:00
Neale Pickett 1f9d735832 Add "service flags" tab on HTML 2009-10-08 17:46:42 -06:00
Curt Hash 1ee9d5d21d changed to svc 2009-10-08 17:24:05 -06:00
Neale Pickett d1baa77f2a Slaughtered all the stuff I asked Curt to add 2009-10-08 17:07:15 -06:00
Neale Pickett 811141e4d9 Merge cfl:/var/projects/gctf
Conflicts:
	pollster/pollster.py
2009-10-08 16:44:42 -06:00
Neale Pickett ec202f23f5 Mostly cosmetics 2009-10-08 16:42:26 -06:00
Curt Hash fbf09276c0 changed it so that the response from the polls is not turned
into a string until it returns to the poller loop. This allows
poll functions to manipulate the raw responses from the socket
reads. Also added an ACK to tftdp poller so that the tftpd
daemon stops whining about the socket closing without an ACK.
2009-10-08 16:40:14 -06:00
Curt Hash 6fb8d935ec summary of puzzles 1-4 2009-10-08 15:54:42 -06:00
Curt Hash 1ca3e319e1 fixed symlinks 2009-10-08 15:52:01 -06:00