[evolution-data-server] Extract libsecret store/lookup/delete API into a public interface
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Extract libsecret store/lookup/delete API into a public interface
- Date: Fri, 4 Sep 2015 07:25:28 +0000 (UTC)
commit 5fc753eba55b7a16f9c5b3897f54c69f2bdeed91
Author: Milan Crha <mcrha redhat com>
Date: Fri Sep 4 09:24:52 2015 +0200
Extract libsecret store/lookup/delete API into a public interface
Just a code cleanup, movement to a separate file.
Also do not build secret-monitor module under Win32.
docs/reference/eds/eds-docs.sgml | 1 +
docs/reference/eds/eds-sections.txt | 8 +
libedataserver/Makefile.am | 2 +
libedataserver/e-secret-store.c | 427 +++++++++++++++++++++++++++++++++++
libedataserver/e-secret-store.h | 48 ++++
libedataserver/e-source.c | 271 +----------------------
libedataserver/libedataserver.h | 1 +
modules/Makefile.am | 6 +-
8 files changed, 496 insertions(+), 268 deletions(-)
---
diff --git a/docs/reference/eds/eds-docs.sgml b/docs/reference/eds/eds-docs.sgml
index 99719be..a92e5f8 100644
--- a/docs/reference/eds/eds-docs.sgml
+++ b/docs/reference/eds/eds-docs.sgml
@@ -207,6 +207,7 @@
<xi:include href="xml/e-flag.xml"/>
<xi:include href="xml/e-memory.xml"/>
<xi:include href="xml/e-operation-pool.xml"/>
+ <xi:include href="xml/e-secret-store.xml"/>
<xi:include href="xml/e-sexp.xml"/>
<xi:include href="xml/e-time-utils.xml"/>
<xi:include href="xml/e-uid.xml"/>
diff --git a/docs/reference/eds/eds-sections.txt b/docs/reference/eds/eds-sections.txt
index 077aa1d..815f16c 100644
--- a/docs/reference/eds/eds-sections.txt
+++ b/docs/reference/eds/eds-sections.txt
@@ -2736,6 +2736,14 @@ e_proxy_get_type
</SECTION>
<SECTION>
+<FILE>e-secret-store</FILE>
+<TITLE>Secret store interface</TITLE>
+e_secret_store_store_sync
+e_secret_store_lookup_sync
+e_secret_store_delete_sync
+</SECTION>
+
+<SECTION>
<FILE>e-server-side-source</FILE>
<TITLE>EServerSideSource</TITLE>
EServerSideSource
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index c973f11..f19fdfc 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -65,6 +65,7 @@ libedataserver_1_2_la_SOURCES = \
e-module.c \
e-operation-pool.c \
e-proxy.c \
+ e-secret-store.c \
e-sexp.c \
e-soup-auth-bearer.c \
e-soup-ssl-trust.c \
@@ -156,6 +157,7 @@ libedataserverinclude_HEADERS = \
e-module.h \
e-operation-pool.h \
e-proxy.h \
+ e-secret-store.h \
e-sexp.h \
e-soup-auth-bearer.h \
e-soup-ssl-trust.h \
diff --git a/libedataserver/e-secret-store.c b/libedataserver/e-secret-store.c
new file mode 100644
index 0000000..aeca476
--- /dev/null
+++ b/libedataserver/e-secret-store.c
@@ -0,0 +1,427 @@
+/*
+ * Copyright (C) 2015 Red Hat, Inc. (www.redhat.com)
+ *
+ * This library is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * SECTION: e-secret-store
+ * @include: libedataserver/libedataserver.h
+ * @short_description: Interface to store secrets
+ *
+ * The e-secret-store API provides an interface to store,
+ * lookup and delete secrets from the keyring.
+ **/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+
+#ifdef G_OS_WIN32
+#include <string.h>
+#include <errno.h>
+#else
+#include <libsecret/secret.h>
+#endif
+
+#include "e-data-server-util.h"
+#include "e-secret-store.h"
+
+#ifdef G_OS_WIN32
+
+G_LOCK_DEFINE_STATIC (secrets_file);
+static GHashTable *session_secrets = NULL;
+#define SECRETS_SECTION "Secrets"
+
+static gchar *
+encode_secret (const gchar *secret)
+{
+ return g_base64_encode ((const guchar *) secret, strlen (secret));
+}
+
+static gchar *
+decode_secret (const gchar *secret)
+{
+ guchar *decoded;
+ gchar *tmp;
+ gsize len = 0;
+
+ decoded = g_base64_decode (secret, &len);
+ if (!decoded || !len) {
+ g_free (decoded);
+ return NULL;
+ }
+
+ tmp = g_strndup ((const gchar *) decoded, len);
+ g_free (decoded);
+
+ return tmp;
+}
+
+static gchar *
+get_secrets_filename (void)
+{
+ return g_build_filename (e_get_user_config_dir (), "secrets", NULL);
+}
+
+static GKeyFile *
+read_secrets_file (GError **error)
+{
+ gchar *filename;
+ GKeyFile *secrets;
+
+ secrets = g_key_file_new ();
+
+ filename = get_secrets_filename ();
+
+ if (g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+ if (!g_key_file_load_from_file (secrets, filename, G_KEY_FILE_NONE, error)) {
+ g_key_file_free (secrets);
+ secrets = NULL;
+ }
+ }
+
+ g_free (filename);
+
+ return secrets;
+}
+
+static gboolean
+store_secrets_file (GKeyFile *secrets,
+ GError **error)
+{
+ gchar *content, *filename;
+ gsize length;
+ gboolean success;
+
+ g_return_val_if_fail (secrets != NULL, FALSE);
+
+ if (!g_file_test (e_get_user_config_dir (), G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+ if (g_mkdir_with_parents (e_get_user_config_dir (), 0700) == -1) {
+ g_set_error_literal (
+ error, G_FILE_ERROR,
+ g_file_error_from_errno (errno),
+ g_strerror (errno));
+ return FALSE;
+ }
+ }
+
+ content = g_key_file_to_data (secrets, &length, error);
+ if (!content)
+ return FALSE;
+
+
+ filename = get_secrets_filename ();
+
+ success = g_file_set_contents (filename, content, length, error);
+
+ g_free (filename);
+ g_free (content);
+
+ return success;
+}
+
+static gboolean
+e_win32_secret_store_secret_sync (const gchar *uid,
+ const gchar *secret,
+ gboolean permanently,
+ GError **error)
+{
+ GKeyFile *secrets;
+ gboolean success;
+
+ g_return_val_if_fail (uid != NULL, FALSE);
+
+ G_LOCK (secrets_file);
+
+ if (permanently) {
+ secrets = read_secrets_file (error);
+ success = secrets != NULL;
+
+ if (secrets) {
+ gchar *encoded;
+
+ encoded = secret && *secret ? encode_secret (secret) : g_strdup (secret);
+
+ g_key_file_set_string (secrets, SECRETS_SECTION, uid, encoded);
+
+ success = store_secrets_file (secrets, error);
+
+ g_key_file_free (secrets);
+ g_free (encoded);
+ }
+ } else {
+ gchar *encoded;
+
+ if (!session_secrets)
+ session_secrets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
(GDestroyNotify) e_util_safe_free_string);
+
+ encoded = secret && *secret ? encode_secret (secret) : g_strdup (secret);
+ if (!encoded)
+ g_hash_table_remove (session_secrets, uid);
+ else
+ g_hash_table_insert (session_secrets, g_strdup (uid), encoded);
+ }
+
+ G_UNLOCK (secrets_file);
+
+ return success;
+}
+
+static gchar *
+e_win32_secret_lookup_secret_sync (const gchar *uid,
+ GError **error)
+{
+ GKeyFile *secrets;
+ gchar *secret = NULL;
+
+ g_return_val_if_fail (uid != NULL, NULL);
+
+ G_LOCK (secrets_file);
+
+ if (session_secrets) {
+ const gchar *encoded;
+
+ encoded = g_hash_table_lookup (session_secrets, uid);
+ if (encoded)
+ secret = decode_secret (encoded);
+ }
+
+ if (!secret) {
+ secrets = read_secrets_file (error);
+ if (secrets) {
+ gchar *tmp;
+
+ tmp = g_key_file_get_string (secrets, SECRETS_SECTION, uid, NULL);
+ if (tmp) {
+ secret = *tmp ? decode_secret (tmp) : g_strdup ("");
+ g_free (tmp);
+ }
+
+ g_key_file_free (secrets);
+ }
+ }
+
+ G_UNLOCK (secrets_file);
+
+ return secret;
+}
+
+static gboolean
+e_win32_secret_delete_secret_sync (const gchar *uid,
+ GError **error)
+{
+ GKeyFile *secrets;
+ gboolean success = FALSE;
+
+ g_return_val_if_fail (uid != NULL, FALSE);
+
+ G_LOCK (secrets_file);
+
+ if (session_secrets) {
+ success = g_hash_table_remove (session_secrets, uid);
+ }
+
+ secrets = read_secrets_file (error);
+ if (secrets) {
+ success = TRUE;
+
+ if (g_key_file_remove_key (secrets, SECRETS_SECTION, uid, NULL)) {
+ success = store_secrets_file (secrets, error);
+ }
+
+ g_key_file_free (secrets);
+ }
+
+ G_UNLOCK (secrets_file);
+
+ return success;
+}
+
+#else /* G_OS_WIN32 */
+
+#define KEYRING_ITEM_ATTRIBUTE_NAME "e-source-uid"
+
+static SecretSchema password_schema = {
+ "org.gnome.Evolution.Data.Source",
+ SECRET_SCHEMA_DONT_MATCH_NAME,
+ {
+ { KEYRING_ITEM_ATTRIBUTE_NAME,
+ SECRET_SCHEMA_ATTRIBUTE_STRING },
+ { NULL, 0 }
+ }
+};
+
+#endif /* G_OS_WIN32 */
+
+/**
+ * e_secret_store_store_sync:
+ * @uid: a unique identifier of the secret
+ * @secret: the secret to store
+ * @permanently: store permanently or just for the session
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
+ *
+ * Stores the @secret for the @uid.
+ *
+ * If @permanently is %TRUE, the secret is stored in the default keyring.
+ * Otherwise the secret is stored in the memory-only session keyring. If
+ * an error occurs, the function sets @error and returns %FALSE.
+ *
+ * Returns: %TRUE on success, %FALSE on error
+ *
+ * Since: 3.18
+ **/
+gboolean
+e_secret_store_store_sync (const gchar *uid,
+ const gchar *secret,
+ const gchar *label,
+ gboolean permanently,
+ GCancellable *cancellable,
+ GError **error)
+{
+ gboolean success;
+#ifndef G_OS_WIN32
+ const gchar *collection;
+#endif
+
+ g_return_val_if_fail (uid != NULL, FALSE);
+ g_return_val_if_fail (secret != NULL, FALSE);
+
+#ifndef G_OS_WIN32
+ if (permanently)
+ collection = SECRET_COLLECTION_DEFAULT;
+ else
+ collection = SECRET_COLLECTION_SESSION;
+#endif
+
+#ifdef G_OS_WIN32
+ success = e_win32_secret_store_secret_sync (uid, secret, permanently, error);
+#else
+ success = secret_password_store_sync (
+ &password_schema,
+ collection, label, secret,
+ cancellable, error,
+ KEYRING_ITEM_ATTRIBUTE_NAME, uid,
+ NULL);
+#endif
+
+ return success;
+}
+
+/**
+ * e_secret_store_lookup_sync:
+ * @uid: a unique identifier of the secret
+ * @out_secret: (out): return location for the secret, or %NULL
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
+ *
+ * Looks up a secret for the @uid. Both the default and session keyrings
+ * are queried.
+ *
+ * Note the boolean return value indicates whether the lookup operation
+ * itself completed successfully, not whether the secret was found. If
+ * no secret was found, the function will set @out_secret to %NULL,
+ * but still return %TRUE. If an error occurs, the function sets @error
+ * and returns %FALSE.
+ *
+ * Returns: %TRUE on success, %FALSE on error
+ *
+ * Since: 3.18
+ **/
+gboolean
+e_secret_store_lookup_sync (const gchar *uid,
+ gchar **out_secret,
+ GCancellable *cancellable,
+ GError **error)
+{
+ gchar *temp = NULL;
+ gboolean success = TRUE;
+ GError *local_error = NULL;
+
+ g_return_val_if_fail (uid != NULL, FALSE);
+
+#ifdef G_OS_WIN32
+ temp = e_win32_secret_lookup_secret_sync (uid, &local_error);
+#else
+ temp = secret_password_lookup_sync (
+ &password_schema,
+ cancellable, &local_error,
+ KEYRING_ITEM_ATTRIBUTE_NAME, uid,
+ NULL);
+#endif
+
+ if (local_error != NULL) {
+ g_warn_if_fail (temp == NULL);
+ g_propagate_error (error, local_error);
+ success = FALSE;
+ } else if (out_secret != NULL) {
+ *out_secret = temp; /* takes ownership */
+ } else {
+ e_util_safe_free_string (temp);
+ }
+
+ return success;
+}
+
+/**
+ * e_secret_store_delete_sync:
+ * @uid: a unique identifier of the secret
+ * @cancellable: optional #GCancellable object, or %NULL
+ * @error: return location for a #GError, or %NULL
+ *
+ * Deletes the secret for @uid from either the default keyring or
+ * session keyring.
+ *
+ * Note the boolean return value indicates whether the delete operation
+ * itself completed successfully, not whether the secret was found and
+ * deleted. If no such secret was found, the function will still return
+ * %TRUE. If an error occurs, the function sets @error and returns %FALSE.
+ *
+ * Returns: %TRUE on success, %FALSE on error
+ *
+ * Since: 3.18
+ **/
+gboolean
+e_secret_store_delete_sync (const gchar *uid,
+ GCancellable *cancellable,
+ GError **error)
+{
+ gboolean success = TRUE;
+ GError *local_error = NULL;
+
+ g_return_val_if_fail (uid != NULL, FALSE);
+
+#ifdef G_OS_WIN32
+ e_win32_secret_delete_secret_sync (uid, &local_error);
+#else
+ /* The return value indicates whether any passwords were removed,
+ * not whether the operation completed successfully. So we have
+ * to check the GError directly. */
+ secret_password_clear_sync (
+ &password_schema,
+ cancellable, &local_error,
+ KEYRING_ITEM_ATTRIBUTE_NAME, uid,
+ NULL);
+#endif
+
+ if (local_error != NULL) {
+ g_propagate_error (error, local_error);
+ success = FALSE;
+ }
+
+ return success;
+}
diff --git a/libedataserver/e-secret-store.h b/libedataserver/e-secret-store.h
new file mode 100644
index 0000000..bbc3f17
--- /dev/null
+++ b/libedataserver/e-secret-store.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 Red Hat, Inc. (www.redhat.com)
+ *
+ * This library is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
+#ifndef E_SECRET_STORE_H
+#define E_SECRET_STORE_H
+
+#include <glib.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+gboolean e_secret_store_store_sync (const gchar *uid,
+ const gchar *secret,
+ const gchar *label,
+ gboolean permanently,
+ GCancellable *cancellable,
+ GError **error);
+
+gboolean e_secret_store_lookup_sync (const gchar *uid,
+ gchar **out_secret,
+ GCancellable *cancellable,
+ GError **error);
+
+gboolean e_secret_store_delete_sync (const gchar *uid,
+ GCancellable *cancellable,
+ GError **error);
+
+G_END_DECLS
+
+#endif /* E_SECRET_STORE_H */
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index 4c5c5df..c0ed3f1 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -71,12 +71,11 @@
#include <string.h>
#include <glib/gi18n-lib.h>
-#include <libsecret/secret.h>
-
/* Private D-Bus classes. */
#include <e-dbus-source.h>
#include "e-data-server-util.h"
+#include "e-secret-store.h"
#include "e-source-enumtypes.h"
#include "e-source-extension.h"
#include "e-uid.h"
@@ -119,8 +118,6 @@
#define PRIMARY_GROUP_NAME "Data Source"
-#define KEYRING_ITEM_ATTRIBUTE_NAME "e-source-uid"
-
typedef struct _AsyncContext AsyncContext;
typedef struct _RemoveContext RemoveContext;
@@ -192,206 +189,8 @@ enum {
LAST_SIGNAL
};
-#ifndef G_OS_WIN32
-
-static SecretSchema password_schema = {
- "org.gnome.Evolution.Data.Source",
- SECRET_SCHEMA_DONT_MATCH_NAME,
- {
- { KEYRING_ITEM_ATTRIBUTE_NAME,
- SECRET_SCHEMA_ATTRIBUTE_STRING },
- { NULL, 0 }
- }
-};
-
-#endif /* !G_OS_WIN32 */
-
static guint signals[LAST_SIGNAL];
-#ifdef G_OS_WIN32
-
-G_LOCK_DEFINE_STATIC (passwords_file);
-#define PASSWORDS_SECTION "Passwords"
-
-static gchar *
-encode_password (const gchar *password)
-{
- return g_base64_encode ((const guchar *) password, strlen (password));
-}
-
-static gchar *
-decode_password (const gchar *password)
-{
- guchar *decoded;
- gchar *tmp;
- gsize len = 0;
-
- decoded = g_base64_decode (password, &len);
- if (!decoded || !len) {
- g_free (decoded);
- return NULL;
- }
-
- tmp = g_strndup ((const gchar *) decoded, len);
- g_free (decoded);
-
- return tmp;
-}
-
-static gchar *
-get_passwords_filename (void)
-{
- return g_build_filename (e_get_user_config_dir (), "passwords", NULL);
-}
-
-static GKeyFile *
-read_passwords_file (GError **error)
-{
- gchar *filename;
- GKeyFile *passwords;
-
- passwords = g_key_file_new ();
-
- filename = get_passwords_filename ();
-
- if (g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
- if (!g_key_file_load_from_file (passwords, filename, G_KEY_FILE_NONE, error)) {
- g_key_file_free (passwords);
- passwords = NULL;
- }
- }
-
- g_free (filename);
-
- return passwords;
-}
-
-static gboolean
-store_passwords_file (GKeyFile *passwords,
- GError **error)
-{
- gchar *content, *filename;
- gsize length;
- gboolean success;
-
- g_return_val_if_fail (passwords != NULL, FALSE);
-
- if (!g_file_test (e_get_user_config_dir (), G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
- if (g_mkdir_with_parents (e_get_user_config_dir (), 0700) == -1) {
- g_set_error_literal (
- error, G_FILE_ERROR,
- g_file_error_from_errno (errno),
- g_strerror (errno));
- return FALSE;
- }
- }
-
- content = g_key_file_to_data (passwords, &length, error);
- if (!content)
- return FALSE;
-
-
- filename = get_passwords_filename ();
-
- success = g_file_set_contents (filename, content, length, error);
-
- g_free (filename);
- g_free (content);
-
- return success;
-}
-
-static gboolean
-e_win32_source_store_password_sync (const gchar *uid,
- const gchar *password,
- GError **error)
-{
- GKeyFile *passwords;
- gboolean success;
-
- g_return_val_if_fail (uid != NULL, FALSE);
-
- G_LOCK (passwords_file);
-
- passwords = read_passwords_file (error);
- success = passwords != NULL;
-
- if (passwords) {
- gchar *encoded;
-
- encoded = password && *password ? encode_password (password) : g_strdup (password);
-
- g_key_file_set_string (passwords, PASSWORDS_SECTION, uid, encoded);
-
- success = store_passwords_file (passwords, error);
-
- g_key_file_free (passwords);
- g_free (encoded);
- }
-
- G_UNLOCK (passwords_file);
-
- return success;
-}
-
-static gchar *
-e_win32_source_lookup_password_sync (const gchar *uid,
- GError **error)
-{
- GKeyFile *passwords;
- gchar *password = NULL;
-
- g_return_val_if_fail (uid != NULL, NULL);
-
- G_LOCK (passwords_file);
-
- passwords = read_passwords_file (error);
- if (passwords) {
- gchar *tmp;
-
- tmp = g_key_file_get_string (passwords, PASSWORDS_SECTION, uid, NULL);
- if (tmp) {
- password = *tmp ? decode_password (tmp) : g_strdup ("");
- g_free (tmp);
- }
-
- g_key_file_free (passwords);
- }
-
- G_UNLOCK (passwords_file);
-
- return password;
-}
-
-static gboolean
-e_win32_source_delete_password_sync (const gchar *uid,
- GError **error)
-{
- GKeyFile *passwords;
- gboolean success = FALSE;
-
- g_return_val_if_fail (uid != NULL, FALSE);
-
- G_LOCK (passwords_file);
-
- passwords = read_passwords_file (error);
- if (passwords) {
- success = TRUE;
-
- if (g_key_file_remove_key (passwords, PASSWORDS_SECTION, uid, NULL)) {
- success = store_passwords_file (passwords, error);
- }
-
- g_key_file_free (passwords);
- }
-
- G_UNLOCK (passwords_file);
-
- return success;
-}
-
-#endif /* G_OS_WIN32 */
-
/* Forward Declarations */
static void e_source_initable_init (GInitableIface *iface);
static void e_source_proxy_resolver_init
@@ -4259,35 +4058,16 @@ e_source_store_password_sync (ESource *source,
GError **error)
{
gboolean success;
-#ifndef G_OS_WIN32
- const gchar *collection;
-#endif
const gchar *uid;
gchar *label;
g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
g_return_val_if_fail (password != NULL, FALSE);
-#ifndef G_OS_WIN32
- if (permanently)
- collection = SECRET_COLLECTION_DEFAULT;
- else
- collection = SECRET_COLLECTION_SESSION;
-#endif
-
uid = e_source_get_uid (source);
label = e_source_dup_secret_label (source);
-#ifdef G_OS_WIN32
- success = e_win32_source_store_password_sync (uid, password, error);
-#else
- success = secret_password_store_sync (
- &password_schema,
- collection, label, password,
- cancellable, error,
- KEYRING_ITEM_ATTRIBUTE_NAME, uid,
- NULL);
-#endif
+ success = e_secret_store_store_sync (uid, password, label, permanently, cancellable, error);
g_free (label);
@@ -4427,35 +4207,12 @@ e_source_lookup_password_sync (ESource *source,
GError **error)
{
const gchar *uid;
- gchar *temp = NULL;
- gboolean success = TRUE;
- GError *local_error = NULL;
g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
uid = e_source_get_uid (source);
-#ifdef G_OS_WIN32
- temp = e_win32_source_lookup_password_sync (uid, &local_error);
-#else
- temp = secret_password_lookup_sync (
- &password_schema,
- cancellable, &local_error,
- KEYRING_ITEM_ATTRIBUTE_NAME, uid,
- NULL);
-#endif
-
- if (local_error != NULL) {
- g_warn_if_fail (temp == NULL);
- g_propagate_error (error, local_error);
- success = FALSE;
- } else if (out_password != NULL) {
- *out_password = temp; /* takes ownership */
- } else {
- secret_password_free (temp);
- }
-
- return success;
+ return e_secret_store_lookup_sync (uid, out_password, cancellable, error);
}
/* Helper for e_source_lookup_password() */
@@ -4597,32 +4354,12 @@ e_source_delete_password_sync (ESource *source,
GError **error)
{
const gchar *uid;
- gboolean success = TRUE;
- GError *local_error = NULL;
g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
uid = e_source_get_uid (source);
-#ifdef G_OS_WIN32
- e_win32_source_delete_password_sync (uid, &local_error);
-#else
- /* The return value indicates whether any passwords were removed,
- * not whether the operation completed successfully. So we have
- * to check the GError directly. */
- secret_password_clear_sync (
- &password_schema,
- cancellable, &local_error,
- KEYRING_ITEM_ATTRIBUTE_NAME, uid,
- NULL);
-#endif
-
- if (local_error != NULL) {
- g_propagate_error (error, local_error);
- success = FALSE;
- }
-
- return success;
+ return e_secret_store_delete_sync (uid, cancellable, error);
}
/* Helper for e_source_delete_password() */
diff --git a/libedataserver/libedataserver.h b/libedataserver/libedataserver.h
index d299f4b..8410d81 100644
--- a/libedataserver/libedataserver.h
+++ b/libedataserver/libedataserver.h
@@ -39,6 +39,7 @@
#include <libedataserver/e-module.h>
#include <libedataserver/e-operation-pool.h>
#include <libedataserver/e-proxy.h>
+#include <libedataserver/e-secret-store.h>
#include <libedataserver/e-sexp.h>
#include <libedataserver/e-soup-auth-bearer.h>
#include <libedataserver/e-soup-ssl-trust.h>
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 683fc45..f52604f 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -12,14 +12,18 @@ if HAVE_UOA
UBUNTU_ONLINE_ACCOUNTS_DIR = ubuntu-online-accounts
endif
+if !OS_WIN32
+SECRET_MONITOR_DIR = secret-monitor
+endif
+
SUBDIRS = \
cache-reaper \
google-backend \
outlook-backend \
owncloud-backend \
- secret-monitor \
yahoo-backend \
$(TRUST_PROMPT_DIR) \
+ $(SECRET_MONITOR_DIR) \
$(GNOME_ONLINE_ACCOUNTS_DIR) \
$(UBUNTU_ONLINE_ACCOUNTS_DIR) \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
