[minion-cvs] Work on configuration-checking logic

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv27986/src/minion/lib/mixminion

Modified Files:
	ServerInfo.py test.py 
Log Message:
Work on configuration-checking logic

Index: ServerInfo.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ServerInfo.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ServerInfo.py	20 Feb 2003 16:57:39 -0000	1.39
+++ ServerInfo.py	18 Apr 2003 17:41:38 -0000	1.40
@@ -58,8 +58,11 @@
                      "Contact": ("ALLOW", None, None),
                      "Comments": ("ALLOW", None, None),
                      "Packet-Key": ("REQUIRE", C._parsePublicKey, None),
+                     "Contact-Fingerptint": ("ALLOW", None, None),
+                     # XXXX010 change these next few to "REQUIRE".
                      "Packet-Formats": ("ALLOW", None, None),
                      "Software": ("ALLOW", None, None),
+                     "Secure-Configuration": ("ALLOW", C._parseBoolean, None),
                      },
         "Incoming/MMTP" : {
                      "Version": ("REQUIRE", None, None),

Index: test.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/test.py,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- test.py	10 Apr 2003 03:03:16 -0000	1.98
+++ test.py	18 Apr 2003 17:41:38 -0000	1.99
@@ -3555,6 +3555,8 @@
         eq(info['Server']['Valid-Until']-info['Server']['Valid-After'],
            10*24*60*60)
         eq(info['Server']['Contact'], "a@b.c")
+        eq(info['Server']['Software'], "Mixminion 0.0.4alpha")
+        eq(info['Server']['Packet-Formats'], "0.2")
         eq(info['Server']['Comments'],
            "This is a test of the emergency broadcast system")