*/
#include "config.h"
+#include "empathy-uoa-auth-handler.h"
#include <libaccounts-glib/ag-account.h>
#include <libaccounts-glib/ag-account-service.h>
#include <libsignon-glib/signon-identity.h>
#include <libsignon-glib/signon-auth-session.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "empathy-debug.h"
+#include <tp-account-widgets/tpaw-keyring.h>
+#include <tp-account-widgets/tpaw-uoa-utils.h>
+
#include "empathy-utils.h"
-#include "empathy-uoa-auth-handler.h"
-#include "empathy-uoa-utils.h"
#include "empathy-sasl-mechanisms.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_SASL
+#include "empathy-debug.h"
+
struct _EmpathyUoaAuthHandlerPriv
{
AgManager *manager;
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_UOA_AUTH_HANDLER, EmpathyUoaAuthHandlerPriv);
- self->priv->manager = empathy_uoa_manager_dup ();
+ self->priv->manager = tpaw_uoa_manager_dup ();
}
static void
typedef struct
{
TpChannel *channel;
+ AgAccountService *service;
AgAuthData *auth_data;
SignonIdentity *identity;
SignonAuthSession *session;
ctx = g_slice_new0 (AuthContext);
ctx->channel = g_object_ref (channel);
+ ctx->service = g_object_ref (service);
ctx->auth_data = ag_account_service_get_auth_data (service);
if (ctx->auth_data == NULL)
auth_context_free (AuthContext *ctx)
{
g_clear_object (&ctx->channel);
+ g_clear_object (&ctx->service);
tp_clear_pointer (&ctx->auth_data, ag_auth_data_unref);
g_clear_object (&ctx->session);
g_clear_object (&ctx->identity);
}
static void
-request_password_session_process_cb (SignonAuthSession *session,
- GHashTable *session_data,
- const GError *error,
+request_password_session_process_cb (GObject *source,
+ GAsyncResult *result,
gpointer user_data)
{
+ SignonAuthSession *session = (SignonAuthSession *) source;
AuthContext *ctx = user_data;
+ GVariant *variant;
+ GError *error = NULL;
+ variant = signon_auth_session_process_finish (session, result, &error);
if (error != NULL)
{
DEBUG ("Error processing the session to request user's attention: %s",
error->message);
+ g_clear_error (&error);
}
+ g_variant_unref (variant);
+
auth_context_done (ctx);
}
+static void
+request_password (AuthContext *ctx)
+{
+ GVariantBuilder builder;
+
+ DEBUG ("Invalid credentials, request user action");
+
+ /* Inform SSO that the access token (or password) didn't work and it should
+ * ask user to re-grant access (or retype password). */
+ g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+ g_variant_builder_add (&builder, "{sv}",
+ SIGNON_SESSION_DATA_UI_POLICY,
+ g_variant_new_int32 (SIGNON_POLICY_REQUEST_PASSWORD));
+
+ signon_auth_session_process_async (ctx->session,
+ ag_auth_data_get_login_parameters (ctx->auth_data,
+ g_variant_builder_end (&builder)),
+ ag_auth_data_get_mechanism (ctx->auth_data),
+ NULL,
+ request_password_session_process_cb, ctx);
+}
+
static void
auth_cb (GObject *source,
GAsyncResult *result,
if (!empathy_sasl_auth_finish (channel, result, &error))
{
- GHashTable *extra_params;
-
DEBUG ("SASL Mechanism error: %s", error->message);
g_clear_error (&error);
- /* Inform SSO that the access token didn't work and it should ask user
- * to re-grant access. */
- extra_params = tp_asv_new (
- SIGNON_SESSION_DATA_UI_POLICY, G_TYPE_INT,
- SIGNON_POLICY_REQUEST_PASSWORD,
- NULL);
-
- ag_auth_data_insert_parameters (ctx->auth_data, extra_params);
-
- signon_auth_session_process (ctx->session,
- ag_auth_data_get_parameters (ctx->auth_data),
- ag_auth_data_get_mechanism (ctx->auth_data),
- request_password_session_process_cb, ctx);
-
- g_hash_table_unref (extra_params);
+ request_password (ctx);
}
else
{
}
static void
-session_process_cb (SignonAuthSession *session,
- GHashTable *session_data,
- const GError *error,
+session_process_cb (GObject *source,
+ GAsyncResult *result,
gpointer user_data)
{
+ SignonAuthSession *session = (SignonAuthSession *) source;
AuthContext *ctx = user_data;
+ GVariant *session_data;
const gchar *access_token;
const gchar *client_id;
+ const gchar *secret;
+ GVariant *params;
+ GError *error = NULL;
+ session_data = signon_auth_session_process_finish (session, result, &error);
if (error != NULL)
{
DEBUG ("Error processing the session: %s", error->message);
auth_context_done (ctx);
+ g_clear_error (&error);
return;
}
- access_token = tp_asv_get_string (session_data, "AccessToken");
- client_id = tp_asv_get_string (ag_auth_data_get_parameters (ctx->auth_data),
- "ClientId");
+ params = g_variant_ref_sink (
+ ag_auth_data_get_login_parameters (ctx->auth_data, NULL));
+
+ g_variant_lookup (params, "ClientId", "&s", &client_id);
+ g_variant_lookup (session_data, "AccessToken", "&s", &access_token);
+ g_variant_lookup (session_data, "Secret", "&s", &secret);
switch (empathy_sasl_channel_select_mechanism (ctx->channel))
{
auth_cb, ctx);
break;
+ case EMPATHY_SASL_MECHANISM_PASSWORD:
+ empathy_sasl_auth_password_async (ctx->channel,
+ secret,
+ auth_cb, ctx);
+ break;
+
default:
g_assert_not_reached ();
}
+
+ g_variant_unref (params);
}
static void
ctx->username = g_strdup (signon_identity_info_get_username (info));
- signon_auth_session_process (ctx->session,
- ag_auth_data_get_parameters (ctx->auth_data),
+ signon_auth_session_process_async (ctx->session,
+ ag_auth_data_get_login_parameters (ctx->auth_data, NULL),
ag_auth_data_get_mechanism (ctx->auth_data),
+ NULL,
session_process_cb,
ctx);
}
+static void
+set_account_password_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ TpAccount *tp_account = (TpAccount *) source;
+ AuthContext *ctx = user_data;
+ AuthContext *new_ctx;
+ GError *error = NULL;
+
+ if (!tpaw_keyring_set_account_password_finish (tp_account, result, &error))
+ {
+ DEBUG ("Failed to set empty password on UOA account: %s", error->message);
+ auth_context_done (ctx);
+ return;
+ }
+
+ new_ctx = auth_context_new (ctx->channel, ctx->service);
+ auth_context_free (ctx);
+
+ if (new_ctx->session != NULL)
+ {
+ /* The trick worked! */
+ request_password (new_ctx);
+ return;
+ }
+
+ DEBUG ("Still can't get a signon session, even after setting empty pwd");
+ auth_context_done (new_ctx);
+}
+
void
empathy_uoa_auth_handler_start (EmpathyUoaAuthHandler *self,
TpChannel *channel,
account = ag_manager_get_account (self->priv->manager, id);
if (account != NULL)
- l = ag_account_list_services_by_type (account, EMPATHY_UOA_SERVICE_TYPE);
+ l = ag_account_list_services_by_type (account, TPAW_UOA_SERVICE_TYPE);
if (l == NULL)
{
DEBUG ("Couldn't find IM service for AgAccountId %u", id);
ctx = auth_context_new (channel, service);
if (ctx->session == NULL)
{
+ /* This (usually?) means we never stored credentials for this account.
+ * To ask user to type his password SSO needs a SignonIdentity bound to
+ * our account. Let's store an empty password. */
DEBUG ("Couldn't create a signon session");
- auth_context_done (ctx);
+ tpaw_keyring_set_account_password_async (tp_account, "", FALSE,
+ set_account_password_cb, ctx);
}
else
{
mech = empathy_sasl_channel_select_mechanism (channel);
return mech == EMPATHY_SASL_MECHANISM_FACEBOOK ||
mech == EMPATHY_SASL_MECHANISM_WLM ||
- mech == EMPATHY_SASL_MECHANISM_GOOGLE;
+ mech == EMPATHY_SASL_MECHANISM_GOOGLE ||
+ mech == EMPATHY_SASL_MECHANISM_PASSWORD;
}
projects / empathy.git / blobdiff