From 9d0921d5a5fb8df97663c998d6ba83a28cb3d706 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Tue, 12 Jun 2012 19:24:51 -0500 Subject: [PATCH] Remove self.require_gpg. Making GPG optional requires a lot more rework than I'm prepared to do right now. GPG *is* currently the fundamental identity base of this system and I don't know what upending that would look like. The most likely result is that authenticated clients couldn't talk to non-authenticated clients. --- ugly_hacks/santiago/santiago.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ugly_hacks/santiago/santiago.py b/ugly_hacks/santiago/santiago.py index ba11d5561..4c6eeae0f 100644 --- a/ugly_hacks/santiago/santiago.py +++ b/ugly_hacks/santiago/santiago.py @@ -131,8 +131,6 @@ class Santiago(object): self.hosting = hosting if hosting else self.load_data("hosting") self.consuming = consuming if consuming else self.load_data("consuming") - self.require_gpg = require_gpg - def create_connectors(self, data, type): connectors = self._create_connectors(data, type) self.protocols |= set(connectors.keys()) @@ -385,7 +383,7 @@ class Santiago(object): debug_log("fail fingerprint {0}".format(str(request.fingerprint))) return - # copy out only required keys from request, throwing away cruft + # copy out only white-listed keys from request, throwing away cruft request_body = dict() source = json.loads((str(request))) try: @@ -688,7 +686,7 @@ if __name__ == "__main__": santiago = Santiago(listeners, senders, hosting, consuming, - me=mykey, monitors=monitors, require_gpg = False) + me=mykey, monitors=monitors) # import pdb; pdb.set_trace() with santiago: