File 03-osc_gnome_keyring.patch of Package osc

Overview Repositories Revisions Requests Users Attributes Meta

File 03-osc_gnome_keyring.patch of Package osc (Revision d2b744e122ed1b6ddcfc763dbed37802)

Currently displaying revision d2b744e122ed1b6ddcfc763dbed37802 , Show latest

diff --git a/osc/conf.py b/osc/conf.py
index 9e248a4..64f94be 100644
--- a/osc/conf.py
+++ b/osc/conf.py
@@ -43,6 +43,8 @@ import re
 import sys
 import ssl
 import warnings
+import getpass
+import secretstorage
 
 try:
     from http.cookiejar import LWPCookieJar, CookieJar
@@ -65,26 +67,74 @@ from . import OscConfigParser
 from osc import oscerr
 from .oscsslexcp import NoSecureSSLError
 
-GENERIC_KEYRING = False
+GENERIC_KEYRING = True
 GNOME_KEYRING = False
 
-try:
-    import keyring
-    GENERIC_KEYRING = True
-except:
-    try:
-        import gobject
-        gobject.set_application_name('osc')
-        import gnomekeyring
-        if os.environ['GNOME_DESKTOP_SESSION_ID']:
-            # otherwise gnome keyring bindings spit out errors, when you have
-            # it installed, but you are not under gnome
-            # (even though hundreds of gnome-keyring daemons got started in parallel)
-            # another option would be to support kwallet here
-            GNOME_KEYRING = gnomekeyring.is_available()
-    except:
-        pass
-
+def gkr_setup():
+    if 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
+        # otherwise gnome keyring bindings spit out errors, when you have
+        # it installed, but you are not under gnome
+        # (even though hundreds of gnome-keyring daemons got started in
+        # parallel)
+       try:
+          import keyring
+          GENERIC_KEYRING = True
+          if 'DISPLAY' in os.environ:
+           # Looks like we have desktop session.
+           # Continue to let the normal desktop unlock procedures.
+              print ('Falling back to desktop unlock procedures.')
+              pass
+          dbus = secretstorage.dbus_init()
+          try:
+              collection = secretstorage.get_default_collection(dbus)
+              if collection.is_locked():
+                 _unlock_keyring()
+          except:
+              _unlock_keyring()
+
+       except:
+            try:
+                import gobject
+                gobject.set_application_name('osc')
+                import gnomekeyring
+                if os.environ['GNOME_DESKTOP_SESSION_ID']:
+                # otherwise gnome keyring bindings spit out errors, when you have
+                # it installed, but you are not under gnome
+                # (even though hundreds of gnome-keyring daemons got started in parallel)
+                # another option would be to support kwallet here
+                    GNOME_KEYRING = gnomekeyring.is_available()
+            except:
+                pass
+    else:
+        print ("""
+The DBUS_SESSION_BUS_ADDRESS environment variable is not set which
+probably means that DBUS is not running.
+
+If you have just installed install osc then you will need to logout
+and login again, or source /etc/profile.
+""")
+        sys.exit(1)
+
+def _unlock_keyring():
+   print ('Keyring is locked.')
+   import subprocess
+   process = subprocess.Popen(['/usr/bin/gnome-keyring-daemon', '--start',
+                              '--components=secrets'],
+                     stdout = subprocess.PIPE,
+                     stderr = subprocess.PIPE)
+   password = getpass.getpass(prompt="Keyring password: ")
+   password = (password + '\n').encode('UTF-8')
+   process = subprocess.Popen(['/usr/bin/gnome-keyring-daemon', '--unlock',
+                               '--replace', '--components=secrets'],
+                     stdin  =  subprocess.PIPE,
+                     stdout =  subprocess.PIPE,
+                     stderr =  subprocess.PIPE)
+   stdoutdata,stderrdata = process.communicate(input=password)
+#   stdoutdata,stderrdata = process.communicate(input=password.encode('ascii'))
+   dbus = secretstorage.dbus_init()
+   collection = secretstorage.get_default_collection(dbus)
+   if collection.is_locked():
+      raise SystemExit('Unable to unlock keyring.')
 
 def _get_processors():
     """
@@ -745,6 +795,8 @@ def write_initial_config(conffile, entries, custom_template=''):
     config.update(entries)
     # at this point use_keyring and gnome_keyring are str objects
     if config['use_keyring'] == '1' and GENERIC_KEYRING:
+        import keyring
+        gkr_setup()
         protocol, host, path = \
             parse_apisrv_url(None, config['apiurl'])
         keyring.set_password(host, config['user'], config['pass'])
@@ -785,6 +837,7 @@ def add_section(filename, url, user, passwd):
         # Section might have existed, but was empty
         pass
     if config['use_keyring'] and GENERIC_KEYRING:
+        import keyring
         protocol, host, path = parse_apisrv_url(None, url)
         keyring.set_password(host, user, passwd)
         cp.set(url, 'keyring', '1')
@@ -826,6 +879,12 @@ def get_config(override_conffile=None,
     """do the actual work (see module documentation)"""
     global config
 
+    gkr_setup()
+
+    if not GENERIC_KEYRING:
+       print ("Keyring isn't available.  Is DBUS_SESSION_BUS_ADDRESS set?")
+       sys.exit(1)
+
     if not override_conffile:
         conffile = identify_conf()
     else:
@@ -880,9 +939,13 @@ def get_config(override_conffile=None,
     # override values which we were called with
     # This needs to be done before processing API sections as it might be already used there
     if override_no_keyring:
-        config['use_keyring'] = False
+        print ("Disabling the use of a keyring is not allowed in this environment.")
+        print ("A keyring will still be used.")
+        config['use_keyring'] = True
     if override_no_gnome_keyring:
-        config['gnome_keyring'] = False
+        print ("Disabling the use of a gnome keyring is not allowed in this environment.")
+        print ("A keyring will still be used.")
+        # config['gnome_keyring'] = False
 
     aliases = {}
     for url in [x for x in cp.sections() if x != 'general']:
@@ -894,10 +957,12 @@ def get_config(override_conffile=None,
         if config['use_keyring'] and GENERIC_KEYRING:
             try:
                 # Read from keyring lib if available
+                import keyring
                 user = cp.get(url, 'user', raw=True)
                 password = str(keyring.get_password(host, user))
             except:
                 # Fallback to file based auth.
+#                raise oscerr.ConfigError('no password found in keyring', conffile)
                 pass
         elif config['gnome_keyring'] and GNOME_KEYRING:
             # Read from gnome keyring if available

Places

File 03-osc_gnome_keyring.patch of Package osc (Revision d2b744e122ed1b6ddcfc763dbed37802)

Places