PyGPGME-based library

Makefile

@@ -1,3 +1,3 @@
 
 clean:
-		rm -f *.pyc
+		find . -name "*.pyc" -type f -delete

RELEASE_NOTES

@@ -4,8 +4,12 @@ This is the v0.3 release and bring a few tiny fixes all over the program.
 Changes
 ==========
 
+-Major
+ * New gpg library which replaces monkeysign dependency
  * Optimised finding the correct key to download
  * Removed once discovered clients if they disappear
+
+-Minor
  * Experimental compatibility for older Gtk versions (set_always_show_image)
  * Minor UI improvement: Do not delete the manually typed fingerprint when going back
  * Also accept more correctly typed fingerprint with a more relaxed verification routine
@@ -17,5 +21,5 @@ Resources
 =========
 
 Download: https://github.com/muelli/geysigning/releases/download/0.3/gnome-keysign-0.3.tar.gz
-sha256sum: 
+sha256sum:
 Web site: https://wiki.gnome.org/GnomeKeysign

keysign/GPGQRCode.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 #    Copyright 2014 Tobias Mueller <[email protected]>
+#    Copyright 2015 Andrei Macavei <[email protected]>
 #
 #    This file is part of GNOME Keysign.
 #
@@ -20,20 +21,24 @@
 for keys and selects the one matching your input
 """
 from gi.repository import Gtk
-from monkeysign.gpg import Keyring
+import gpgme
+from gpg import gpg
 
 from QRCode import QRImage
 
 def main():
     import sys
+    if len(sys.argv) < 2:
+        print ("Usage: {} <KEY>".format(sys.argv[0]))
+        sys.exit(1)
     key = sys.argv[1]
-    keyring = Keyring()
-    keys = keyring.get_keys(key)
+    keyring = gpgme.Context()
+    keys = gpg.get_keylist(keyring, key)
     # Heh, we take the first key here. Maybe we should raise a warning
     # or so, when there is more than one key.
-    fpr = keys.items()[0][0]
+    fpr = keys[0].subkeys[0].fpr
     data = 'OPENPGP4FPR:' + fpr
-    
+
     w = Gtk.Window()
     w.connect("delete-event", Gtk.main_quit)
     w.set_default_size(100,100)

keysign/KeyPresent.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 #    Copyright 2014 Tobias Mueller <[email protected]>
+#    Copyright 2015 Andrei Macavei <[email protected]>
 #
 #    This file is part of GNOME Keysign.
 #
@@ -26,7 +27,8 @@
 from gi.repository import Gtk, GLib
 from gi.repository import GObject
 
-from monkeysign.gpg import Keyring
+import gpgme
+from gpg import gpg
 
 # These are relative imports
 from __init__ import __version__
@@ -41,7 +43,7 @@
 class KeyPresent(Gtk.Application):
     """A demo application showing how to display sufficient details
     about a key such that it can be sent securely.
-    
+
     Note that the main purpose is to enable secure transfer, not
     reviewing key details.  As such, the implementation might change
     a lot, depending on the method of secure transfer.
@@ -127,16 +129,14 @@ def main(args=sys.argv):
                         format='%(name)s (%(levelname)s): %(message)s')
     try:
         arguments = parse_command_line(args)
-        
+
         #if arguments.gpg:
         #    keyid = arguments.file
-        #    keyring = Keyring()
-        #    # this is a dict {fpr: key-instance}
-        #    found_keys = keyring.get_keys(keyid)
+        #    ctx = gpgme.Context()
+        #    found_keys = gpg.get_keylist(ctx, keyid)
         #    # We take the first item we found and export the actual keydata
-        #    fpr = found_keys.items()[0][0]
-        #    keyring.export_data(fpr=fpr, secret=False)
-        #    keydata = keyring.context.stdout
+        #    fpr = found_keys[0].subkeys[0].fpr
+        #    keydata = gpg.extract_keydata(ctx, fpr, True)
         #else:
         #    keydata = open(arguments.file, 'r').read()
         fpr = arguments.fpr
@@ -146,12 +146,12 @@ def main(args=sys.argv):
             GLib.unix_signal_add_full(GLib.PRIORITY_HIGH, signal.SIGINT, lambda *args : app.quit(), None)
         except AttributeError:
             pass
-    
+
         exit_status = app.run(fpr)
-    
+
         return exit_status
 
-        
+
     finally:
         logging.shutdown()
 

keysign/KeysPage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # encoding: utf-8
+#    Copyright 2015 Andrei Macavei <[email protected]>
 #    Copyright 2014 Tobias Mueller <[email protected]>
 #
 #    This file is part of GNOME Keysign.
@@ -26,9 +27,10 @@
 from gi.repository import Gtk, GLib
 from gi.repository import GObject
 
-from monkeysign.gpg import Keyring
+import gpgme
 
 # These are relative imports
+from gpg import gpg
 from __init__ import __version__
 
 log = logging.getLogger()
@@ -37,10 +39,10 @@
 class KeysPage(Gtk.VBox):
     '''This represents a list of keys with the option for the user
     to select one key to proceed.
-    
+
     This class emits a `key-selection-changed' signal when the user
     initially selects a key such that it is highlighted.
-    
+
     The `key-selected' signal is emitted when the user commits
     to a key, i.e. by pressing a designated button to make his
     selection public.
@@ -58,7 +60,7 @@ class KeysPage(Gtk.VBox):
 
     def __init__(self, show_public_keys=False):
         '''Sets the widget up.
-        
+
         The show_public_keys parameter is meant for development
         purposes only.  If set to True, the widget will show
         the public keys, too.  Otherwise, secret keys are shown.
@@ -71,19 +73,18 @@ def __init__(self, show_public_keys=False):
         # TreeView, i.e. in get_items_from_selection.
         self.store = Gtk.ListStore(str, str, str)
 
-        # FIXME: this should be moved to KeySignSection
-        self.keyring = Keyring() # the user's keyring
+        # XXX: maybe we can move this to KeySignSection in Sections.py
+        self.ctx = gpgme.Context()
 
         self.keysDict = {}
 
-        # FIXME: this should be a callback function to update the display
-        # when a key is changed/deleted
-        for key in self.keyring.get_keys(None, secret=True, public=show_public_keys).values():
-            if key.invalid or key.disabled or key.expired or key.revoked:
+        # FIXME: implement a callback that refreshes the UIDs when they change
+        for key in gpg.get_keylist(self.ctx, None, True):
+            if key.revoked or key.expired or key.invalid or key.subkeys[0].disabled:
                 continue
 
-            uidslist = key.uidslist #UIDs: Real Name (Comment) <email@address>
-            keyid = str(key.keyid()) # the key's short id
+            uidslist = key.uids
+            keyid = key.subkeys[0].fpr[-8:]
 
             if not keyid in self.keysDict:
                 self.keysDict[keyid] = key
@@ -125,7 +126,7 @@ def __init__(self, show_public_keys=False):
             self.treeView.append_column(nameColumn)
             self.treeView.append_column(emailColumn)
             self.treeView.append_column(keyColumn)
-            
+
             self.treeView.connect('row-activated', self.on_row_activated)
 
             # make the tree view resposive to single click selection
@@ -173,14 +174,14 @@ def get_items_from_selection(self, selection=None):
 
     def on_selection_changed(self, selection, *args):
         log.debug('Selected new TreeView item %s = %s', selection, args)
-        
+
         name, email, keyid = self.get_items_from_selection(selection)
-        
+
         key = self.keysDict[keyid]
         self.emit('key-selection-changed', keyid)
-        
+
         try:
-            exp_date = datetime.fromtimestamp(float(key.expiry))
+            exp_date = datetime.fromtimestamp(float(key.subkeys[0].expires))
             expiry = "{:%Y-%m-%d %H:%M:%S}".format(exp_date)
         except ValueError, e:
             expiry = "No expiration date"
@@ -207,7 +208,7 @@ def on_selection_changed(self, selection, *args):
     def on_row_activated(self, treeview, tree_path, column):
         '''A callback for when the user "activated" a row,
         e.g. by double-clicking an entry.
-        
+
         It emits the key-selected signal.
         '''
         # We just hijack the existing function.
@@ -222,15 +223,15 @@ def on_publish_button_clicked(self, button, key, *args):
         to publish a key on the network.  It will emit a "key-selected"
         signal with the ID of the selected key.'''
         log.debug('Clicked publish for key (%s) %s (%s)', type(key), key, args)
-        keyid = key.keyid()
+        keyid = key.subkeys[0].fpr[-8:]
         self.emit('key-selected', keyid)
 
 
 
 
 class Keys(Gtk.Application):
     """A widget which displays keys in a user's Keyring.
-    
+
     Once the user has selected a key, the key-selected
     signal will be thrown.
     """
@@ -273,7 +274,7 @@ def on_activate(self, app):
     def on_key_selection_changed(self, button, key):
         """This is the connected to the KeysPage's key-selection-changed
         signal
-        
+
         As a user of that widget, you would show more details
         in the GUI or prepare for a final commitment by the user.
         """
@@ -282,13 +283,13 @@ def on_key_selection_changed(self, button, key):
 
     def on_key_selected(self, button, key):
         """This is the connected to the KeysPage's key-selected signal
-        
+
         As a user of that widget, you would enable buttons or proceed
         with the GUI.
         """
         self.log.info('User committed to a key! %s', key)
 
-                                                
+
 def parse_command_line(argv):
     """Parse command line argument. See -h option
 
@@ -321,18 +322,18 @@ def main(args=sys.argv):
                         format='%(name)s (%(levelname)s): %(message)s')
     try:
         arguments = parse_command_line(args)
-        
+
         app = Keys()
         try:
             GLib.unix_signal_add_full(GLib.PRIORITY_HIGH, signal.SIGINT, lambda *args : app.quit(), None)
         except AttributeError:
             pass
-    
+
         exit_status = app.run(None)
-    
+
         return exit_status
 
-        
+
     finally:
         logging.shutdown()
 

keysign/Keyserver.py

@@ -105,6 +105,7 @@ def start(self, data=None, fpr=None, port=None, *args, **kwargs):
 
         tries = 10
 
+        fpr = self.fpr if self.fpr else "FIXME fingerprint"
         kd = data if data else self.keydata
 
         class KeyRequestHandler(KeyRequestHandlerBase):