From ee26b2876d16cc9e64ccdf7610737cc130a1e4dc Mon Sep 17 00:00:00 2001
From: "Paul S. Ferrell" <pflarr@cfl.lanl.gov>
Date: Wed, 7 Oct 2009 10:50:18 -0600
Subject: [PATCH] Assorted changes to get my badmath and tanks working on the
 ctf server.

---
 badmath/Gyopi.py     |  16 +++++++++++-----
 badmath/badmath.tce  | Bin 4492 -> 4574 bytes
 badmath/fake         |   3 ++-
 badmath/run          |   2 +-
 tanks/Makefile       |   5 ++---
 tanks/run            |   6 ++++--
 tanks/t.py           |   3 +++
 tanks/www/docs.cgi   |   2 +-
 tanks/www/errors.cgi |  34 +++++++++++++++++-----------------
 tanks/www/submit.cgi |  30 ++++++++++++++++--------------
 10 files changed, 57 insertions(+), 44 deletions(-)
 create mode 100644 tanks/t.py

diff --git a/badmath/Gyopi.py b/badmath/Gyopi.py
index 47cef85..c36bdce 100644
--- a/badmath/Gyopi.py
+++ b/badmath/Gyopi.py
@@ -40,6 +40,7 @@ class Gyopi(irc.Bot):
             self._lvl = 0
             self._flag.set_flag( self.FLAG_DEFAULT )
 
+            self._tokens = []
             self._lastAttempt = {}
             self._affiliations = {}
             self._newPuzzle()
@@ -62,7 +63,7 @@ class Gyopi(irc.Bot):
         self.last_tb = '%s %s %s' % (t, v, infostr)
         print(self.last_tb)
 
-    def cmd_join(self, sender, forum, addl):
+    def cmd_JOIN(self, sender, forum, addl):
         """On join, announce who has the flag."""
         if sender.name() in self.nicks:
             self._tellFlag(forum)
@@ -150,11 +151,11 @@ class Gyopi(irc.Bot):
             self._tokens[user].remove(token)
 
 
-    def cmd_privmsg(self, sender, forum, addl):
+    def cmd_PRIVMSG(self, sender, forum, addl):
         text = addl[0]
         who = sender.name()
         if text.startswith('!'):
-            parts = text[1:].lower().split(' ', 1)
+            parts = text[1:].split(' ', 1)
             cmd = parts[0]
             if len(parts) > 1:
                 args = parts[1]
@@ -179,6 +180,7 @@ class Gyopi(irc.Bot):
             elif cmd.startswith('h'):
                 # Help
                 forum.msg('Goal: Help me with my math homework, FROM ANOTHER DIMENSION!')
+                forum.msg('Order of operations is always left to right.')
                 #forum.msg('Goal: The current winner gets to control the contest music.')
                 forum.msg('Commands: !help, !flag, !register [TEAM], !solve SOLUTION,!? EQUATION, !ops, !problem, !who')
             elif cmd.startswith('prob'):
@@ -208,11 +210,15 @@ class Gyopi(irc.Bot):
 #                    self._giveToken(who, sender)
                     self._saveState()
                 else:
-                    forum.msg('%s: %s != %s' % (who, attempt, answer))
                     forum.msg('%s: That is not correct.' % who)
 
             # Test a simple one op command.
             elif cmd.startswith('?'):
+                if not args:
+                    forum.msg('%s: Give me an easier problem, and I\'ll '
+                              'give you the answer.' % who)
+                    return 
+
                 try:
                     tokens = badmath.parse(''.join(args))
                 except (ValueError) as msg:
@@ -253,7 +259,7 @@ if __name__ == '__main__':
                  help='Flag server password')
     p.add_option('-d', '--path', dest='path', default='/var/lib/badmath',
                  help='Path to where we can store state info.')
-    p.add_option('-c', '--channel', dest='channel', default='+badmath',
+    p.add_option('-c', '--channel', dest='channel', default='#badmath',
                  help='Which channel to join')
 
     opts, args = p.parse_args()
diff --git a/badmath/badmath.tce b/badmath/badmath.tce
index ec0516ab8ef924ae1e2181836425ae9ac0c6e1e6..fab58178fe612edb15f4cd3e0cf70ed3620983b7 100644
GIT binary patch
literal 4574
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
I4FGrm03GM{Y5)KL

literal 4492
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

diff --git a/badmath/fake b/badmath/fake
index 5e3c978..85d3f2c 100644
--- a/badmath/fake
+++ b/badmath/fake
@@ -10,5 +10,6 @@ dev=16,ino=87557238,mode=40755,uid=0,gid=0,nlink=2,rdev=0
 dev=16,ino=87557239,mode=40755,uid=0,gid=0,nlink=2,rdev=0
 dev=16,ino=87557240,mode=40755,uid=0,gid=0,nlink=2,rdev=0
 dev=16,ino=87573208,mode=100755,uid=0,gid=0,nlink=1,rdev=0
+dev=16,ino=87573213,mode=100755,uid=0,gid=0,nlink=1,rdev=0
+dev=16,ino=87573285,mode=100755,uid=0,gid=0,nlink=1,rdev=0
 dev=16,ino=87573433,mode=100755,uid=0,gid=0,nlink=1,rdev=0
-dev=16,ino=87573456,mode=100755,uid=0,gid=0,nlink=1,rdev=0
diff --git a/badmath/run b/badmath/run
index 4477536..d5c3b2b 100755
--- a/badmath/run
+++ b/badmath/run
@@ -5,4 +5,4 @@
 DATA_PATH=/var/lib/badmath
 mkdir -p $DATA_PATH
 
-exec envuidgid ctf python3.0 usr/lib/ctf/badmath/Gyopi.py --data=$DATA_PATH
+exec envuidgid ctf python3 /usr/lib/ctf/badmath/Gyopi.py --path=$DATA_PATH
diff --git a/tanks/Makefile b/tanks/Makefile
index cb27c38..b769a30 100644
--- a/tanks/Makefile
+++ b/tanks/Makefile
@@ -17,9 +17,8 @@ target:
 	$(INSTALL) AI/medium/* target/var/lib/tanks/ai/medium/
 	$(INSTALL) AI/hard/* target/var/lib/tanks/ai/hard/
 
-	$(INSTALL) -d target/var/lib/www/tanks/
-	$(INSTALL) www/* target/var/lib/www/tanks/
-	$(FAKE) ln -s target/var/lib/tanks/ target/var/lib/www/data
+	$(INSTALL) -d target/usr/lib/www/tanks/
+	$(INSTALL) www/* target/usr/lib/www/tanks/
 
 	$(INSTALL) -d target/usr/lib/python2.6/site-packages/tanks/
 	$(INSTALL) lib/* target/usr/lib/python2.6/site-packages/tanks/
diff --git a/tanks/run b/tanks/run
index a8157be..8457d0b 100755
--- a/tanks/run
+++ b/tanks/run
@@ -2,5 +2,7 @@
 
 [ -f /var/lib/ctf/disabled/tanks ] && exit 0
 
-envuidgid ctf python2.6 run_tanks.py /var/lib/tanks/ easy 100  &
-envuidgid ctf report_score.py
+ln -s /var/lib/tanks /usr/lib/www/tanks/results
+
+envuidgid ctf python2.6 run_tanks.py /var/lib/tanks/ easy 100  2>&1 &
+envuidgid ctf report_score.py 2>&1
diff --git a/tanks/t.py b/tanks/t.py
new file mode 100644
index 0000000..7a2285d
--- /dev/null
+++ b/tanks/t.py
@@ -0,0 +1,3 @@
+import sys
+
+print >> sys.stderr, 'hello'
diff --git a/tanks/www/docs.cgi b/tanks/www/docs.cgi
index 8ceb4d0..26306e3 100755
--- a/tanks/www/docs.cgi
+++ b/tanks/www/docs.cgi
@@ -7,7 +7,7 @@ import os
 import sys
 
 try:
-    from Tanks import Program, setup, conditions, actions, docs
+    from tanks import Program, setup, conditions, actions, docs
 except:
     path = os.getcwd().split('/')
     path.pop()
diff --git a/tanks/www/errors.cgi b/tanks/www/errors.cgi
index 1359cc9..f61d2bc 100755
--- a/tanks/www/errors.cgi
+++ b/tanks/www/errors.cgi
@@ -1,9 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-print """Content-Type: text/html\n\n"""
-print """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN">\n\n"""
+print("""Content-Type: text/html\n\n""")
+print("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN">\n\n""")
 import cgi
 import cgitb; cgitb.enable()
+import sys
 import os
 
 import Config
@@ -16,18 +17,17 @@ except:
 try:
     from ctf import teams
 except:
-    import sys
     path = '/home/pflarr/repos/gctf/'
     sys.path.append(path)
     from ctf import teams
 teams.build_teams()
 
 head = open('head.html').read() % "Error Report"
-print head
-print open('links.html').read()
+print(head)
+print(open('links.html').read())
 
 def done():
-    print '</body></html>'
+    print('</body></html>')
     sys.exit(0)
 
 fields = cgi.FieldStorage()
@@ -38,25 +38,25 @@ if team and passwd and \
     path = os.path.join(Config.DATA_PATH, 'errors', quote(team))
     if os.path.isfile(path):
         errors = open(path).readlines()
-        print '<p>Your latest errors:'
-        print '<div class=errors>'
+        print('<p>Your latest errors:')
+        print('<div class=errors>')
         if errors:
-            print '<BR>\n'.join(errors)
+            print('<BR>\n'.join(errors))
         else:
-            print 'There were no errors.'
-        print '</div>'
+            print('There were no errors.')
+        print('</div>')
     else:
-        print '<p>No error file found.'
+        print('<p>No error file found.')
 
     done()
 
 if team and team not in teams.teams:
-    print '<p>Invalid team.'
+    print('<p>Invalid team.')
 
 if team and team in teams.teams and passwd != teams.teams[team][0]:
-    print '<p>Invalid password.'
+    print('<p>Invalid password.')
 
-print '''
+print('''
 <form action="errors.cgi" method="get">
     <fieldset>
         <legend>Error report request:</legend>
@@ -64,6 +64,6 @@ print '''
         Password: <input type="text" name="passwd"><BR>
         <button type="get my errors">Submit</button>
     </fieldset>
-</form>'''
+</form>''')
 
 done()
diff --git a/tanks/www/submit.cgi b/tanks/www/submit.cgi
index 9d57907..5dad944 100755
--- a/tanks/www/submit.cgi
+++ b/tanks/www/submit.cgi
@@ -1,8 +1,11 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
+print("Content-Type: text/html\n\n")
+print("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN">\n\n""")
 import cgi
 import cgitb; cgitb.enable()
 import os
+import sys
 
 import Config
 
@@ -14,21 +17,18 @@ except:
 try:
     from ctf import teams
 except:
-    import sys
     path = '/home/pflarr/repos/gctf/'
     sys.path.append(path)
     from ctf import teams
 teams.build_teams()
 
-print """Content-Type: text/html\n\n"""
-print """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN">\n\n"""
 head = open('head.html').read() % "Submission Results"
-print head
-print "<H1>Results</H1>"
-print open('links.html').read() 
+print(head)
+print("<H1>Results</H1>")
+print(open('links.html').read())
 
 def done():
-    print '</body></html>'
+    print('</body></html>')
     sys.exit(0)
 
 fields = cgi.FieldStorage()
@@ -36,21 +36,23 @@ team = fields.getfirst('team', '').strip()
 passwd = fields.getfirst('passwd', '').strip()
 code = fields.getfirst('code', '')
 if not team:
-    print '<p>No team specified'; done()
+    print('<p>No team specified'); done()
 elif not passwd:
-    print '<p>No password given'; done()
+    print('<p>No password given'); done()
 elif not code:
-    print '<p>No program given.'; done()
+    print('<p>No program given.'); done()
 
 if team not in teams.teams:
-    print '<p>Team is not registered.'; done()
+    print('<p>Team is not registered.'); done()
 
 if passwd != teams.teams[team][0]:
-    print '<p>Invalid password.'; done()
+    print('<p>Invalid password.'); done()
 
-path = os.path.join(Config.DATA_PATH, 'ai/players', encode(team) )
+path = os.path.join(Config.DATA_PATH, 'ai/players', quote(team) )
 file = open(path, 'w')
 file.write(code)
 file.close()
 
+print("<P>Submission Successful")
+
 done()