Merge pull request #603 from lazka/libsecret-check-session

libsecret: skip if there is no secret service running
jaraco · Nov 4, 2022 · f3b14d0 · f3b14d0
2 parents 8b18015 + c3eb39b
commit f3b14d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+v23.11.0
+--------
+
+* #603: In ``libsecret``, check that the service is available before
+  declaring viability.
+
 v23.10.0
 --------
 

diff --git a/keyring/backends/libsecret.py b/keyring/backends/libsecret.py
@@ -7,7 +7,6 @@
 from ..errors import (
     PasswordDeleteError,
     PasswordSetError,
-    ExceptionRaisedContext,
     KeyringLocked,
 )
 
@@ -50,10 +49,15 @@ def collection(self):
 
     @properties.classproperty
     def priority(cls):
-        with ExceptionRaisedContext() as exc:
-            Secret.__name__
-        if exc:
+        if not available:
             raise RuntimeError("libsecret required")
+
+        # Make sure there is actually a secret service running
+        try:
+            Secret.Service.get_sync(Secret.ServiceFlags.OPEN_SESSION, None)
+        except GLib.Error as error:
+            raise RuntimeError("Can't open a session to the secret service") from error
+
         return 4.8
 
     def get_password(self, service, username):