secret-service: Implement SecretBackendInterface

2 files changed, 172 insertions, 5 deletions

diff --git a/libsecret/secret-backend.c b/libsecret/secret-backend.c
index cc0ea87..2c26c7d 100644
--- a/libsecret/secret-backend.c
+++ b/libsecret/secret-backend.c
@@ -125,16 +125,19 @@ backend_get_instance (void)
 static GType
 backend_get_impl_type (void)
 {
-	const gchar *envvar = g_getenv ("SECRET_BACKEND");
+	const gchar *envvar;
 	const gchar *extension_name;
 	GIOExtension *e;
 	GIOExtensionPoint *ep;
 
+	envvar = g_getenv ("SECRET_BACKEND");
 	if (envvar == NULL || *envvar == '\0')
 		extension_name = "service";
 	else
 		extension_name = envvar;
 
+	g_type_ensure (secret_service_get_type ());
+
 	ep = g_io_extension_point_lookup (SECRET_BACKEND_EXTENSION_POINT_NAME);
 	e = g_io_extension_point_get_extension_by_name (ep, extension_name);
 	if (e == NULL) {
diff --git a/libsecret/secret-service.c b/libsecret/secret-service.c
index f99fd7e..95498a6 100644
--- a/libsecret/secret-service.c
+++ b/libsecret/secret-service.c
@@ -15,6 +15,7 @@
 
 #include "config.h"
 
+#include "secret-backend.h"
 #include "secret-collection.h"
 #include "secret-dbus-generated.h"
 #include "secret-item.h"
@@ -135,14 +136,24 @@ static GInitableIface *secret_service_initable_parent_iface = NULL;
 
 static GAsyncInitableIface *secret_service_async_initable_parent_iface = NULL;
 
+static SecretBackendInterface *secret_service_backend_parent_iface = NULL;
+
 static void   secret_service_initable_iface         (GInitableIface *iface);
 
 static void   secret_service_async_initable_iface   (GAsyncInitableIface *iface);
 
+static void   secret_service_backend_iface          (SecretBackendInterface *iface);
+
 G_DEFINE_TYPE_WITH_CODE (SecretService, secret_service, G_TYPE_DBUS_PROXY,
                          G_ADD_PRIVATE (SecretService)
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, secret_service_initable_iface);
                          G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, secret_service_async_initable_iface);
+			 G_IMPLEMENT_INTERFACE (SECRET_TYPE_BACKEND, secret_service_backend_iface);
+			 _secret_backend_ensure_extension_point ();
+			 g_io_extension_point_implement (SECRET_BACKEND_EXTENSION_POINT_NAME,
+                                                         g_define_type_id,
+                                                         "service",
+                                                         0)
 );
 
 static SecretService *
@@ -571,10 +582,7 @@ secret_service_class_init (SecretServiceClass *klass)
 	 * A set of flags describing which parts of the secret service have
 	 * been initialized.
 	 */
-	g_object_class_install_property (object_class, PROP_FLAGS,
-	             g_param_spec_flags ("flags", "Flags", "Service flags",
-	                                 secret_service_flags_get_type (), SECRET_SERVICE_NONE,
-	                                 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+	g_object_class_override_property (object_class, PROP_FLAGS, "flags");
 
 	/**
 	 * SecretService:collections:
@@ -778,6 +786,162 @@ secret_service_async_initable_iface (GAsyncInitableIface *iface)
 	iface->init_finish = secret_service_async_initable_init_finish;
 }
 
+static void
+secret_service_real_ensure_for_flags (SecretBackend *self,
+				      SecretBackendFlags flags,
+				      GCancellable *cancellable,
+				      GAsyncReadyCallback callback,
+				      gpointer user_data)
+{
+	GTask *task;
+	InitClosure *closure;
+
+	g_return_if_fail (SECRET_IS_SERVICE (self));
+
+	task = g_task_new (self, cancellable, callback, user_data);
+	closure = g_slice_new0 (InitClosure);
+	g_task_set_task_data (task, closure, init_closure_free);
+	service_ensure_for_flags_async (SECRET_SERVICE (self), flags, task);
+	g_object_unref (task);
+}
+
+static gboolean
+secret_service_real_ensure_for_flags_finish (SecretBackend *self,
+					     GAsyncResult *result,
+					     GError **error)
+{
+	g_return_val_if_fail (g_task_is_valid (result, self), FALSE);
+
+	if (!g_task_propagate_boolean (G_TASK (result), error)) {
+		_secret_util_strip_remote_error (error);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static void
+secret_service_real_store (SecretBackend *self,
+			   const SecretSchema *schema,
+			   GHashTable *attributes,
+			   const gchar *collection,
+			   const gchar *label,
+			   SecretValue *value,
+			   GCancellable *cancellable,
+			   GAsyncReadyCallback callback,
+			   gpointer user_data)
+{
+	g_return_if_fail (SECRET_IS_SERVICE (self));
+
+	secret_service_store (SECRET_SERVICE (self), schema, attributes,
+			      collection, label, value,
+			      cancellable, callback, user_data);
+}
+
+static gboolean
+secret_service_real_store_finish (SecretBackend *self,
+				  GAsyncResult *result,
+				  GError **error)
+{
+	g_return_val_if_fail (SECRET_IS_SERVICE (self), FALSE);
+
+	return secret_service_store_finish (SECRET_SERVICE (self),
+					    result, error);
+}
+
+static void
+secret_service_real_lookup (SecretBackend *self,
+			    const SecretSchema *schema,
+			    GHashTable *attributes,
+			    GCancellable *cancellable,
+			    GAsyncReadyCallback callback,
+			    gpointer user_data)
+{
+	g_return_if_fail (SECRET_IS_SERVICE (self));
+
+	secret_service_lookup (SECRET_SERVICE (self), schema, attributes,
+			       cancellable, callback, user_data);
+}
+
+static SecretValue *
+secret_service_real_lookup_finish (SecretBackend *self,
+				   GAsyncResult *result,
+				   GError **error)
+{
+	g_return_val_if_fail (SECRET_IS_SERVICE (self), NULL);
+
+	return secret_service_lookup_finish (SECRET_SERVICE (self),
+					     result, error);
+}
+
+static void
+secret_service_real_clear (SecretBackend *self,
+			   const SecretSchema *schema,
+			   GHashTable *attributes,
+			   GCancellable *cancellable,
+			   GAsyncReadyCallback callback,
+			   gpointer user_data)
+{
+	g_return_if_fail (SECRET_IS_SERVICE (self));
+
+	secret_service_clear (SECRET_SERVICE (self), schema, attributes,
+			      cancellable, callback, user_data);
+}
+
+static gboolean
+secret_service_real_clear_finish (SecretBackend *self,
+				  GAsyncResult *result,
+				  GError **error)
+{
+	g_return_val_if_fail (SECRET_IS_SERVICE (self), FALSE);
+
+	return secret_service_clear_finish (SECRET_SERVICE (self),
+					    result, error);
+}
+
+static void
+secret_service_real_search (SecretBackend *self,
+			    const SecretSchema *schema,
+			    GHashTable *attributes,
+			    SecretSearchFlags flags,
+			    GCancellable *cancellable,
+			    GAsyncReadyCallback callback,
+			    gpointer user_data)
+{
+	g_return_if_fail (SECRET_IS_SERVICE (self));
+
+	secret_service_search (SECRET_SERVICE (self), schema, attributes, flags,
+			       cancellable, callback, user_data);
+}
+
+static GList *
+secret_service_real_search_finish (SecretBackend *self,
+				   GAsyncResult *result,
+				   GError **error)
+{
+	g_return_val_if_fail (SECRET_IS_SERVICE (self), NULL);
+
+	return secret_service_search_finish (SECRET_SERVICE (self),
+					     result, error);
+}
+
+static void
+secret_service_backend_iface (SecretBackendInterface *iface)
+{
+	secret_service_backend_parent_iface = g_type_interface_peek_parent (iface);
+
+	iface->ensure_for_flags = secret_service_real_ensure_for_flags;
+	iface->ensure_for_flags_finish = secret_service_real_ensure_for_flags_finish;
+	iface->store = secret_service_real_store;
+	iface->store_finish = secret_service_real_store_finish;
+	iface->lookup = secret_service_real_lookup;
+	iface->lookup_finish = secret_service_real_lookup_finish;
+	iface->clear = secret_service_real_clear;
+	iface->clear_finish = secret_service_real_clear_finish;
+	iface->search = secret_service_real_search;
+	iface->search_finish = secret_service_real_search_finish;
+}
+
 /**
  * secret_service_get:
  * @flags: flags for which service functionality to ensure is initialized