Getting signing working!

3 files changed, 39 insertions, 15 deletions

diff --git a/ssh.py b/__init__.py
index 0c60cb0..a783fc3 100644
--- a/ssh.py
+++ b/__init__.py
@@ -26,36 +26,49 @@ from mercurial import node as hgnode
 from mercurial.i18n import _
 
 
-def absolute_path(path):
-    path = os.path.expandvars(path)
-    return os.path.expanduser(path)
-
-
 class SSHAuthority(object):
 
     @classmethod
     def from_ui(cls, ui):
         public_key = absolute_path(ui.config("sshsign", "public_key"))
-        private_key = absolute_path(ui.config("sshsign", "private_key"))
-        manifest_file = absolute_path(ui.config("sshsign", "manifest_file"))
-
-        manifest = KeyManifest.from_file(manifest_file)
         public_key = keys.PublicKey.from_file(public_key)
 
+        manifest_file = ui.config("sshsign", "manifest_file")
+        if manifest_file:
+            manifest = KeyManifest.from_file(absolute_path(manifest_file))
+        else:
+            manifest = None
+            ui.write(_("No key manifest set. You will not be able to verify"
+                        " signatures.\n"))
+
+        private_key = ui.config("sshsign", "private_key", None)
+        agent_socket = os.environ.get(SSHAgent.AGENT_SOCK_NAME)
+        if private_key:
+            private_key = keys.load_private_key(absolute_path(private_key))
+        elif agent_socket:
+            private_key = SSHAgent(agent_socket, key=public_key.blob)
+        else:
+            raise util.Abort(_("No private key set and no agent running."))
+
+        return cls(public_key, manifest, private_key)
+
     def __init__(self, public_key, key_manifest=None, private_key=None):
         self.public_key = public_key
         self.key_manifest = key_manifest
         self.private_key = private_key
 
     def verify(self, data, signature, whom):
-        key = self.key_manifest[whom] # XXX: More elegant error handling.
+        try:
+            key = self.key_manifest[whom] # XXX: More elegant error handling.
+        except KeyError:
+            raise util.Abort(_("No key found for %s" % whom))
+
         return key.verify(data, signature)
 
     def sign(self, data):
         return self.private_key.sign(data)
 
 
-
 def node2txt(repo, node, ver):
     """map a manifest into some text"""
     if ver != "0":
@@ -64,6 +77,11 @@ def node2txt(repo, node, ver):
     return "%s\n" % hgnode.hex(node)
 
 
+def absolute_path(path):
+    path = os.path.expandvars(path)
+    return os.path.expanduser(path)
+
+
 def sign(ui, repo, *revs, **opts):
     """add a signature for the current or given revision
 
diff --git a/keys.py b/keys.py
index 33cb98e..d15af08 100644
--- a/keys.py
+++ b/keys.py
@@ -35,7 +35,7 @@ class PublicKey(object):
     def sign(self, data):
         return self.instance.sign(data)
 
-    @property
+    @classmethod
     def from_string(cls, key):
         """
         Loads an RFC 4716 formatted public key.
@@ -58,7 +58,7 @@ class PublicKey(object):
 
         return pubkey
 
-    @property
+    @classmethod
     def from_file(cls, filename):
         fp = open(filename)
         try:
diff --git a/sshagent.py b/sshagent.py
index 6803b89..cd5fa20 100644
--- a/sshagent.py
+++ b/sshagent.py
@@ -25,7 +25,7 @@ class SSHAgent(object):
     SSH2_AGENT_SIGN_RESPONSE = 14
     SSH2_AGENTC_SIGN_REQUEST = 13
 
-    def __init__(self, socket_path=None):
+    def __init__(self, socket_path=None, key=None):
         default_path = os.environ.get(SSHAgent.AGENT_SOCK_NAME)
         socket_path = default_path if not socket_path else socket_path
 
@@ -33,6 +33,7 @@ class SSHAgent(object):
             raise ValueError("Could not find an ssh agent.")
 
         self.socket_path = socket_path
+        self.public_key = key
         self.socket = None
 
     def connect(self):
@@ -51,10 +52,15 @@ class SSHAgent(object):
 
         return packet
 
-    def sign(self, data, key):
+    def sign(self, data, key=None):
         if not self.socket:
             self.connect()
 
+        if not key and self.public_key:
+            key = self.public_key
+        else:
+            raise Exception("No key specified!")
+
         packet = self._build_packet(data, key)
 
         remaining = 0