[minion-cvs] Another patch from Tobias: get servers using Contact-Fi...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria:/tmp/cvs-serv25358/lib/mixminion/server

Modified Files:
	ServerConfig.py ServerKeys.py 
Log Message:
Another patch from Tobias: get servers using Contact-Fingerprint.

Index: ServerConfig.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerConfig.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- ServerConfig.py	20 Dec 2004 04:16:21 -0000	1.59
+++ ServerConfig.py	2 Nov 2007 03:46:27 -0000	1.60
@@ -346,6 +346,7 @@
                      'Mode' : ('REQUIRE', "serverMode", "local"),
                      'Nickname': ('REQUIRE', "nickname", None),
                      'Contact-Email': ('REQUIRE', "email", None),
+                     'Contact-Fingerprint': ('ALLOW', None, None),
                      'Comments': ('ALLOW', None, None),
                      'ModulePath': ('ALLOW', None, None),
                      'Module': ('ALLOW*', None, None),

Index: ServerKeys.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerKeys.py,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- ServerKeys.py	8 Oct 2007 19:03:21 -0000	1.73
+++ ServerKeys.py	2 Nov 2007 03:46:27 -0000	1.74
@@ -864,6 +864,8 @@
     if config_s['Contact-Email'] != info_s['Contact']:
         warn("Mismatched contacts: %s in configuration; %s published.",
              config_s['Contact-Email'], info_s['Contact'])
+    if config_s['Contact-Fingerprint'] != info_s['Contact-Fingerprint']:
+        warn("Mismatched contact fingerprints.")
 
     if info_s['Software'] and info_s['Software'] != (
         "Mixminion %s" % mixminion.__version__):
@@ -990,6 +992,7 @@
     # Now, we pull all the information we need from our configuration.
     nickname = config['Server']['Nickname']
     contact = config['Server']['Contact-Email']
+    fingerprint = config['Server']['Contact-Fingerprint']
     comments = config['Server']['Comments']
     if not now:
         now = time.time()
@@ -1090,6 +1093,8 @@
         """ % fields
     if insecurities:
         info += "Why-Insecure: %s\n"%(", ".join(insecurities))
+    if fingerprint:
+        info += "Contact-Fingerprint: %s\n"%fingerprint
     if comments:
         info += "Comments: %s\n"%comments