From 88819dd997d795e12bb953a343d0493dbdee94bb Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Tue, 16 Mar 2021 17:22:08 +0100 Subject: remove deprecated oauth1 authorizer --- docs/reference/gdata-docs.xml | 1 - docs/reference/gdata-sections.txt.in | 34 - gdata/gdata-authorizer.c | 2 - gdata/gdata-core.symbols | 18 - gdata/gdata-oauth1-authorizer.c | 1497 -------------------- gdata/gdata-oauth1-authorizer.h | 108 -- gdata/gdata.h | 1 - gdata/meson.build | 2 - gdata/symbol.map | 18 - gdata/tests/calendar.c | 2 +- gdata/tests/contacts.c | 2 +- gdata/tests/meson.build | 1 - gdata/tests/oauth1-authorizer.c | 1144 --------------- gdata/tests/picasaweb.c | 2 +- gdata/tests/tasks.c | 2 +- ...th1-authorizer-interactive-data-bad-credentials | 25 - .../oauth1-authorizer-refresh-authorization | 0 ...th1-authorizer-request-authentication-uri-async | 25 - ...r-request-authentication-uri-async-cancellation | 0 ...uth1-authorizer-request-authentication-uri-sync | 25 - ...er-request-authentication-uri-sync-cancellation | 0 .../oauth1-authorizer-request-authorization-async | 25 - ...zer-request-authorization-async-bad-credentials | 26 - ...orizer-request-authorization-async-cancellation | 0 .../oauth1-authorizer-request-authorization-sync | 25 - ...izer-request-authorization-sync-bad-credentials | 26 - ...horizer-request-authorization-sync-cancellation | 0 .../setup-oauth1-authorizer-data-authenticated | 50 - .../setup-oauth1-authorizer-interactive-data | 25 - meson.build | 7 - meson_options.txt | 5 - po/POTFILES.in | 1 - 32 files changed, 4 insertions(+), 3095 deletions(-) delete mode 100644 gdata/gdata-oauth1-authorizer.c delete mode 100644 gdata/gdata-oauth1-authorizer.h delete mode 100644 gdata/tests/oauth1-authorizer.c delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-interactive-data-bad-credentials delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-refresh-authorization delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-async delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-async-cancellation delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-sync delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-sync-cancellation delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async-bad-credentials delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async-cancellation delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync-bad-credentials delete mode 100644 gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync-cancellation delete mode 100644 gdata/tests/traces/oauth1-authorizer/setup-oauth1-authorizer-data-authenticated delete mode 100644 gdata/tests/traces/oauth1-authorizer/setup-oauth1-authorizer-interactive-data diff --git a/docs/reference/gdata-docs.xml b/docs/reference/gdata-docs.xml index a071a976..7d25b3f2 100644 --- a/docs/reference/gdata-docs.xml +++ b/docs/reference/gdata-docs.xml @@ -56,7 +56,6 @@ - diff --git a/docs/reference/gdata-sections.txt.in b/docs/reference/gdata-sections.txt.in index 42139e44..6eb5a5a2 100644 --- a/docs/reference/gdata-sections.txt.in +++ b/docs/reference/gdata-sections.txt.in @@ -2391,40 +2391,6 @@ gdata_client_login_authorizer_error_quark GDataClientLoginAuthorizerPrivate -
-gdata-oauth1-authorizer -GDataOAuth1Authorizer -GDataOAuth1Authorizer -GDataOAuth1AuthorizerClass -gdata_oauth1_authorizer_new -gdata_oauth1_authorizer_new_for_authorization_domains -gdata_oauth1_authorizer_request_authentication_uri -gdata_oauth1_authorizer_request_authentication_uri_async -gdata_oauth1_authorizer_request_authentication_uri_finish -gdata_oauth1_authorizer_request_authorization -gdata_oauth1_authorizer_request_authorization_async -gdata_oauth1_authorizer_request_authorization_finish -gdata_oauth1_authorizer_get_application_name -gdata_oauth1_authorizer_get_locale -gdata_oauth1_authorizer_set_locale -gdata_oauth1_authorizer_get_proxy_uri -gdata_oauth1_authorizer_set_proxy_uri -gdata_oauth1_authorizer_get_proxy_resolver -gdata_oauth1_authorizer_set_proxy_resolver -gdata_oauth1_authorizer_get_timeout -gdata_oauth1_authorizer_set_timeout - -GDATA_TYPE_OAUTH1_AUTHORIZER -GDATA_OAUTH1_AUTHORIZER -GDATA_OAUTH1_AUTHORIZER_CLASS -GDATA_IS_OAUTH1_AUTHORIZER -GDATA_IS_OAUTH1_AUTHORIZER_CLASS -GDATA_OAUTH1_AUTHORIZER_GET_CLASS -gdata_oauth1_authorizer_get_type - -GDataOAuth1AuthorizerPrivate -
- @COMMENT@
@COMMENT@gdata-goa-authorizer @COMMENT@GDataGoaAuthorizer diff --git a/gdata/gdata-authorizer.c b/gdata/gdata-authorizer.c index ca8002a9..fbfff764 100644 --- a/gdata/gdata-authorizer.c +++ b/gdata/gdata-authorizer.c @@ -40,8 +40,6 @@ * * #GDataClientLoginAuthorizer for * ClientLogin (deprecated) - * #GDataOAuth1Authorizer for - * OAuth 1.0 (deprecated) * #GDataOAuth2Authorizer for * OAuth 2.0 (preferred) * diff --git a/gdata/gdata-core.symbols b/gdata/gdata-core.symbols index 606df7c3..2cf2e3ce 100644 --- a/gdata/gdata-core.symbols +++ b/gdata/gdata-core.symbols @@ -924,24 +924,6 @@ gdata_documents_service_get_spreadsheet_authorization_domain gdata_picasaweb_service_get_primary_authorization_domain gdata_youtube_service_get_primary_authorization_domain gdata_service_get_authorization_domains -gdata_oauth1_authorizer_get_type -gdata_oauth1_authorizer_new -gdata_oauth1_authorizer_new_for_authorization_domains -gdata_oauth1_authorizer_request_authentication_uri -gdata_oauth1_authorizer_request_authentication_uri_async -gdata_oauth1_authorizer_request_authentication_uri_finish -gdata_oauth1_authorizer_request_authorization -gdata_oauth1_authorizer_request_authorization_async -gdata_oauth1_authorizer_request_authorization_finish -gdata_oauth1_authorizer_get_application_name -gdata_oauth1_authorizer_get_locale -gdata_oauth1_authorizer_set_locale -gdata_oauth1_authorizer_get_proxy_uri -gdata_oauth1_authorizer_set_proxy_uri -gdata_oauth1_authorizer_get_proxy_resolver -gdata_oauth1_authorizer_set_proxy_resolver -gdata_oauth1_authorizer_get_timeout -gdata_oauth1_authorizer_set_timeout gdata_calendar_query_get_max_attendees gdata_calendar_query_set_max_attendees gdata_calendar_query_show_deleted diff --git a/gdata/gdata-oauth1-authorizer.c b/gdata/gdata-oauth1-authorizer.c deleted file mode 100644 index 6d5fd5ec..00000000 --- a/gdata/gdata-oauth1-authorizer.c +++ /dev/null @@ -1,1497 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* - * GData Client - * Copyright (C) Philip Withnall 2011 - * - * GData Client 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; either - * version 2.1 of the License, or (at your option) any later version. - * - * GData Client 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 GData Client. If not, see . - */ - -/** - * SECTION:gdata-oauth1-authorizer - * @short_description: GData OAuth 1.0 authorization interface - * @stability: Stable - * @include: gdata/gdata-oauth1-authorizer.h - * - * OAuth 1.0 has been deprecated since 2012, and OAuth 2.0 (#GDataOAuth2Authorizer) should be used instead. - * - * #GDataOAuth1Authorizer provides an implementation of the #GDataAuthorizer interface for authentication and authorization using the - * OAuth 1.0 process, - * which was preferred by Google until OAuth 2.0 was released — it is now - * preferred to use #GDataOAuth2Authorizer. - * - * OAuth 1.0 replaces the deprecated ClientLogin process. One of the main reasons for this is to allow two-factor authentication to be supported, by - * moving the authentication interface to a web page under Google's control. - * - * The OAuth 1.0 process as implemented by Google follows the OAuth 1.0 protocol as - * specified by IETF in RFC 5849, with a few additions to support scopes (implemented in libgdata by #GDataAuthorizationDomains), - * locales and custom domains. Briefly, the process is initiated by requesting an authenticated request token from the Google accounts service - * (using gdata_oauth1_authorizer_request_authentication_uri()), going to the authentication URI for the request token, authenticating and authorizing - * access to the desired scopes, then providing the verifier returned by Google to the Google accounts service again (using - * gdata_oauth1_authorizer_request_authorization()) to authorize the token. This results in an access token which is attached to all future requests - * to the online service. - * - * While Google supports unregistered and registered modes for OAuth 1.0 authorization, it only supports unregistered mode for installed applications. - * Consequently, libgdata also only supports unregistered mode. For this purpose, the application name to be presented to the user on the - * authentication page at the URI returned by gdata_oauth1_authorizer_request_authentication_uri() can be specified when constructing the - * #GDataOAuth1Authorizer. - * - * As described, each authentication/authorization operation is in two parts: gdata_oauth1_authorizer_request_authentication_uri() and - * gdata_oauth1_authorizer_request_authorization(). #GDataOAuth1Authorizer stores no state about ongoing authentication operations (i.e. ones which - * have successfully called gdata_oauth1_authorizer_request_authentication_uri(), but are yet to successfully call - * gdata_oauth1_authorizer_request_authorization()). Consequently, operations can be abandoned before calling - * gdata_oauth1_authorizer_request_authorization() without problems. The only state necessary between the calls is the request token and request token - * secret, as returned by gdata_oauth1_authorizer_request_authentication_uri() and taken as parameters to - * gdata_oauth1_authorizer_request_authorization(). - * - * #GDataOAuth1Authorizer natively supports authorization against multiple services in a single authorization request (unlike - * #GDataClientLoginAuthorizer). - * - * Each access token is long lived, so reauthorization is rarely necessary with #GDataOAuth1Authorizer. Consequently, refreshing authorization using - * gdata_authorizer_refresh_authorization() is not supported by #GDataOAuth1Authorizer, and will immediately return %FALSE with no error set. - * - * - * Authenticating Asynchronously Using OAuth 1.0 - * - * GDataSomeService *service; - * GDataOAuth1Authorizer *authorizer; - * - * /* Create an authorizer and authenticate and authorize the service we're using, asynchronously. */ - * authorizer = gdata_oauth1_authorizer_new (_("My libgdata application"), GDATA_TYPE_SOME_SERVICE); - * gdata_oauth1_authorizer_request_authentication_uri_async (authorizer, cancellable, - * (GAsyncReadyCallback) request_authentication_uri_cb, user_data); - * - * /* Create a service object and link it with the authorizer */ - * service = gdata_some_service_new (GDATA_AUTHORIZER (authorizer)); - * - * static void - * request_authentication_uri_cb (GDataOAuth1Authorizer *authorizer, GAsyncResult *async_result, gpointer user_data) - * { - * gchar *authentication_uri, *token, *token_secret, *verifier; - * GError *error = NULL; - * - * authentication_uri = gdata_oauth1_authorizer_request_authentication_uri_finish (authorizer, async_result, &token, &token_secret, - * &error); - * - * if (error != NULL) { - * /* Notify the user of all errors except cancellation errors */ - * if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - * g_error ("Requesting a token failed: %s", error->message); - * } - * - * g_error_free (error); - * goto finish; - * } - * - * /* (Present the page at the authentication URI to the user, either in an embedded or stand-alone web browser, and - * * ask them to grant access to the application and return the verifier Google gives them.) */ - * verifier = ask_user_for_verifier (authentication_uri); - * - * gdata_oauth1_authorizer_request_authorization_async (authorizer, token, token_secret, verifier, cancellable, - * (GAsyncReadyCallback) request_authorization_cb, user_data); - * - * finish: - * g_free (verifier); - * g_free (authentication_uri); - * g_free (token); - * - * /* Zero out the secret before freeing. */ - * if (token_secret != NULL) { - * memset (token_secret, 0, strlen (token_secret)); - * } - * - * g_free (token_secret); - * } - * - * static void - * request_authorization_cb (GDataOAuth1Authorizer *authorizer, GAsyncResult *async_result, gpointer user_data) - * { - * GError *error = NULL; - * - * if (gdata_oauth1_authorizer_request_authorization_finish (authorizer, async_result, &error) == FALSE) { - * /* Notify the user of all errors except cancellation errors */ - * if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - * g_error ("Authorization failed: %s", error->message); - * } - * - * g_error_free (error); - * return; - * } - * - * /* (The client is now authenticated and authorized against the service. - * * It can now proceed to execute queries on the service object which require the user to be authenticated.) */ - * } - * - * g_object_unref (service); - * g_object_unref (authorizer); - * - * - * - * Since: 0.9.0 - */ - -#include -#include -#include -#include - -#ifdef ENABLE_OAUTH1 -#include -#endif - -#include "gdata-oauth1-authorizer.h" -#include "gdata-private.h" - -#define HMAC_SHA1_LEN 20 /* bytes, raw */ - -static void authorizer_init (GDataAuthorizerInterface *iface); -static void dispose (GObject *object); -static void finalize (GObject *object); -static void get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); -static void set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); - -static void process_request (GDataAuthorizer *self, GDataAuthorizationDomain *domain, SoupMessage *message); -static gboolean is_authorized_for_domain (GDataAuthorizer *self, GDataAuthorizationDomain *domain); - -static void sign_message (GDataOAuth1Authorizer *self, SoupMessage *message, const gchar *token, const gchar *token_secret, GHashTable *parameters); - -static void notify_proxy_uri_cb (GObject *object, GParamSpec *pspec, GDataOAuth1Authorizer *self); -static void notify_timeout_cb (GObject *gobject, GParamSpec *pspec, GObject *self); - -static SoupURI *_get_proxy_uri (GDataOAuth1Authorizer *self); -static void _set_proxy_uri (GDataOAuth1Authorizer *self, SoupURI *proxy_uri); - -struct _GDataOAuth1AuthorizerPrivate { - SoupSession *session; - SoupURI *proxy_uri; /* cached version only set if gdata_oauth1_authorizer_get_proxy_uri() is called */ - GProxyResolver *proxy_resolver; - - gchar *application_name; - gchar *locale; - - GMutex mutex; /* mutex for token, token_secret and authorization_domains */ - - /* Note: This is the access token, not the request token returned by gdata_oauth1_authorizer_request_authentication_uri(). - * It's NULL iff the authorizer isn't authenticated. token_secret must be NULL iff token is NULL. */ - gchar *token; - GDataSecureString token_secret; /* must be allocated by _gdata_service_secure_strdup() */ - - /* Mapping from GDataAuthorizationDomain to itself; a set of domains for which ->access_token is valid. */ - GHashTable *authorization_domains; -}; - -enum { - PROP_APPLICATION_NAME = 1, - PROP_LOCALE, - PROP_PROXY_URI, - PROP_TIMEOUT, - PROP_PROXY_RESOLVER, -}; - -G_DEFINE_TYPE_WITH_CODE (GDataOAuth1Authorizer, gdata_oauth1_authorizer, G_TYPE_OBJECT, - G_ADD_PRIVATE (GDataOAuth1Authorizer) - G_IMPLEMENT_INTERFACE (GDATA_TYPE_AUTHORIZER, authorizer_init)) - -static void -gdata_oauth1_authorizer_class_init (GDataOAuth1AuthorizerClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->get_property = get_property; - gobject_class->set_property = set_property; - gobject_class->dispose = dispose; - gobject_class->finalize = finalize; - - /** - * GDataOAuth1Authorizer:application-name: - * - * The human-readable, translated application name for the client, to be presented to the user on the authentication page at the URI - * returned by gdata_oauth1_authorizer_request_authentication_uri(). - * - * If %NULL is provided in the constructor to #GDataOAuth1Authorizer, the value returned by g_get_application_name() will be used as a - * fallback. Note that this may also be %NULL: in this case, the authentication page will use the application name “anonymous”. - * - * Since: 0.9.0 - */ - g_object_class_install_property (gobject_class, PROP_APPLICATION_NAME, - g_param_spec_string ("application-name", - "Application name", "The human-readable, translated application name for the client.", - NULL, - G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * GDataOAuth1Authorizer:locale: - * - * The locale to use for network requests, in Unix locale format. (e.g. "en_GB", "cs", "de_DE".) Use %NULL for the default "C" locale - * (typically "en_US"). - * - * This locale will be used by the server-side software to localise the authentication and authorization pages at the URI returned by - * gdata_oauth1_authorizer_request_authentication_uri(). - * - * The server-side behaviour is undefined if it doesn't support a given locale. - * - * Since: 0.9.0 - */ - g_object_class_install_property (gobject_class, PROP_LOCALE, - g_param_spec_string ("locale", - "Locale", "The locale to use for network requests, in Unix locale format.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * GDataOAuth1Authorizer:proxy-uri: - * - * The proxy URI used internally for all network requests. - * - * Since: 0.9.0 - * Deprecated: 0.15.0: Use #GDataClientLoginAuthorizer:proxy-resolver instead, which gives more flexibility over the proxy used. - */ - g_object_class_install_property (gobject_class, PROP_PROXY_URI, - g_param_spec_boxed ("proxy-uri", - "Proxy URI", "The proxy URI used internally for all network requests.", - SOUP_TYPE_URI, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * GDataOAuth1Authorizer:timeout: - * - * A timeout, in seconds, for network operations. If the timeout is exceeded, the operation will be cancelled and - * %GDATA_SERVICE_ERROR_NETWORK_ERROR will be returned. - * - * If the timeout is 0, operations will never time out. - * - * Since: 0.9.0 - */ - g_object_class_install_property (gobject_class, PROP_TIMEOUT, - g_param_spec_uint ("timeout", - "Timeout", "A timeout, in seconds, for network operations.", - 0, G_MAXUINT, 0, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /** - * GDataOAuth1Authorizer:proxy-resolver: - * - * The #GProxyResolver used to determine a proxy URI. Setting this will clear the #GDataOAuth1Authorizer:proxy-uri property. - * - * Since: 0.15.0 - */ - g_object_class_install_property (gobject_class, PROP_PROXY_RESOLVER, - g_param_spec_object ("proxy-resolver", - "Proxy Resolver", "A GProxyResolver used to determine a proxy URI.", - G_TYPE_PROXY_RESOLVER, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); -} - -static void -authorizer_init (GDataAuthorizerInterface *iface) -{ - iface->process_request = process_request; - iface->is_authorized_for_domain = is_authorized_for_domain; -} - -static void -gdata_oauth1_authorizer_init (GDataOAuth1Authorizer *self) -{ - self->priv = gdata_oauth1_authorizer_get_instance_private (self); - - /* Set up the authorizer's mutex */ - g_mutex_init (&(self->priv->mutex)); - self->priv->authorization_domains = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL); - - /* Set up the session */ - self->priv->session = _gdata_service_build_session (); - - /* Proxy the SoupSession's proxy-uri and timeout properties */ - g_signal_connect (self->priv->session, "notify::proxy-uri", (GCallback) notify_proxy_uri_cb, self); - g_signal_connect (self->priv->session, "notify::timeout", (GCallback) notify_timeout_cb, self); - - /* Keep our GProxyResolver synchronized with SoupSession's. */ - g_object_bind_property (self->priv->session, "proxy-resolver", self, "proxy-resolver", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); -} - -static void -dispose (GObject *object) -{ - GDataOAuth1AuthorizerPrivate *priv = GDATA_OAUTH1_AUTHORIZER (object)->priv; - - if (priv->session != NULL) - g_object_unref (priv->session); - priv->session = NULL; - - g_clear_object (&priv->proxy_resolver); - - /* Chain up to the parent class */ - G_OBJECT_CLASS (gdata_oauth1_authorizer_parent_class)->dispose (object); -} - -static void -finalize (GObject *object) -{ - GDataOAuth1AuthorizerPrivate *priv = GDATA_OAUTH1_AUTHORIZER (object)->priv; - - g_free (priv->application_name); - g_free (priv->locale); - - g_hash_table_destroy (priv->authorization_domains); - g_mutex_clear (&(priv->mutex)); - - if (priv->proxy_uri != NULL) { - soup_uri_free (priv->proxy_uri); - } - - g_free (priv->token); - _gdata_service_secure_strfree (priv->token_secret); - - /* Chain up to the parent class */ - G_OBJECT_CLASS (gdata_oauth1_authorizer_parent_class)->finalize (object); -} - -static void -get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) -{ - GDataOAuth1AuthorizerPrivate *priv = GDATA_OAUTH1_AUTHORIZER (object)->priv; - - switch (property_id) { - case PROP_APPLICATION_NAME: - g_value_set_string (value, priv->application_name); - break; - case PROP_LOCALE: - g_value_set_string (value, priv->locale); - break; - case PROP_PROXY_URI: - g_value_set_boxed (value, _get_proxy_uri (GDATA_OAUTH1_AUTHORIZER (object))); - break; - case PROP_TIMEOUT: - g_value_set_uint (value, gdata_oauth1_authorizer_get_timeout (GDATA_OAUTH1_AUTHORIZER (object))); - break; - case PROP_PROXY_RESOLVER: - g_value_set_object (value, gdata_oauth1_authorizer_get_proxy_resolver (GDATA_OAUTH1_AUTHORIZER (object))); - break; - default: - /* We don't have any other property... */ - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) -{ - GDataOAuth1AuthorizerPrivate *priv = GDATA_OAUTH1_AUTHORIZER (object)->priv; - - switch (property_id) { - /* Construct only */ - case PROP_APPLICATION_NAME: - priv->application_name = g_value_dup_string (value); - - /* Default to the value of g_get_application_name() */ - if (priv->application_name == NULL || *(priv->application_name) == '\0') { - g_free (priv->application_name); - priv->application_name = g_strdup (g_get_application_name ()); - } - - break; - case PROP_LOCALE: - gdata_oauth1_authorizer_set_locale (GDATA_OAUTH1_AUTHORIZER (object), g_value_get_string (value)); - break; - case PROP_PROXY_URI: - _set_proxy_uri (GDATA_OAUTH1_AUTHORIZER (object), g_value_get_boxed (value)); - break; - case PROP_TIMEOUT: - gdata_oauth1_authorizer_set_timeout (GDATA_OAUTH1_AUTHORIZER (object), g_value_get_uint (value)); - break; - case PROP_PROXY_RESOLVER: - gdata_oauth1_authorizer_set_proxy_resolver (GDATA_OAUTH1_AUTHORIZER (object), g_value_get_object (value)); - break; - default: - /* We don't have any other property... */ - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -process_request (GDataAuthorizer *self, GDataAuthorizationDomain *domain, SoupMessage *message) -{ - GDataOAuth1AuthorizerPrivate *priv = GDATA_OAUTH1_AUTHORIZER (self)->priv; - - /* Set the authorisation header */ - g_mutex_lock (&(priv->mutex)); - - /* Sanity check */ - g_assert ((priv->token == NULL) == (priv->token_secret == NULL)); - - if (priv->token != NULL && g_hash_table_lookup (priv->authorization_domains, domain) != NULL) { - sign_message (GDATA_OAUTH1_AUTHORIZER (self), message, priv->token, priv->token_secret, NULL); - } - - g_mutex_unlock (&(priv->mutex)); -} - -static gboolean -is_authorized_for_domain (GDataAuthorizer *self, GDataAuthorizationDomain *domain) -{ - GDataOAuth1AuthorizerPrivate *priv = GDATA_OAUTH1_AUTHORIZER (self)->priv; - gpointer result; - const gchar *token; - - g_mutex_lock (&(priv->mutex)); - token = priv->token; - result = g_hash_table_lookup (priv->authorization_domains, domain); - g_mutex_unlock (&(priv->mutex)); - - /* Sanity check */ - g_assert (result == NULL || result == domain); - - return (token != NULL && result != NULL) ? TRUE : FALSE; -} - -/* Sign the message and add the Authorization header to it containing the signature. - * NOTE: This must not lock priv->mutex, as it's called from within a critical section in process_request() and priv->mutex isn't recursive. */ -static void -sign_message (GDataOAuth1Authorizer *self, SoupMessage *message, const gchar *token, const gchar *token_secret, GHashTable *parameters) -{ -#ifdef ENABLE_OAUTH1 - GHashTableIter iter; - const gchar *key, *value, *consumer_key, *consumer_secret, *signature_method; - gsize params_length = 0; - GList *sorted_params = NULL, *i; - GString *query_string, *signature_base_string, *secret_string, *authorization_header; - SoupURI *normalised_uri; - gchar *uri, *signature, *timestamp; - char *nonce; - gboolean is_first = TRUE; - gint64 time_val; - guchar signature_buf[HMAC_SHA1_LEN]; - gsize signature_buf_len; - GHmac *signature_hmac; - - g_return_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self)); - g_return_if_fail (SOUP_IS_MESSAGE (message)); - g_return_if_fail (token == NULL || *token != '\0'); - g_return_if_fail (token_secret == NULL || *token_secret != '\0'); - g_return_if_fail ((token == NULL) == (token_secret == NULL)); - - /* Build and return a HMAC-SHA1 signature for the given SoupMessage. We always use HMAC-SHA1, since installed applications have to be - * unregistered (see: http://code.google.com/apis/accounts/docs/OAuth_ref.html#SigningOAuth). - * Reference: http://tools.ietf.org/html/rfc5849#section-3.4 */ - signature_method = "HMAC-SHA1"; - - /* As described here, we use an anonymous consumer key and secret, since we're designed for installed applications: - * http://code.google.com/apis/accounts/docs/OAuth_ref.html#SigningOAuth */ - consumer_key = "anonymous"; - consumer_secret = "anonymous"; - - /* Add various standard parameters to the list (note: this modifies the hash table belonging to the caller) */ - nonce = oauth_gen_nonce (); - time_val = g_get_real_time () / G_USEC_PER_SEC; - timestamp = g_strdup_printf ("%li", time_val); - - if (parameters == NULL) { - parameters = g_hash_table_new (g_str_hash, g_str_equal); - } else { - g_hash_table_ref (parameters); - } - - g_hash_table_insert (parameters, (gpointer) "oauth_signature_method", (gpointer) signature_method); - g_hash_table_insert (parameters, (gpointer) "oauth_consumer_key", (gpointer) consumer_key); - g_hash_table_insert (parameters, (gpointer) "oauth_nonce", nonce); - g_hash_table_insert (parameters, (gpointer) "oauth_timestamp", timestamp); - g_hash_table_insert (parameters, (gpointer) "oauth_version", (gpointer) "1.0"); - - /* Only add the token if it's been provided */ - if (token != NULL) { - g_hash_table_insert (parameters, (gpointer) "oauth_token", (gpointer) token); - } - - /* Sort the parameters and build a query string, as defined here: http://tools.ietf.org/html/rfc5849#section-3.4.1.3 */ - g_hash_table_iter_init (&iter, parameters); - - while (g_hash_table_iter_next (&iter, (gpointer*) &key, (gpointer*) &value) == TRUE) { - GString *pair = g_string_new (NULL); - - g_string_append_uri_escaped (pair, key, NULL, FALSE); - g_string_append_c (pair, '='); - g_string_append_uri_escaped (pair, value, NULL, FALSE); - - /* Append the pair to the list for sorting, and keep track of the total length of the strings in the list so far */ - params_length += pair->len + 1 /* sep */; - sorted_params = g_list_prepend (sorted_params, g_string_free (pair, FALSE)); - } - - g_hash_table_unref (parameters); - - sorted_params = g_list_sort (sorted_params, (GCompareFunc) g_strcmp0); - - /* Concatenate the parameters to give the query string */ - query_string = g_string_sized_new (params_length); - - for (i = sorted_params; i != NULL; i = i->next) { - if (is_first == FALSE) { - g_string_append_c (query_string, '&'); - } - - g_string_append (query_string, i->data); - - g_free (i->data); - is_first = FALSE; - } - - g_list_free (sorted_params); - - /* Normalise the URI as described here: http://tools.ietf.org/html/rfc5849#section-3.4.1.2 */ - normalised_uri = soup_uri_copy (soup_message_get_uri (message)); - soup_uri_set_query (normalised_uri, NULL); - soup_uri_set_fragment (normalised_uri, NULL); - - /* Append it to the signature base string */ - uri = soup_uri_to_string (normalised_uri, FALSE); - - /* Start building the signature base string as described here: http://tools.ietf.org/html/rfc5849#section-3.4.1.1 */ - signature_base_string = g_string_sized_new (4 /* method */ + 1 /* sep */ + strlen (uri) + 1 /* sep */ + params_length /* query string */); - g_string_append_uri_escaped (signature_base_string, message->method, NULL, FALSE); - g_string_append_c (signature_base_string, '&'); - g_string_append_uri_escaped (signature_base_string, uri, NULL, FALSE); - g_string_append_c (signature_base_string, '&'); - g_string_append_uri_escaped (signature_base_string, query_string->str, NULL, FALSE); - - g_free (uri); - soup_uri_free (normalised_uri); - g_string_free (query_string, TRUE); - - /* Build the secret key to use in the HMAC */ - secret_string = g_string_new (NULL); - g_string_append_uri_escaped (secret_string, consumer_secret, NULL, FALSE); - g_string_append_c (secret_string, '&'); - - /* Only add token_secret if it was provided */ - if (token_secret != NULL) { - g_string_append_uri_escaped (secret_string, token_secret, NULL, FALSE); - } - - /* Create the signature as described here: http://tools.ietf.org/html/rfc5849#section-3.4.2 */ - signature_hmac = g_hmac_new (G_CHECKSUM_SHA1, (const guchar*) secret_string->str, secret_string->len); - g_hmac_update (signature_hmac, (const guchar*) signature_base_string->str, signature_base_string->len); - - signature_buf_len = G_N_ELEMENTS (signature_buf); - g_hmac_get_digest (signature_hmac, signature_buf, &signature_buf_len); - - g_hmac_unref (signature_hmac); - - signature = g_base64_encode (signature_buf, signature_buf_len); - - /*g_debug ("Signing message using Signature Base String: “%s” and key “%s” using method “%s” to give signature: “%s”.", - signature_base_string->str, secret_string->str, signature_method, signature);*/ - - /* Zero out the secret_string before freeing it, to reduce the chance of secrets hitting disk. */ - memset (secret_string->str, 0, secret_string->allocated_len); - - g_string_free (secret_string, TRUE); - g_string_free (signature_base_string, TRUE); - - /* Build the Authorization header and append it to the message */ - authorization_header = g_string_new ("OAuth oauth_consumer_key=\""); - g_string_append_uri_escaped (authorization_header, consumer_key, NULL, FALSE); - - /* Only add the token if it's been provided */ - if (token != NULL) { - g_string_append (authorization_header, "\",oauth_token=\""); - g_string_append_uri_escaped (authorization_header, token, NULL, FALSE); - } - - g_string_append (authorization_header, "\",oauth_signature_method=\""); - g_string_append_uri_escaped (authorization_header, signature_method, NULL, FALSE); - g_string_append (authorization_header, "\",oauth_signature=\""); - g_string_append_uri_escaped (authorization_header, signature, NULL, FALSE); - g_string_append (authorization_header, "\",oauth_timestamp=\""); - g_string_append_uri_escaped (authorization_header, timestamp, NULL, FALSE); - g_string_append (authorization_header, "\",oauth_nonce=\""); - g_string_append_uri_escaped (authorization_header, nonce, NULL, FALSE); - g_string_append (authorization_header, "\",oauth_version=\"1.0\""); - - soup_message_headers_replace (message->request_headers, "Authorization", authorization_header->str); - - g_string_free (authorization_header, TRUE); - free (signature); - g_free (timestamp); - free (nonce); -#endif /* ENABLE_OAUTH1 */ -} - -/** - * gdata_oauth1_authorizer_new: - * @application_name: (allow-none): a human-readable, translated application name to use on authentication pages, or %NULL - * @service_type: the #GType of a #GDataService subclass which the #GDataOAuth1Authorizer will be used with - * - * Creates a new #GDataOAuth1Authorizer. - * - * The #GDataAuthorizationDomains for the given @service_type (i.e. as returned by gdata_service_get_authorization_domains()) are the ones the - * user will be requested to authorize access to on the page at the URI returned by gdata_oauth1_authorizer_request_authentication_uri(). - * - * The given @application_name will set the value of #GDataOAuth1Authorizer:application-name and will be displayed to the user on authentication pages - * returned by Google. If %NULL is provided, the value of g_get_application_name() will be used as a fallback. - * - * Return value: (transfer full): a new #GDataOAuth1Authorizer; unref with g_object_unref() - * - * Since: 0.9.0 - */ -GDataOAuth1Authorizer * -gdata_oauth1_authorizer_new (const gchar *application_name, GType service_type) -{ - g_return_val_if_fail (g_type_is_a (service_type, GDATA_TYPE_SERVICE), NULL); - - return gdata_oauth1_authorizer_new_for_authorization_domains (application_name, gdata_service_get_authorization_domains (service_type)); -} - -/** - * gdata_oauth1_authorizer_new_for_authorization_domains: - * @application_name: (allow-none): a human-readable, translated application name to use on authentication pages, or %NULL - * @authorization_domains: (element-type GDataAuthorizationDomain) (transfer none): a non-empty list of #GDataAuthorizationDomains to be - * authorized against by the #GDataOAuth1Authorizer - * - * Creates a new #GDataOAuth1Authorizer. This function is intended to be used only when the default authorization domain list for a single - * #GDataService, as used by gdata_oauth1_authorizer_new(), isn't suitable. For example, this could be because the #GDataOAuth1Authorizer will be used - * with multiple #GDataService subclasses, or because the client requires a specific set of authorization domains. - * - * The specified #GDataAuthorizationDomains are the ones the user will be requested to authorize access to on the page at the URI returned by - * gdata_oauth1_authorizer_request_authentication_uri(). - * - * The given @application_name will set the value of #GDataOAuth1Authorizer:application-name and will be displayed to the user on authentication pages - * returned by Google. If %NULL is provided, the value of g_get_application_name() will be used as a fallback. - * - * Return value: (transfer full): a new #GDataOAuth1Authorizer; unref with g_object_unref() - * - * Since: 0.9.0 - */ -GDataOAuth1Authorizer * -gdata_oauth1_authorizer_new_for_authorization_domains (const gchar *application_name, GList *authorization_domains) -{ - GList *i; - GDataOAuth1Authorizer *authorizer; - - g_return_val_if_fail (authorization_domains != NULL, NULL); - - authorizer = GDATA_OAUTH1_AUTHORIZER (g_object_new (GDATA_TYPE_OAUTH1_AUTHORIZER, - "application-name", application_name, - NULL)); - - /* Register all the domains with the authorizer */ - for (i = authorization_domains; i != NULL; i = i->next) { - g_return_val_if_fail (GDATA_IS_AUTHORIZATION_DOMAIN (i->data), NULL); - - /* We don't have to lock the authoriser's mutex here as no other code has seen the authoriser yet */ - g_hash_table_insert (authorizer->priv->authorization_domains, g_object_ref (GDATA_AUTHORIZATION_DOMAIN (i->data)), i->data); - } - - return authorizer; -} - -/** - * gdata_oauth1_authorizer_request_authentication_uri: - * @self: a #GDataOAuth1Authorizer - * @token: (out callee-allocates): return location for the temporary credentials token returned by the authentication service; free with g_free() - * @token_secret: (out callee-allocates): return location for the temporary credentials token secret returned by the authentication service; free with - * g_free() - * @cancellable: (allow-none): optional #GCancellable object, or %NULL - * @error: a #GError, or %NULL - * - * Requests a fresh unauthenticated token from the Google accounts service and builds and returns the URI of an authentication page for that token. - * This should then be presented to the user (e.g. in an embedded or stand alone web browser). The authentication page will ask the user to log in - * using their Google account, then ask them to grant access to the #GDataAuthorizationDomains passed to the constructor of the - * #GDataOAuth1Authorizer. If the user grants access, they will be given a verifier, which can then be passed to - * gdata_oauth1_authorizer_request_authorization() (along with the @token and @token_secret values returned by this method) to authorize the token. - * - * This method can fail if the server returns an error, but this is unlikely. If it does happen, a %GDATA_SERVICE_ERROR_PROTOCOL_ERROR will be - * raised, @token and @token_secret will be set to %NULL and %NULL will be returned. - * - * This method implements Section 2.1 and - * Section 2.2 of the - * OAuth 1.0 protocol. - * - * When freeing @token_secret, it's advisable to set it to all zeros first, to reduce the chance of the sensitive token being recoverable from the - * free memory pool and (accidentally) leaked by a different part of the process. This can be achieved with the following code: - * |[ - * if (token_secret != NULL) { - * memset (token_secret, 0, strlen (token_secret)); - * g_free (token_secret); - * } - * ]| - * - * Return value: (transfer full): the URI of an authentication page for the user to use; free with g_free() - * - * Since: 0.9.0 - */ -gchar * -gdata_oauth1_authorizer_request_authentication_uri (GDataOAuth1Authorizer *self, gchar **token, gchar **token_secret, - GCancellable *cancellable, GError **error) -{ -#ifdef ENABLE_OAUTH1 - GDataOAuth1AuthorizerPrivate *priv; - SoupMessage *message; - guint status; - gchar *request_body; - GString *scope_string, *authentication_uri; - GHashTable *parameters; - GHashTableIter iter; - gboolean is_first = TRUE; - GDataAuthorizationDomain *domain; - GHashTable *response_details; - const gchar *callback_uri, *_token, *_token_secret, *callback_confirmed; - SoupURI *_uri; -#endif - - g_return_val_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self), NULL); - g_return_val_if_fail (token != NULL, NULL); - g_return_val_if_fail (token_secret != NULL, NULL); - g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - -#ifdef ENABLE_OAUTH1 - priv = self->priv; - - /* This implements OAuthGetRequestToken and returns the URI for OAuthAuthorizeToken, which the client must then use themselves (e.g. in an - * embedded web browser) to authorise the temporary credentials token. They then pass the request token and verification code they get back - * from that to gdata_oauth1_authorizer_request_authorization(). */ - - /* We default to out-of-band callbacks */ - callback_uri = "oob"; - - /* Set the output parameters to NULL in case of failure */ - *token = NULL; - *token_secret = NULL; - - /* Build up the space-separated list of scopes we're requesting authorisation for */ - g_mutex_lock (&(priv->mutex)); - - scope_string = g_string_new (NULL); - g_hash_table_iter_init (&iter, priv->authorization_domains); - - while (g_hash_table_iter_next (&iter, (gpointer*) &domain, NULL) == TRUE) { - if (is_first == FALSE) { - /* Delimiter */ - g_string_append_c (scope_string, ' '); - } - - g_string_append (scope_string, gdata_authorization_domain_get_scope (domain)); - - is_first = FALSE; - } - - g_mutex_unlock (&(priv->mutex)); - - /* Build the request body and the set of parameters to be signed */ - parameters = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (parameters, (gpointer) "scope", scope_string->str); - g_hash_table_insert (parameters, (gpointer) "xoauth_displayname", priv->application_name); - g_hash_table_insert (parameters, (gpointer) "oauth_callback", (gpointer) callback_uri); - request_body = soup_form_encode_hash (parameters); - - /* Build the message */ - _uri = soup_uri_new ("https://www.google.com/accounts/OAuthGetRequestToken"); - soup_uri_set_port (_uri, _gdata_service_get_https_port ()); - message = soup_message_new_from_uri (SOUP_METHOD_POST, _uri); - soup_uri_free (_uri); - - soup_message_set_request (message, "application/x-www-form-urlencoded", SOUP_MEMORY_TAKE, request_body, strlen (request_body)); - - sign_message (self, message, NULL, NULL, parameters); - - g_hash_table_destroy (parameters); - g_string_free (scope_string, TRUE); - - /* Send the message */ - _gdata_service_actually_send_message (priv->session, message, cancellable, error); - status = message->status_code; - - if (status == SOUP_STATUS_CANCELLED) { - /* Cancelled (the error has already been set) */ - g_object_unref (message); - return NULL; - } else if (status != SOUP_STATUS_OK) { - /* Server returned an error. Not much we can do, since the error codes aren't documented and it shouldn't normally ever happen - * anyway. */ - g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - _("The server rejected the temporary credentials request.")); - g_object_unref (message); - - return NULL; - } - - g_assert (message->response_body->data != NULL); - - /* Parse the response. We expect something like: - * oauth_token=ab3cd9j4ks73hf7g&oauth_token_secret=ZXhhbXBsZS5jb20&oauth_callback_confirmed=true - * See: http://code.google.com/apis/accounts/docs/OAuth_ref.html#RequestToken and - * http://tools.ietf.org/html/rfc5849#section-2.1 for details. */ - response_details = soup_form_decode (message->response_body->data); - - g_object_unref (message); - - _token = g_hash_table_lookup (response_details, "oauth_token"); - _token_secret = g_hash_table_lookup (response_details, "oauth_token_secret"); - callback_confirmed = g_hash_table_lookup (response_details, "oauth_callback_confirmed"); - - /* Validate the returned values */ - if (_token == NULL || _token_secret == NULL || callback_confirmed == NULL || - *_token == '\0' || *_token_secret == '\0' || - strcmp (callback_confirmed, "true") != 0) { - g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, - _("The server returned a malformed response.")); - g_hash_table_destroy (response_details); - - return NULL; - } - - /* Build the authentication URI which the user will then open in a web browser and use to authenticate and authorise our application. - * We expect to build something like this: - * https://www.google.com/accounts/OAuthAuthorizeToken?oauth_token=ab3cd9j4ks73hf7g&hd=mycollege.edu&hl=en&btmpl=mobile - * See: http://code.google.com/apis/accounts/docs/OAuth_ref.html#GetAuth for more details. */ - authentication_uri = g_string_new ("https://www.google.com/accounts/OAuthAuthorizeToken?oauth_token="); - g_string_append_uri_escaped (authentication_uri, g_hash_table_lookup (response_details, "oauth_token"), NULL, TRUE); - - if (priv->locale != NULL) { - g_string_append (authentication_uri, "&hl="); - g_string_append_uri_escaped (authentication_uri, priv->locale, NULL, TRUE); - } - - /* Return the token and token secret */ - *token = g_strdup (_token); - *token_secret = g_strdup (_token_secret); /* NOTE: Ideally this would be allocated in non-pageable memory, but changing that would break API */ - - g_hash_table_destroy (response_details); - - return g_string_free (authentication_uri, FALSE); -#else /* if !ENABLE_OAUTH1 */ - *token = NULL; - *token_secret = NULL; - - if (!g_cancellable_set_error_if_cancelled (cancellable, error)) - g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_UNAVAILABLE, - _("OAuth 1.0 support is disabled.")); - - return NULL; -#endif -} - -typedef struct { - /* All return values */ - gchar *token; - gchar *token_secret; /* NOTE: Ideally this would be allocated in non-pageable memory, but changing that would break API */ - gchar *authentication_uri; -} RequestAuthenticationUriAsyncData; - -static void -request_authentication_uri_async_data_free (RequestAuthenticationUriAsyncData *data) -{ - g_free (data->token); - g_free (data->token_secret); - g_free (data->authentication_uri); - - g_slice_free (RequestAuthenticationUriAsyncData, data); -} - -G_DEFINE_AUTOPTR_CLEANUP_FUNC (RequestAuthenticationUriAsyncData, request_authentication_uri_async_data_free) - -static void -request_authentication_uri_thread (GTask *task, gpointer source_object, gpointer task_data, GCancellable *cancellable) -{ - GDataOAuth1Authorizer *authorizer = GDATA_OAUTH1_AUTHORIZER (source_object); - g_autoptr(RequestAuthenticationUriAsyncData) data = NULL; - g_autoptr(GError) error = NULL; - - data = g_slice_new0 (RequestAuthenticationUriAsyncData); - data->authentication_uri = gdata_oauth1_authorizer_request_authentication_uri (authorizer, &(data->token), &(data->token_secret), - cancellable, &error); - - if (error != NULL) - g_task_return_error (task, g_steal_pointer (&error)); - else - g_task_return_pointer (task, g_steal_pointer (&data), (GDestroyNotify) request_authentication_uri_async_data_free); -} - -/** - * gdata_oauth1_authorizer_request_authentication_uri_async: - * @self: a #GDataOAuth1Authorizer - * @cancellable: (allow-none): optional #GCancellable object, or %NULL - * @callback: a #GAsyncReadyCallback to call when building the URI is finished - * @user_data: (closure): data to pass to the @callback function - * - * Requests a fresh unauthenticated token from the Google accounts service and builds and returns the URI of an authentication page for that token. - * @self is reffed when this method is called, so can safely be unreffed after this method returns. - * - * For more details, see gdata_oauth1_authorizer_request_authentication_uri(), which is the synchronous version of this method. - * - * When the operation is finished, @callback will be called. You can then call gdata_oauth1_authorizer_request_authentication_uri_finish() to get the - * results of the operation. - * - * Since: 0.9.0 - */ -void -gdata_oauth1_authorizer_request_authentication_uri_async (GDataOAuth1Authorizer *self, GCancellable *cancellable, - GAsyncReadyCallback callback, gpointer user_data) -{ - g_autoptr(GTask) task = NULL; - - g_return_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self)); - g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - g_return_if_fail (callback != NULL); - - task = g_task_new (self, cancellable, callback, user_data); - g_task_set_source_tag (task, gdata_oauth1_authorizer_request_authentication_uri_async); - g_task_run_in_thread (task, request_authentication_uri_thread); -} - -/** - * gdata_oauth1_authorizer_request_authentication_uri_finish: - * @self: a #GDataOAuth1Authorizer - * @async_result: a #GAsyncResult - * @token: (out callee-allocates): return location for the temporary credentials token returned by the authentication service; free with g_free() - * @token_secret: (out callee-allocates): return location for the temporary credentials token secret returned by the authentication service; free with - * g_free() - * @error: a #GError, or %NULL - * - * Finishes an asynchronous authentication URI building operation started with gdata_oauth1_authorizer_request_authentication_uri_async(). - * - * This method can fail if the server has returned an error, but this is unlikely. If it does happen, a %GDATA_SERVICE_ERROR_PROTOCOL_ERROR will be - * raised, @token and @token_secret will be set to %NULL and %NULL will be returned. - * - * When freeing @token_secret, it's advisable to set it to all zeros first, to reduce the chance of the sensitive token being recoverable from the - * free memory pool and (accidentally) leaked by a different part of the process. This can be achieved with the following code: - * |[ - * if (token_secret != NULL) { - * memset (token_secret, 0, strlen (token_secret)); - * g_free (token_secret); - * } - * ]| - * - * Return value: (transfer full): the URI of an authentication page for the user to use; free with g_free() - * - * Since: 0.9.0 - */ -gchar * -gdata_oauth1_authorizer_request_authentication_uri_finish (GDataOAuth1Authorizer *self, GAsyncResult *async_result, gchar **token, - gchar **token_secret, GError **error) -{ - g_autoptr(RequestAuthenticationUriAsyncData) data = NULL; - - g_return_val_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self), NULL); - g_return_val_if_fail (G_IS_ASYNC_RESULT (async_result), NULL); - g_return_val_if_fail (token != NULL, NULL); - g_return_val_if_fail (token_secret != NULL, NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - g_return_val_if_fail (g_task_is_valid (async_result, self), NULL); - g_return_val_if_fail (g_async_result_is_tagged (async_result, gdata_oauth1_authorizer_request_authentication_uri_async), NULL); - - data = g_task_propagate_pointer (G_TASK (async_result), error); - - if (data == NULL) { - /* Return the error and set all of the output parameters to NULL */ - *token = NULL; - *token_secret = NULL; - - return NULL; - } - - /* Success! Transfer the output to the appropriate parameters and nullify it so it doesn't get freed when the async result gets finalised */ - *token = g_steal_pointer (&data->token); - *token_secret = g_steal_pointer (&data->token_secret); - - return g_steal_pointer (&data->authentication_uri); -} - -/** - * gdata_oauth1_authorizer_request_authorization: - * @self: a #GDataOAuth1Authorizer - * @token: the request token returned by gdata_oauth1_authorizer_request_authentication_uri() - * @token_secret: the request token secret returned by gdata_oauth1_authorizer_request_authentication_uri() - * @verifier: the verifier entered by the user from the authentication page - * @cancellable: (allow-none): optional #GCancellable object, or %NULL - * @error: a #GError, or %NULL - * - * Requests authorization of the given request @token from the Google accounts service using the given @verifier as entered by the user from the - * authentication page at the URI returned by gdata_oauth1_authorizer_request_authentication_uri(). @token and @token_secret must be the same values - * as were returned by gdata_oauth1_authorizer_request_authentication_uri() if it was successful. - * - * If the verifier is valid (i.e. the user granted access to the application and the Google accounts service has no reason to distrust the client), - * %TRUE will be returned and any operations performed from that point onwards on #GDataServices using this #GDataAuthorizer will be - * authorized. - * - * If the user denies access to the application or the Google accounts service distrusts it, a bogus verifier could be returned. In this case, %FALSE - * will be returned and a %GDATA_SERVICE_ERROR_FORBIDDEN error will be raised. - * - * Note that if the user denies access to the application, it may be the case that they have no verifier to enter. In this case, the client can simply - * not call this method. The #GDataOAuth1Authorizer stores no state for authentication operations which have succeeded in calling - * gdata_oauth1_authorizer_request_authentication_uri() but not yet successfully called gdata_oauth1_authorizer_request_authorization(). - * - * This method implements Section 2.3 of the - * OAuth 1.0 protocol. - * - * Return value: %TRUE if authorization was successful, %FALSE otherwise - * - * Since: 0.9.0 - */ -gboolean -gdata_oauth1_authorizer_request_authorization (GDataOAuth1Authorizer *self, const gchar *token, const gchar *token_secret, const gchar *verifier, - GCancellable *cancellable, GError **error) -{ -#ifdef ENABLE_OAUTH1 - GDataOAuth1AuthorizerPrivate *priv; - SoupMessage *message; - guint status; - gchar *request_body; - GHashTable *parameters; - GHashTable *response_details; - const gchar *_token, *_token_secret; - SoupURI *_uri; -#endif - - g_return_val_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self), FALSE); - g_return_val_if_fail (token != NULL && *token != '\0', FALSE); - g_return_val_if_fail (token_secret != NULL && *token_secret != '\0', FALSE); - g_return_val_if_fail (verifier != NULL && *verifier != '\0', FALSE); - g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - -#ifdef ENABLE_OAUTH1 - /* This implements OAuthGetAccessToken using the request token returned by OAuthGetRequestToken and the verification code returned by - * OAuthAuthorizeToken. See: - * • http://code.google.com/apis/accounts/docs/OAuth_ref.html#AccessToken - * • http://tools.ietf.org/html/rfc5849#section-2.3 - */ - - priv = self->priv; - - /* Build the request body and the set of parameters to be signed */ - parameters = g_hash_table_new (g_str_hash, g_str_equal); - g_hash_table_insert (parameters, (gpointer) "oauth_verifier", (gpointer) verifier); - request_body = soup_form_encode_hash (parameters); - - /* Build the message */ - _uri = soup_uri_new ("https://www.google.com/accounts/OAuthGetAccessToken"); - soup_uri_set_port (_uri, _gdata_service_get_https_port ()); - message = soup_message_new_from_uri (SOUP_METHOD_POST, _uri); - soup_uri_free (_uri); - soup_message_set_request (message, "application/x-www-form-urlencoded", SOUP_MEMORY_TAKE, request_body, strlen (request_body)); - - sign_message (self, message, token, token_secret, parameters); - - g_hash_table_destroy (parameters); - - /* Send the message */ - _gdata_service_actually_send_message (priv->session, message, cancellable, error); - status = message->status_code; - - if (status == SOUP_STATUS_CANCELLED) { - /* Cancelled (the error has already been set) */ - g_object_unref (message); - return FALSE; - } else if (status != SOUP_STATUS_OK) { - /* Server returned an error. This either means that there was a server error or, more likely, the server doesn't trust the client - * or the user denied authorization to the token on the authorization web page. */ - g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_FORBIDDEN, _("Access was denied by the user or server.")); - g_object_unref (message); - - return FALSE; - } - - g_assert (message->response_body->data != NULL); - - /* Parse the response. We expect something like: - * oauth_token=ab3cd9j4ks73hf7g&oauth_token_secret=ZXhhbXBsZS5jb20&oauth_callback_confirmed=true - * See: http://code.google.com/apis/accounts/docs/OAuth_ref.html#AccessToken and - * http://tools.ietf.org/html/rfc5849#section-2.3 for details. */ - response_details = soup_form_decode (message->response_body->data); - - /* Zero out the response body to lower the chance of it (with all the auth. tokens it contains) hitting disk or getting leaked in - * free memory. */ - memset ((void*) message->response_body->data, 0, message->response_body->length); - - g_object_unref (message); - - _token = g_hash_table_lookup (response_details, "oauth_token"); - _token_secret = g_hash_table_lookup (response_details, "oauth_token_secret"); - - /* Validate the returned values */ - if (_token == NULL || _token_secret == NULL || - *_token == '\0' || *_token_secret == '\0') { - g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR, _("The server returned a malformed response.")); - g_hash_table_destroy (response_details); - - return FALSE; - } - - /* Store the token and token secret in the authoriser */ - g_mutex_lock (&(priv->mutex)); - - g_free (priv->token); - priv->token = g_strdup (_token); - - _gdata_service_secure_strfree (priv->token_secret); - priv->token_secret = _gdata_service_secure_strdup (_token_secret); - - g_mutex_unlock (&(priv->mutex)); - - /* Zero out the secret token before freeing the hash table, to reduce the chance of it hitting disk later. */ - memset ((void*) _token_secret, 0, strlen (_token_secret)); - - g_hash_table_destroy (response_details); - - return TRUE; -#else /* if !ENABLE_OAUTH1 */ - if (!g_cancellable_set_error_if_cancelled (cancellable, error)) - g_set_error_literal (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_UNAVAILABLE, - _("OAuth 1.0 support is disabled.")); - - return FALSE; -#endif -} - -typedef struct { - /* Input */ - gchar *token; - GDataSecureString token_secret; /* must be allocated by _gdata_service_secure_strdup() */ - gchar *verifier; -} RequestAuthorizationAsyncData; - -static void -request_authorization_async_data_free (RequestAuthorizationAsyncData *data) -{ - g_free (data->token); - _gdata_service_secure_strfree (data->token_secret); - g_free (data->verifier); - - g_slice_free (RequestAuthorizationAsyncData, data); -} - -static void -request_authorization_thread (GTask *task, gpointer source_object, gpointer task_data, GCancellable *cancellable) -{ - GDataOAuth1Authorizer *authorizer = GDATA_OAUTH1_AUTHORIZER (source_object); - RequestAuthorizationAsyncData *data = task_data; - g_autoptr(GError) error = NULL; - - if (!gdata_oauth1_authorizer_request_authorization (authorizer, data->token, data->token_secret, data->verifier, cancellable, &error)) - g_task_return_error (task, g_steal_pointer (&error)); - else - g_task_return_boolean (task, TRUE); -} - -/** - * gdata_oauth1_authorizer_request_authorization_async: - * @self: a #GDataOAuth1Authorizer - * @token: the request token returned by gdata_oauth1_authorizer_request_authentication_uri() - * @token_secret: the request token secret returned by gdata_oauth1_authorizer_request_authentication_uri() - * @verifier: the verifier entered by the user from the authentication page - * @cancellable: (allow-none): an optional #GCancellable, or %NULL - * @callback: a #GAsyncReadyCallback to call when authorization is finished - * @user_data: (closure): data to pass to the @callback function - * - * Requests authorization of the given request @token from the Google accounts service using the given @verifier as entered by the user. - * @self, @token, @token_secret and @verifier are reffed/copied when this method is called, so can safely be freed after this method returns. - * - * For more details, see gdata_oauth1_authorizer_request_authorization(), which is the synchronous version of this method. - * - * When the operation is finished, @callback will be called. You can then call gdata_oauth1_authorizer_request_authorization_finish() to get the - * results of the operation. - * - * Since: 0.9.0 - */ -void -gdata_oauth1_authorizer_request_authorization_async (GDataOAuth1Authorizer *self, const gchar *token, const gchar *token_secret, - const gchar *verifier, - GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) -{ - g_autoptr(GTask) task = NULL; - RequestAuthorizationAsyncData *data; - - g_return_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self)); - g_return_if_fail (token != NULL && *token != '\0'); - g_return_if_fail (token_secret != NULL && *token_secret != '\0'); - g_return_if_fail (verifier != NULL && *verifier != '\0'); - g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); - - data = g_slice_new (RequestAuthorizationAsyncData); - data->token = g_strdup (token); - data->token_secret = _gdata_service_secure_strdup (token_secret); - data->verifier = g_strdup (verifier); - - task = g_task_new (self, cancellable, callback, user_data); - g_task_set_source_tag (task, gdata_oauth1_authorizer_request_authorization_async); - g_task_set_task_data (task, g_steal_pointer (&data), (GDestroyNotify) request_authorization_async_data_free); - g_task_run_in_thread (task, request_authorization_thread); -} - -/** - * gdata_oauth1_authorizer_request_authorization_finish: - * @self: a #GDataOAuth1Authorizer - * @async_result: a #GAsyncResult - * @error: a #GError, or %NULL - * - * Finishes an asynchronous authorization operation started with gdata_oauth1_authorizer_request_authorization_async(). - * - * Return value: %TRUE if authorization was successful, %FALSE otherwise - * - * Since: 0.9.0 - */ -gboolean -gdata_oauth1_authorizer_request_authorization_finish (GDataOAuth1Authorizer *self, GAsyncResult *async_result, GError **error) -{ - g_return_val_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self), FALSE); - g_return_val_if_fail (G_IS_ASYNC_RESULT (async_result), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - g_return_val_if_fail (g_task_is_valid (async_result, self), FALSE); - g_return_val_if_fail (g_async_result_is_tagged (async_result, gdata_oauth1_authorizer_request_authorization_async), FALSE); - - return g_task_propagate_boolean (G_TASK (async_result), error); -} - -/** - * gdata_oauth1_authorizer_get_application_name: - * @self: a #GDataOAuth1Authorizer - * - * Returns the application name being used on the authentication page at the URI returned by gdata_oauth1_authorizer_request_authentication_uri(); - * i.e. the value of #GDataOAuth1Authorizer:application-name. - * - * Return value: (allow-none): the application name, or %NULL if one isn't set - * - * Since: 0.9.0 - */ -const gchar * -gdata_oauth1_authorizer_get_application_name (GDataOAuth1Authorizer *self) -{ - g_return_val_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self), NULL); - return self->priv->application_name; -} - -/** - * gdata_oauth1_authorizer_get_locale: - * @self: a #GDataOAuth1Authorizer - * - * Returns the locale currently being used for network requests, or %NULL if the locale is the default. - * - * Return value: (allow-none): the current locale - * - * Since: 0.9.0 - */ -const gchar * -gdata_oauth1_authorizer_get_locale (GDataOAuth1Authorizer *self) -{ - g_return_val_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self), NULL); - return self->priv->locale; -} - -/** - * gdata_oauth1_authorizer_set_locale: - * @self: a #GDataOAuth1Authorizer - * @locale: (allow-none): the new locale in Unix locale format, or %NULL for the default locale - * - * Set the locale used for network requests to @locale, given in standard Unix locale format. See #GDataOAuth1Authorizer:locale for more details. - * - * Note that while it's possible to change the locale after sending network requests (i.e. calling - * gdata_oauth1_authorizer_request_authentication_uri() for the first time), it is unsupported, as the server-side software may behave unexpectedly. - * The only supported use of this method is after creation of the authorizer, but before any network requests are made. - * - * Since: 0.9.0 - */ -void -gdata_oauth1_authorizer_set_locale (GDataOAuth1Authorizer *self, const gchar *locale) -{ - g_return_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self)); - - if (g_strcmp0 (locale, self->priv->locale) == 0) { - /* Already has this value */ - return; - } - - g_free (self->priv->locale); - self->priv->locale = g_strdup (locale); - g_object_notify (G_OBJECT (self), "locale"); -} - -static void -notify_proxy_uri_cb (GObject *gobject, GParamSpec *pspec, GDataOAuth1Authorizer *self) -{ - /* Flush our cached version */ - if (self->priv->proxy_uri != NULL) { - soup_uri_free (self->priv->proxy_uri); - self->priv->proxy_uri = NULL; - } - - g_object_notify (G_OBJECT (self), "proxy-uri"); -} - -/* Static function which isn't deprecated so we can continue using it internally. */ -static SoupURI * -_get_proxy_uri (GDataOAuth1Authorizer *self) -{ - SoupURI *proxy_uri; - - g_return_val_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self), NULL); - - /* If we have a cached version, return that */ - if (self->priv->proxy_uri != NULL) { - return self->priv->proxy_uri; - } - - g_object_get (self->priv->session, SOUP_SESSION_PROXY_URI, &proxy_uri, NULL); - - /* Update the cache; it takes ownership of the URI */ - self->priv->proxy_uri = proxy_uri; - - return proxy_uri; -} - -/** - * gdata_oauth1_authorizer_get_proxy_uri: - * @self: a #GDataOAuth1Authorizer - * - * Gets the proxy URI on the #GDataOAuth1Authorizer's #SoupSession. - * - * Return value: (transfer full) (allow-none): the proxy URI, or %NULL; free with soup_uri_free() - * - * Since: 0.9.0 - * Deprecated: 0.15.0: Use gdata_oauth1_authorizer_get_proxy_resolver() instead, which gives more flexibility over the proxy used. - */ -SoupURI * -gdata_oauth1_authorizer_get_proxy_uri (GDataOAuth1Authorizer *self) -{ - return _get_proxy_uri (self); -} - -/* Static function which isn't deprecated so we can continue using it internally. */ -static void -_set_proxy_uri (GDataOAuth1Authorizer *self, SoupURI *proxy_uri) -{ - g_return_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self)); - - g_object_set (self->priv->session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL); - - /* Notification is handled in notify_proxy_uri_cb() which is called as a result of setting the property on the session */ -} - -/** - * gdata_oauth1_authorizer_set_proxy_uri: - * @self: a #GDataOAuth1Authorizer - * @proxy_uri: (allow-none): the proxy URI, or %NULL - * - * Sets the proxy URI on the #SoupSession used internally by the #GDataOAuth1Authorizer. This forces all requests through the given proxy. - * - * If @proxy_uri is %NULL, no proxy will be used. - * - * Since: 0.9.0 - * Deprecated: 0.15.0: Use gdata_oauth1_authorizer_set_proxy_resolver() instead, which gives more flexibility over the proxy used. - */ -void -gdata_oauth1_authorizer_set_proxy_uri (GDataOAuth1Authorizer *self, SoupURI *proxy_uri) -{ - _set_proxy_uri (self, proxy_uri); -} - -/** - * gdata_oauth1_authorizer_get_proxy_resolver: - * @self: a #GDataOAuth1Authorizer - * - * Gets the #GProxyResolver on the #GDataOAuth1Authorizer's #SoupSession. - * - * Return value: (transfer none) (allow-none): a #GProxyResolver, or %NULL - * - * Since: 0.15.0 - */ -GProxyResolver * -gdata_oauth1_authorizer_get_proxy_resolver (GDataOAuth1Authorizer *self) -{ - g_return_val_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self), NULL); - - return self->priv->proxy_resolver; -} - -/** - * gdata_oauth1_authorizer_set_proxy_resolver: - * @self: a #GDataOAuth1Authorizer - * @proxy_resolver: (allow-none): a #GProxyResolver, or %NULL - * - * Sets the #GProxyResolver on the #SoupSession used internally by the given #GDataOAuth1Authorizer. - * - * Setting this will clear the #GDataOAuth1Authorizer:proxy-uri property. - * - * Since: 0.15.0 - */ -void -gdata_oauth1_authorizer_set_proxy_resolver (GDataOAuth1Authorizer *self, GProxyResolver *proxy_resolver) -{ - g_return_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self)); - g_return_if_fail (proxy_resolver == NULL || G_IS_PROXY_RESOLVER (proxy_resolver)); - - if (proxy_resolver != NULL) { - g_object_ref (proxy_resolver); - } - - g_clear_object (&self->priv->proxy_resolver); - self->priv->proxy_resolver = proxy_resolver; - - g_object_notify (G_OBJECT (self), "proxy-resolver"); -} - -static void -notify_timeout_cb (GObject *gobject, GParamSpec *pspec, GObject *self) -{ - g_object_notify (self, "timeout"); -} - -/** - * gdata_oauth1_authorizer_get_timeout: - * @self: a #GDataOAuth1Authorizer - * - * Gets the #GDataOAuth1Authorizer:timeout property; the network timeout, in seconds. - * - * Return value: the timeout, or 0 - * - * Since: 0.9.0 - */ -guint -gdata_oauth1_authorizer_get_timeout (GDataOAuth1Authorizer *self) -{ - guint timeout; - - g_return_val_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self), 0); - - g_object_get (self->priv->session, SOUP_SESSION_TIMEOUT, &timeout, NULL); - - return timeout; -} - -/** - * gdata_oauth1_authorizer_set_timeout: - * @self: a #GDataOAuth1Authorizer - * @timeout: the timeout, or 0 - * - * Sets the #GDataOAuth1Authorizer:timeout property; the network timeout, in seconds. - * - * If @timeout is 0, network operations will never time out. - * - * Since: 0.9.0 - */ -void -gdata_oauth1_authorizer_set_timeout (GDataOAuth1Authorizer *self, guint timeout) -{ - g_return_if_fail (GDATA_IS_OAUTH1_AUTHORIZER (self)); - - if (gdata_oauth1_authorizer_get_timeout (self) == timeout) { - /* Already has this value */ - return; - } - - g_object_set (self->priv->session, SOUP_SESSION_TIMEOUT, timeout, NULL); - - /* Notification is handled in notify_timeout_cb() which is called as a result of setting the property on the session */ -} diff --git a/gdata/gdata-oauth1-authorizer.h b/gdata/gdata-oauth1-authorizer.h deleted file mode 100644 index 6e16a4bc..00000000 --- a/gdata/gdata-oauth1-authorizer.h +++ /dev/null @@ -1,108 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* - * GData Client - * Copyright (C) Philip Withnall 2011 - * - * GData Client 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; either - * version 2.1 of the License, or (at your option) any later version. - * - * GData Client 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 GData Client. If not, see . - */ - -#ifndef GDATA_OAUTH1_AUTHORIZER_H -#define GDATA_OAUTH1_AUTHORIZER_H - -#include -#include - -#include "gdata-authorizer.h" - -G_BEGIN_DECLS - -#define GDATA_TYPE_OAUTH1_AUTHORIZER (gdata_oauth1_authorizer_get_type ()) -#define GDATA_OAUTH1_AUTHORIZER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDATA_TYPE_OAUTH1_AUTHORIZER, GDataOAuth1Authorizer)) -#define GDATA_OAUTH1_AUTHORIZER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDATA_TYPE_OAUTH1_AUTHORIZER, GDataOAuth1AuthorizerClass)) -#define GDATA_IS_OAUTH1_AUTHORIZER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDATA_TYPE_OAUTH1_AUTHORIZER)) -#define GDATA_IS_OAUTH1_AUTHORIZER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDATA_TYPE_OAUTH1_AUTHORIZER)) -#define GDATA_OAUTH1_AUTHORIZER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDATA_TYPE_OAUTH1_AUTHORIZER, GDataOAuth1AuthorizerClass)) - -typedef struct _GDataOAuth1AuthorizerPrivate GDataOAuth1AuthorizerPrivate; - -/** - * GDataOAuth1Authorizer: - * - * All the fields in the #GDataOAuth1Authorizer structure are private and should never be accessed directly. - * - * Since: 0.9.0 - */ -typedef struct { - /*< private >*/ - GObject parent; - GDataOAuth1AuthorizerPrivate *priv; -} GDataOAuth1Authorizer; - -/** - * GDataOAuth1AuthorizerClass: - * - * All the fields in the #GDataOAuth1AuthorizerClass structure are private and should never be accessed directly. - * - * Since: 0.9.0 - */ -typedef struct { - /*< private >*/ - GObjectClass parent; - - /*< private >*/ - /* Padding for future expansion */ - void (*_g_reserved0) (void); - void (*_g_reserved1) (void); -} GDataOAuth1AuthorizerClass; - -GType gdata_oauth1_authorizer_get_type (void) G_GNUC_CONST; -G_DEFINE_AUTOPTR_CLEANUP_FUNC (GDataOAuth1Authorizer, g_object_unref) - -GDataOAuth1Authorizer *gdata_oauth1_authorizer_new (const gchar *application_name, GType service_type) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; -GDataOAuth1Authorizer *gdata_oauth1_authorizer_new_for_authorization_domains (const gchar *application_name, - GList *authorization_domains) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; - -gchar *gdata_oauth1_authorizer_request_authentication_uri (GDataOAuth1Authorizer *self, gchar **token, gchar **token_secret, - GCancellable *cancellable, GError **error); -void gdata_oauth1_authorizer_request_authentication_uri_async (GDataOAuth1Authorizer *self, GCancellable *cancellable, - GAsyncReadyCallback callback, gpointer user_data); -gchar *gdata_oauth1_authorizer_request_authentication_uri_finish (GDataOAuth1Authorizer *self, GAsyncResult *async_result, gchar **token, - gchar **token_secret, GError **error); - -gboolean gdata_oauth1_authorizer_request_authorization (GDataOAuth1Authorizer *self, const gchar *token, const gchar *token_secret, - const gchar *verifier, GCancellable *cancellable, GError **error); -void gdata_oauth1_authorizer_request_authorization_async (GDataOAuth1Authorizer *self, const gchar *token, const gchar *token_secret, - const gchar *verifier, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer user_data); -gboolean gdata_oauth1_authorizer_request_authorization_finish (GDataOAuth1Authorizer *self, GAsyncResult *async_result, GError **error); - -const gchar *gdata_oauth1_authorizer_get_application_name (GDataOAuth1Authorizer *self) G_GNUC_PURE; - -const gchar *gdata_oauth1_authorizer_get_locale (GDataOAuth1Authorizer *self) G_GNUC_PURE; -void gdata_oauth1_authorizer_set_locale (GDataOAuth1Authorizer *self, const gchar *locale); - -#ifndef LIBGDATA_DISABLE_DEPRECATED -SoupURI *gdata_oauth1_authorizer_get_proxy_uri (GDataOAuth1Authorizer *self) G_GNUC_PURE G_GNUC_DEPRECATED_FOR (gdata_oauth1_authorizer_get_proxy_resolver); -void gdata_oauth1_authorizer_set_proxy_uri (GDataOAuth1Authorizer *self, SoupURI *proxy_uri) G_GNUC_DEPRECATED_FOR (gdata_oauth1_authorizer_set_proxy_resolver); -#endif /* !LIBGDATA_DISABLE_DEPRECATED */ - -GProxyResolver *gdata_oauth1_authorizer_get_proxy_resolver (GDataOAuth1Authorizer *self) G_GNUC_PURE; -void gdata_oauth1_authorizer_set_proxy_resolver (GDataOAuth1Authorizer *self, GProxyResolver *proxy_resolver); - -guint gdata_oauth1_authorizer_get_timeout (GDataOAuth1Authorizer *self) G_GNUC_PURE; -void gdata_oauth1_authorizer_set_timeout (GDataOAuth1Authorizer *self, guint timeout); - -G_END_DECLS - -#endif /* !GDATA_OAUTH1_AUTHORIZER_H */ diff --git a/gdata/gdata.h b/gdata/gdata.h index 0858accd..b285e806 100644 --- a/gdata/gdata.h +++ b/gdata/gdata.h @@ -38,7 +38,6 @@ #include #include #include -#include #include #ifdef GOA_API_IS_SUBJECT_TO_CHANGE /* You need to define GOA_API_IS_SUBJECT_TO_CHANGE in order to use the GOA authoriser. */ diff --git a/gdata/meson.build b/gdata/meson.build index a42bae71..ff14f81f 100644 --- a/gdata/meson.build +++ b/gdata/meson.build @@ -34,7 +34,6 @@ headers = files( 'gdata-download-stream.h', 'gdata-entry.h', 'gdata-feed.h', - 'gdata-oauth1-authorizer.h', 'gdata-oauth2-authorizer.h', 'gdata-parsable.h', 'gdata-query.h', @@ -59,7 +58,6 @@ sources += files( 'gdata-download-stream.c', 'gdata-entry.c', 'gdata-feed.c', - 'gdata-oauth1-authorizer.c', 'gdata-oauth2-authorizer.c', 'gdata-parsable.c', 'gdata-parser.c', diff --git a/gdata/symbol.map b/gdata/symbol.map index 9b9c8de1..2c0f308c 100644 --- a/gdata/symbol.map +++ b/gdata/symbol.map @@ -779,24 +779,6 @@ global: gdata_media_thumbnail_get_type; gdata_media_thumbnail_get_uri; gdata_media_thumbnail_get_width; - gdata_oauth1_authorizer_get_application_name; - gdata_oauth1_authorizer_get_locale; - gdata_oauth1_authorizer_get_proxy_resolver; - gdata_oauth1_authorizer_get_proxy_uri; - gdata_oauth1_authorizer_get_timeout; - gdata_oauth1_authorizer_get_type; - gdata_oauth1_authorizer_new; - gdata_oauth1_authorizer_new_for_authorization_domains; - gdata_oauth1_authorizer_request_authentication_uri; - gdata_oauth1_authorizer_request_authentication_uri_async; - gdata_oauth1_authorizer_request_authentication_uri_finish; - gdata_oauth1_authorizer_request_authorization; - gdata_oauth1_authorizer_request_authorization_async; - gdata_oauth1_authorizer_request_authorization_finish; - gdata_oauth1_authorizer_set_locale; - gdata_oauth1_authorizer_set_proxy_resolver; - gdata_oauth1_authorizer_set_proxy_uri; - gdata_oauth1_authorizer_set_timeout; gdata_oauth2_authorizer_build_authentication_uri; gdata_oauth2_authorizer_dup_refresh_token; gdata_oauth2_authorizer_get_client_id; diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c index 87fb0b81..cd2ad667 100644 --- a/gdata/tests/calendar.c +++ b/gdata/tests/calendar.c @@ -1461,7 +1461,7 @@ mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer use } /* Set up a global GDataAuthorizer to be used for all the tests. Unfortunately, - * the Google Calendar API is limited to OAuth1 and OAuth2 authorisation, so + * the Google Calendar API is limited to OAuth2 authorisation, so * this requires user interaction when online. * * If not online, use a dummy authoriser. */ diff --git a/gdata/tests/contacts.c b/gdata/tests/contacts.c index b6f4de2d..59698898 100644 --- a/gdata/tests/contacts.c +++ b/gdata/tests/contacts.c @@ -2547,7 +2547,7 @@ mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer use } /* Set up a global GDataAuthorizer to be used for all the tests. Unfortunately, - * the Google Contacts API is effectively limited to OAuth1 and OAuth2 + * the Google Contacts API is effectively limited to OAuth2 * authorisation, so this requires user interaction when online. * * If not online, use a dummy authoriser. */ diff --git a/gdata/tests/meson.build b/gdata/tests/meson.build index 05184deb..22648ea8 100644 --- a/gdata/tests/meson.build +++ b/gdata/tests/meson.build @@ -23,7 +23,6 @@ tests = { 'should_fail': true, }, 'general': {}, - 'oauth1-authorizer': {}, 'oauth2-authorizer': {}, 'perf': {}, 'picasaweb': { diff --git a/gdata/tests/oauth1-authorizer.c b/gdata/tests/oauth1-authorizer.c deleted file mode 100644 index 480de207..00000000 --- a/gdata/tests/oauth1-authorizer.c +++ /dev/null @@ -1,1144 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* - * GData Client - * Copyright (C) Philip Withnall 2011 - * - * GData Client 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; either - * version 2.1 of the License, or (at your option) any later version. - * - * GData Client 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 GData Client. If not, see . - */ - -#include -#include -#include - -#include "common.h" - -/* Uses the Contacts API for tests, but it’s deprecated */ -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - -static GThread *main_thread = NULL; -static UhmServer *mock_server = NULL; - -static void -test_oauth1_authorizer_constructor (void) -{ - GDataOAuth1Authorizer *authorizer; - - authorizer = gdata_oauth1_authorizer_new ("Application name", GDATA_TYPE_CONTACTS_SERVICE); - - g_assert (authorizer != NULL); - g_assert (GDATA_IS_OAUTH1_AUTHORIZER (authorizer)); - g_assert (GDATA_IS_AUTHORIZER (authorizer)); - - g_object_unref (authorizer); -} - -static void -test_oauth1_authorizer_constructor_for_domains (void) -{ - GDataOAuth1Authorizer *authorizer; - GDataAuthorizationDomain *domain; - GList *domains; - - /* Try with standard domains first */ - domains = gdata_service_get_authorization_domains (GDATA_TYPE_CONTACTS_SERVICE); - authorizer = gdata_oauth1_authorizer_new_for_authorization_domains ("Application name", domains); - g_list_free (domains); - - g_assert (authorizer != NULL); - g_assert (GDATA_IS_OAUTH1_AUTHORIZER (authorizer)); - g_assert (GDATA_IS_AUTHORIZER (authorizer)); - - g_object_unref (authorizer); - - /* Try again with a custom domain. Note that, as in test_authorization_domain_properties() this should not normally happen in client code. */ - domain = GDATA_AUTHORIZATION_DOMAIN (g_object_new (GDATA_TYPE_AUTHORIZATION_DOMAIN, - "service-name", "test", - "scope", "test", - NULL)); - - domains = g_list_prepend (NULL, domain); - authorizer = gdata_oauth1_authorizer_new_for_authorization_domains ("Application name", domains); - g_list_free (domains); - - g_assert (authorizer != NULL); - g_assert (GDATA_IS_OAUTH1_AUTHORIZER (authorizer)); - g_assert (GDATA_IS_AUTHORIZER (authorizer)); - - g_object_unref (authorizer); - g_object_unref (domain); -} - -typedef struct { - GDataOAuth1Authorizer *authorizer; - - guint locale_notification_count; - gulong locale_signal_handler; - guint proxy_resolver_notification_count; - gulong proxy_resolver_signal_handler; - guint timeout_notification_count; - gulong timeout_signal_handler; -} OAuth1AuthorizerData; - -/* Used to count that exactly the right number of notify signals are emitted when setting properties */ -static void -notify_cb (GObject *object, GParamSpec *pspec, guint *notification_count) -{ - /* Check we're running in the main thread */ - g_assert (g_thread_self () == main_thread); - - /* Increment the notification count */ - *notification_count = *notification_count + 1; -} - -static void -connect_to_oauth1_authorizer (OAuth1AuthorizerData *data) -{ - /* Connect to notifications from the object to verify they're only emitted the correct number of times */ - data->locale_signal_handler = g_signal_connect (data->authorizer, "notify::locale", (GCallback) notify_cb, - &(data->locale_notification_count)); - data->proxy_resolver_signal_handler = g_signal_connect (data->authorizer, "notify::proxy-resolver", (GCallback) notify_cb, - &(data->proxy_resolver_notification_count)); - data->timeout_signal_handler = g_signal_connect (data->authorizer, "notify::timeout", (GCallback) notify_cb, - &(data->timeout_notification_count)); -} - -static void -set_up_oauth1_authorizer_data (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - data->authorizer = gdata_oauth1_authorizer_new ("Application name", GDATA_TYPE_CONTACTS_SERVICE); - connect_to_oauth1_authorizer (data); -} - -static void -set_up_oauth1_authorizer_data_fallback_application_name (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - g_set_application_name ("Fallback name"); - data->authorizer = gdata_oauth1_authorizer_new (NULL, GDATA_TYPE_CONTACTS_SERVICE); - connect_to_oauth1_authorizer (data); -} - -static void -set_up_oauth1_authorizer_data_multiple_domains (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - GList *authorization_domains = NULL; - - authorization_domains = g_list_prepend (authorization_domains, gdata_contacts_service_get_primary_authorization_domain ()); - authorization_domains = g_list_prepend (authorization_domains, gdata_picasaweb_service_get_primary_authorization_domain ()); - data->authorizer = gdata_oauth1_authorizer_new_for_authorization_domains ("Application name", authorization_domains); - g_list_free (authorization_domains); - - connect_to_oauth1_authorizer (data); -} - -static void -set_up_oauth1_authorizer_data_locale (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - data->authorizer = gdata_oauth1_authorizer_new ("Application name", GDATA_TYPE_CONTACTS_SERVICE); - gdata_oauth1_authorizer_set_locale (data->authorizer, "en_GB"); - connect_to_oauth1_authorizer (data); -} - -static void -set_up_oauth1_authorizer_data_authenticated (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - gboolean *skip_test = (gboolean*) user_data; - gchar *authentication_uri, *token, *token_secret, *verifier; - - gdata_test_mock_server_start_trace (mock_server, "setup-oauth1-authorizer-data-authenticated"); - - /* Chain up */ - set_up_oauth1_authorizer_data (data, NULL); - - /* Get an authentication URI */ - authentication_uri = gdata_oauth1_authorizer_request_authentication_uri (data->authorizer, &token, &token_secret, NULL, NULL); - g_assert (authentication_uri != NULL); - - /* Get the verifier off the user */ - verifier = gdata_test_query_user_for_verifier (authentication_uri); - - g_free (authentication_uri); - - if (verifier == NULL) { - *skip_test = TRUE; - goto skip_test; - } - - /* Authorise the token */ - g_assert (gdata_oauth1_authorizer_request_authorization (data->authorizer, token, token_secret, verifier, NULL, NULL) == TRUE); - -skip_test: - g_free (token); - g_free (token_secret); - g_free (verifier); - - uhm_server_end_trace (mock_server); -} - -static void -tear_down_oauth1_authorizer_data (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - /* Clean up signal handlers */ - g_signal_handler_disconnect (data->authorizer, data->timeout_signal_handler); - g_signal_handler_disconnect (data->authorizer, data->proxy_resolver_signal_handler); - g_signal_handler_disconnect (data->authorizer, data->locale_signal_handler); - - g_object_unref (data->authorizer); -} - -/* Test getting and setting the application-name property */ -static void -test_oauth1_authorizer_properties_application_name (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - gchar *application_name; - - /* Verifying the normal state of the property in a newly-constructed instance of GDataOAuth1Authorizer */ - g_assert_cmpstr (gdata_oauth1_authorizer_get_application_name (data->authorizer), ==, "Application name"); - - g_object_get (data->authorizer, "application-name", &application_name, NULL); - g_assert_cmpstr (application_name, ==, "Application name"); - g_free (application_name); -} - -/* Test the fallback for the application-name property */ -static void -test_oauth1_authorizer_properties_application_name_fallback (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - gchar *application_name; - - /* Verifying the normal state of the property in a newly-constructed instance of GDataOAuth1Authorizer */ - g_assert_cmpstr (gdata_oauth1_authorizer_get_application_name (data->authorizer), ==, "Fallback name"); - - g_object_get (data->authorizer, "application-name", &application_name, NULL); - g_assert_cmpstr (application_name, ==, "Fallback name"); - g_free (application_name); -} - -/* Test getting and setting the locale property */ -static void -test_oauth1_authorizer_properties_locale (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - gchar *locale; - - /* Verifying the normal state of the property in a newly-constructed instance of GDataOAuth1Authorizer */ - g_assert_cmpstr (gdata_oauth1_authorizer_get_locale (data->authorizer), ==, NULL); - - g_object_get (data->authorizer, "locale", &locale, NULL); - g_assert_cmpstr (locale, ==, NULL); - g_free (locale); - - g_assert_cmpuint (data->locale_notification_count, ==, 0); - - /* Check setting it works and emits a notification */ - gdata_oauth1_authorizer_set_locale (data->authorizer, "en"); - - g_assert_cmpuint (data->locale_notification_count, ==, 1); - - g_assert_cmpstr (gdata_oauth1_authorizer_get_locale (data->authorizer), ==, "en"); - - g_object_get (data->authorizer, "locale", &locale, NULL); - g_assert_cmpstr (locale, ==, "en"); - g_free (locale); - - /* Check setting it to the same value is a no-op */ - gdata_oauth1_authorizer_set_locale (data->authorizer, "en"); - g_assert_cmpuint (data->locale_notification_count, ==, 1); - - /* Check setting it back to NULL works */ - gdata_oauth1_authorizer_set_locale (data->authorizer, NULL); - - g_assert_cmpuint (data->locale_notification_count, ==, 2); - - g_assert_cmpstr (gdata_oauth1_authorizer_get_locale (data->authorizer), ==, NULL); - - g_object_get (data->authorizer, "locale", &locale, NULL); - g_assert_cmpstr (locale, ==, NULL); - g_free (locale); - - /* Test that setting it using g_object_set() works */ - g_object_set (data->authorizer, "locale", "de", NULL); - g_assert_cmpstr (gdata_oauth1_authorizer_get_locale (data->authorizer), ==, "de"); -} - -/* Test getting and setting the proxy-resolver property */ -static void -test_oauth1_authorizer_properties_proxy_resolver (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - GProxyResolver *old_proxy_resolver, *proxy_resolver, *new_proxy_resolver; - - /* Verifying the normal state of the property in a newly-constructed instance of GDataOAuth1Authorizer. - * Since the resolver comes from the SoupSession, we don’t know whether it’s initially NULL. */ - old_proxy_resolver = gdata_oauth1_authorizer_get_proxy_resolver (data->authorizer); - - g_object_get (data->authorizer, "proxy-resolver", &proxy_resolver, NULL); - g_assert (proxy_resolver == old_proxy_resolver); - - g_assert_cmpuint (data->proxy_resolver_notification_count, ==, 0); - - /* Check setting it works and emits a notification */ - new_proxy_resolver = g_object_ref (g_proxy_resolver_get_default ()); - gdata_oauth1_authorizer_set_proxy_resolver (data->authorizer, new_proxy_resolver); - - g_assert_cmpuint (data->proxy_resolver_notification_count, ==, 1); - - g_assert (gdata_oauth1_authorizer_get_proxy_resolver (data->authorizer) != NULL); - g_assert (gdata_oauth1_authorizer_get_proxy_resolver (data->authorizer) == new_proxy_resolver); - - g_object_get (data->authorizer, "proxy-resolver", &proxy_resolver, NULL); - g_assert (proxy_resolver != NULL); - g_assert (gdata_oauth1_authorizer_get_proxy_resolver (data->authorizer) == new_proxy_resolver); - g_object_unref (proxy_resolver); - - g_object_unref (new_proxy_resolver); - - /* Check setting it back to NULL works */ - gdata_oauth1_authorizer_set_proxy_resolver (data->authorizer, NULL); - - g_assert_cmpuint (data->proxy_resolver_notification_count, ==, 2); - - g_assert (gdata_oauth1_authorizer_get_proxy_resolver (data->authorizer) == NULL); - - g_object_get (data->authorizer, "proxy-resolver", &proxy_resolver, NULL); - g_assert (proxy_resolver == NULL); - - /* Test that setting it using g_object_set() works */ - new_proxy_resolver = g_object_ref (g_proxy_resolver_get_default ()); - g_object_set (data->authorizer, "proxy-resolver", new_proxy_resolver, NULL); - g_object_unref (new_proxy_resolver); - - g_assert (gdata_oauth1_authorizer_get_proxy_resolver (data->authorizer) != NULL); -} - -/* Test getting and setting the timeout property */ -static void -test_oauth1_authorizer_properties_timeout (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - guint timeout; - - /* Verifying the normal state of the property in a newly-constructed instance of GDataOAuth1Authorizer */ - g_assert_cmpuint (gdata_oauth1_authorizer_get_timeout (data->authorizer), ==, 0); - - g_object_get (data->authorizer, "timeout", &timeout, NULL); - g_assert_cmpuint (timeout, ==, 0); - - g_assert_cmpuint (data->timeout_notification_count, ==, 0); - - /* Check setting it works and emits a notification */ - gdata_oauth1_authorizer_set_timeout (data->authorizer, 30); - - g_assert_cmpuint (data->timeout_notification_count, ==, 1); - - g_assert_cmpuint (gdata_oauth1_authorizer_get_timeout (data->authorizer), ==, 30); - - g_object_get (data->authorizer, "timeout", &timeout, NULL); - g_assert_cmpuint (timeout, ==, 30); - - /* Check setting it to the same value is a no-op */ - gdata_oauth1_authorizer_set_timeout (data->authorizer, 30); - g_assert_cmpuint (data->timeout_notification_count, ==, 1); - - /* Check setting it back to 0 works */ - gdata_oauth1_authorizer_set_timeout (data->authorizer, 0); - - g_assert_cmpuint (data->timeout_notification_count, ==, 2); - - g_assert_cmpuint (gdata_oauth1_authorizer_get_timeout (data->authorizer), ==, 0); - - g_object_get (data->authorizer, "timeout", &timeout, NULL); - g_assert_cmpuint (timeout, ==, 0); - - /* Test that setting it using g_object_set() works */ - g_object_set (data->authorizer, "timeout", 15, NULL); - g_assert_cmpuint (gdata_oauth1_authorizer_get_timeout (data->authorizer), ==, 15); -} - -/* Test that gdata_authorizer_refresh_authorization() is a no-op (whether authorised or not) */ -static void -test_oauth1_authorizer_refresh_authorization (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - gboolean *skip_test = (gboolean*) user_data; - GError *error = NULL; - - /* Skip the test if the user's requested */ - if (skip_test != NULL && *skip_test == TRUE) { - return; - } - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-refresh-authorization"); - - g_assert (gdata_authorizer_refresh_authorization (GDATA_AUTHORIZER (data->authorizer), NULL, &error) == FALSE); - g_assert_no_error (error); - g_clear_error (&error); - - uhm_server_end_trace (mock_server); -} - -/* Test that processing a request with a NULL domain will not change the request. */ -static void -test_oauth1_authorizer_process_request_null (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - SoupMessage *message; - SoupMessageHeadersIter iter; - guint header_count = 0; - const gchar *name, *value; - - /* Create a new message with an empty set of request headers */ - message = soup_message_new (SOUP_METHOD_GET, "https://example.com/"); - - /* Process the message */ - gdata_authorizer_process_request (GDATA_AUTHORIZER (data->authorizer), NULL, message); - - /* Check that the set of request headers is still empty */ - soup_message_headers_iter_init (&iter, message->request_headers); - - while (soup_message_headers_iter_next (&iter, &name, &value) == TRUE) { - header_count++; - } - - g_assert_cmpuint (header_count, ==, 0); - - g_object_unref (message); -} - -/* Test that processing a request with an authorizer which hasn't been authenticated yet will not change the request. */ -static void -test_oauth1_authorizer_process_request_unauthenticated (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - SoupMessage *message; - SoupMessageHeadersIter iter; - guint header_count = 0; - const gchar *name, *value; - - /* Create a new message with an empty set of request headers */ - message = soup_message_new (SOUP_METHOD_GET, "https://example.com/"); - - /* Process the message */ - gdata_authorizer_process_request (GDATA_AUTHORIZER (data->authorizer), gdata_contacts_service_get_primary_authorization_domain (), message); - - /* Check that the set of request headers is still empty */ - soup_message_headers_iter_init (&iter, message->request_headers); - - while (soup_message_headers_iter_next (&iter, &name, &value) == TRUE) { - header_count++; - } - - g_assert_cmpuint (header_count, ==, 0); - - g_object_unref (message); -} - -/* Test that processing a request with an authorizer which has been authenticated will change the request. */ -static void -test_oauth1_authorizer_process_request_authenticated (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - gboolean *skip_test = (gboolean*) user_data; - SoupMessage *message; - SoupMessageHeadersIter iter; - guint header_count = 0; - const gchar *name, *value; - - /* Skip the test if the user's requested */ - if (skip_test != NULL && *skip_test == TRUE) { - return; - } - - /* Create a new message with an empty set of request headers */ - message = soup_message_new (SOUP_METHOD_GET, "http://example.com/"); - - /* Process the message */ - gdata_authorizer_process_request (GDATA_AUTHORIZER (data->authorizer), gdata_contacts_service_get_primary_authorization_domain (), message); - - /* Check that at least one new header has been set */ - soup_message_headers_iter_init (&iter, message->request_headers); - - while (soup_message_headers_iter_next (&iter, &name, &value) == TRUE) { - header_count++; - } - - g_assert_cmpuint (header_count, >, 0); - - g_object_unref (message); -} - -/* Test that requesting an authentication URI synchronously works correctly */ -static void -test_oauth1_authorizer_request_authentication_uri_sync (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - gchar *authentication_uri, *token, *token_secret; - GError *error = NULL; - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authentication-uri-sync"); - - authentication_uri = gdata_oauth1_authorizer_request_authentication_uri (data->authorizer, &token, &token_secret, NULL, &error); -#ifdef ENABLE_OAUTH1 - g_assert_no_error (error); - g_assert (authentication_uri != NULL && *authentication_uri != '\0'); - g_assert (token != NULL && *token != '\0'); - g_assert (token_secret != NULL && *token_secret != '\0'); - g_clear_error (&error); - - g_test_message ("Requesting an authentication URI gave “%s” with request token “%s” and request token secret “%s”.", - authentication_uri, token, token_secret); - - g_free (authentication_uri); - g_free (token); - g_free (token_secret); -#else - g_assert_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_UNAVAILABLE); - g_assert_null (authentication_uri); - g_clear_error (&error); -#endif - - uhm_server_end_trace (mock_server); -} - -/* Test that requesting an authentication URI synchronously can be cancelled */ -static void -test_oauth1_authorizer_request_authentication_uri_sync_cancellation (OAuth1AuthorizerData *data, gconstpointer user_data) -{ - /* Initialise token and token_secret so we check that gdata_oauth1_authorizer_request_authentication_uri() NULLifies them on error */ - gchar *authentication_uri, *token = (gchar*) "error", *token_secret = (gchar*) "error"; - GCancellable *cancellable; - GError *error = NULL; - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authentication-uri-sync-cancellation"); - - /* Set up the cancellable */ - cancellable = g_cancellable_new (); - - /* Get a request token. This should return immediately as the cancellable was cancelled beforehand. */ - g_cancellable_cancel (cancellable); - authentication_uri = gdata_oauth1_authorizer_request_authentication_uri (data->authorizer, &token, &token_secret, cancellable, &error); - g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED); - g_assert (authentication_uri == NULL); - g_assert (token == NULL); - g_assert (token_secret == NULL); - g_clear_error (&error); - - g_free (authentication_uri); - g_free (token); - g_free (token_secret); - - g_object_unref (cancellable); - - uhm_server_end_trace (mock_server); -} - -typedef struct { - OAuth1AuthorizerData parent; - GMainLoop *main_loop; -} OAuth1AuthorizerAsyncData; - -static void -set_up_oauth1_authorizer_async_data (OAuth1AuthorizerAsyncData *data, gconstpointer user_data) -{ - /* Chain up */ - set_up_oauth1_authorizer_data ((OAuth1AuthorizerData*) data, user_data); - - /* Set up the main loop */ - data->main_loop = g_main_loop_new (NULL, FALSE); -} - -static void -set_up_oauth1_authorizer_async_data_multiple_domains (OAuth1AuthorizerAsyncData *data, gconstpointer user_data) -{ - /* Chain up */ - set_up_oauth1_authorizer_data_multiple_domains ((OAuth1AuthorizerData*) data, user_data); - - /* Set up the main loop */ - data->main_loop = g_main_loop_new (NULL, FALSE); -} - -static void -tear_down_oauth1_authorizer_async_data (OAuth1AuthorizerAsyncData *data, gconstpointer user_data) -{ - g_main_loop_unref (data->main_loop); - - /* Chain up */ - tear_down_oauth1_authorizer_data ((OAuth1AuthorizerData*) data, user_data); -} - -static void -test_oauth1_authorizer_request_authentication_uri_async_cb (GDataOAuth1Authorizer *authorizer, GAsyncResult *async_result, - OAuth1AuthorizerAsyncData *data) -{ - gchar *authentication_uri, *token, *token_secret; - GError *error = NULL; - - authentication_uri = gdata_oauth1_authorizer_request_authentication_uri_finish (authorizer, async_result, &token, &token_secret, &error); -#ifdef ENABLE_OAUTH1 - g_assert_no_error (error); - g_assert (authentication_uri != NULL && *authentication_uri != '\0'); - g_assert (token != NULL && *token != '\0'); - g_assert (token_secret != NULL && *token_secret != '\0'); - g_clear_error (&error); - - g_test_message ("Requesting an authentication URI asynchronously gave “%s” with request token “%s” and request token secret “%s”.", - authentication_uri, token, token_secret); - - g_free (authentication_uri); - g_free (token); - g_free (token_secret); -#else - g_assert_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_UNAVAILABLE); - g_assert_null (authentication_uri); - g_clear_error (&error); -#endif - - g_main_loop_quit (data->main_loop); -} - -/* Test that asynchronously requesting an authentication URI for a single authorization domain works */ -static void -test_oauth1_authorizer_request_authentication_uri_async (OAuth1AuthorizerAsyncData *data, gconstpointer user_data) -{ - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authentication-uri-async"); - - /* Create a main loop and request an authentication URI */ - gdata_oauth1_authorizer_request_authentication_uri_async (data->parent.authorizer, NULL, - (GAsyncReadyCallback) test_oauth1_authorizer_request_authentication_uri_async_cb, - data); - - g_main_loop_run (data->main_loop); - - uhm_server_end_trace (mock_server); -} - -static void -test_oauth1_authorizer_request_authentication_uri_async_cancellation_cb (GDataOAuth1Authorizer *authorizer, GAsyncResult *async_result, - OAuth1AuthorizerAsyncData *data) -{ - /* Initialise token and token_secret so we check that gdata_oauth1_authorizer_request_authentication_uri_finish() NULLifies them on error */ - gchar *authentication_uri, *token = (gchar*) "error", *token_secret = (gchar*) "error"; - GError *error = NULL; - - authentication_uri = gdata_oauth1_authorizer_request_authentication_uri_finish (authorizer, async_result, &token, &token_secret, &error); - g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED); - g_assert (authentication_uri == NULL); - g_assert (token == NULL); - g_assert (token_secret == NULL); - g_clear_error (&error); - - g_free (authentication_uri); - g_free (token); - g_free (token_secret); - - g_main_loop_quit (data->main_loop); -} - -/* Test that cancellation of asynchronous authentication URI requests work */ -static void -test_oauth1_authorizer_request_authentication_uri_async_cancellation (OAuth1AuthorizerAsyncData *data, gconstpointer user_data) -{ - GCancellable *cancellable; - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authentication-uri-async-cancellation"); - - /* Set up the cancellable */ - cancellable = g_cancellable_new (); - - /* Create a main loop and request an authentication URI */ - gdata_oauth1_authorizer_request_authentication_uri_async (data->parent.authorizer, cancellable, - (GAsyncReadyCallback) - test_oauth1_authorizer_request_authentication_uri_async_cancellation_cb, - data); - g_cancellable_cancel (cancellable); - - g_main_loop_run (data->main_loop); - - g_object_unref (cancellable); - - uhm_server_end_trace (mock_server); -} - -typedef struct { - OAuth1AuthorizerData parent; - gchar *token; - gchar *token_secret; - gchar *verifier; -} OAuth1AuthorizerInteractiveData; - -/* NOTE: Any consumer of this data has to check for (data->verifier == NULL) and skip the test in that case */ -static void -set_up_oauth1_authorizer_interactive_data (OAuth1AuthorizerInteractiveData *data, gconstpointer user_data) -{ - gchar *authentication_uri; - - /* Chain up */ - set_up_oauth1_authorizer_data ((OAuth1AuthorizerData*) data, user_data); - - gdata_test_mock_server_start_trace (mock_server, "setup-oauth1-authorizer-interactive-data"); - - /* Get an authentication URI */ - authentication_uri = gdata_oauth1_authorizer_request_authentication_uri (data->parent.authorizer, &(data->token), &(data->token_secret), - NULL, NULL); - g_assert (authentication_uri != NULL); - - /* Wait for the user to retrieve and enter the verifier */ - data->verifier = gdata_test_query_user_for_verifier (authentication_uri); - - g_free (authentication_uri); - - uhm_server_end_trace (mock_server); -} - -#ifdef ENABLE_OAUTH1 -static void -set_up_oauth1_authorizer_interactive_data_bad_credentials (OAuth1AuthorizerInteractiveData *data, gconstpointer user_data) -{ - gchar *authentication_uri; - - /* Chain up */ - set_up_oauth1_authorizer_data ((OAuth1AuthorizerData*) data, user_data); - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-interactive-data-bad-credentials"); - - /* Get an authentication URI */ - authentication_uri = gdata_oauth1_authorizer_request_authentication_uri (data->parent.authorizer, &(data->token), &(data->token_secret), - NULL, NULL); - g_assert (authentication_uri != NULL); - - /* Give a bogus verifier */ - data->verifier = g_strdup ("test"); - - g_free (authentication_uri); - - uhm_server_end_trace (mock_server); -} -#endif /* ENABLE_OAUTH1 */ - -static void -tear_down_oauth1_authorizer_interactive_data (OAuth1AuthorizerInteractiveData *data, gconstpointer user_data) -{ - g_free (data->token); - g_free (data->token_secret); - g_free (data->verifier); - - /* Chain up */ - tear_down_oauth1_authorizer_data ((OAuth1AuthorizerData*) data, user_data); -} - -/* Test that synchronously authorizing a request token is successful. Note that this test has to be interactive, as the user has to visit the - * authentication URI to retrieve a verifier for the request token. */ -static void -test_oauth1_authorizer_request_authorization_sync (OAuth1AuthorizerInteractiveData *data, gconstpointer user_data) -{ - gboolean success; - GError *error = NULL; - - /* Skip the test if the user's requested */ - if (data->verifier == NULL) { - return; - } - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authorization-sync"); - - /* Check we're not authorised beforehand */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - /* Test that authorising the token retrieved previously is successful */ - success = gdata_oauth1_authorizer_request_authorization (data->parent.authorizer, data->token, data->token_secret, data->verifier, NULL, - &error); - g_assert_no_error (error); - g_assert (success == TRUE); - g_clear_error (&error); - - /* Are we authorised now? */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == TRUE); - - uhm_server_end_trace (mock_server); -} - -#ifdef ENABLE_OAUTH1 -/* Test that synchronously authorizing a request token fails if an invalid verifier is provided. */ -static void -test_oauth1_authorizer_request_authorization_sync_bad_credentials (OAuth1AuthorizerInteractiveData *data, gconstpointer user_data) -{ - gboolean success; - GError *error = NULL; - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authorization-sync-bad-credentials"); - - /* Check we're not authorised beforehand */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - /* Test that authorising the token retrieved above fails */ - success = gdata_oauth1_authorizer_request_authorization (data->parent.authorizer, data->token, data->token_secret, data->verifier, NULL, - &error); - g_assert_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_FORBIDDEN); - g_assert (success == FALSE); - g_clear_error (&error); - - /* Are we authorised now? */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - uhm_server_end_trace (mock_server); -} -#endif /* ENABLE_OAUTH1 */ - -/* Test that cancellation of synchronously authorizing a request token works. Note that this test has to be interactive, as the user has to visit the - * authentication URI to retrieve a verifier for the request token. */ -static void -test_oauth1_authorizer_request_authorization_sync_cancellation (OAuth1AuthorizerInteractiveData *data, gconstpointer user_data) -{ - gboolean success; - GCancellable *cancellable; - GError *error = NULL; - - /* Skip the test if the user's requested */ - if (data->verifier == NULL) { - return; - } - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authorization-sync-cancellation"); - - /* Check we're not authorised beforehand */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - /* Create the cancellable */ - cancellable = g_cancellable_new (); - - /* Test that authorising the token retrieved above is successful */ - g_cancellable_cancel (cancellable); - success = gdata_oauth1_authorizer_request_authorization (data->parent.authorizer, data->token, data->token_secret, data->verifier, - cancellable, &error); - g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED); - g_assert (success == FALSE); - g_clear_error (&error); - - /* Are we authorised now? */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - g_object_unref (cancellable); - - uhm_server_end_trace (mock_server); -} - -typedef struct { - OAuth1AuthorizerInteractiveData parent; - GMainLoop *main_loop; -} OAuth1AuthorizerInteractiveAsyncData; - -/* NOTE: Any consumer of this data has to check for (data->verifier == NULL) and skip the test in that case */ -static void -set_up_oauth1_authorizer_interactive_async_data (OAuth1AuthorizerInteractiveAsyncData *data, gconstpointer user_data) -{ - /* Chain up */ - set_up_oauth1_authorizer_interactive_data ((OAuth1AuthorizerInteractiveData*) data, user_data); - - /* Set up the main loop */ - data->main_loop = g_main_loop_new (NULL, FALSE); -} - -#ifdef ENABLE_OAUTH1 -static void -set_up_oauth1_authorizer_interactive_async_data_bad_credentials (OAuth1AuthorizerInteractiveAsyncData *data, gconstpointer user_data) -{ - /* Chain up */ - set_up_oauth1_authorizer_interactive_data_bad_credentials ((OAuth1AuthorizerInteractiveData*) data, user_data); - - /* Set up the main loop */ - data->main_loop = g_main_loop_new (NULL, FALSE); -} -#endif /* ENABLE_OAUTH1 */ - -static void -tear_down_oauth1_authorizer_interactive_async_data (OAuth1AuthorizerInteractiveAsyncData *data, gconstpointer user_data) -{ - g_main_loop_unref (data->main_loop); - - /* Chain up */ - tear_down_oauth1_authorizer_interactive_data ((OAuth1AuthorizerInteractiveData*) data, user_data); -} - -static void -test_oauth1_authorizer_request_authorization_async_cb (GDataOAuth1Authorizer *authorizer, GAsyncResult *async_result, - OAuth1AuthorizerInteractiveAsyncData *data) -{ - gboolean success; - GError *error = NULL; - - success = gdata_oauth1_authorizer_request_authorization_finish (authorizer, async_result, &error); - g_assert_no_error (error); - g_assert (success == TRUE); - g_clear_error (&error); - - /* Are we authorised now? */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == TRUE); - - g_main_loop_quit (data->main_loop); -} - -/* Test that asynchronously authorizing a request token works. Note that this test has to be interactive, as the user has to visit the - * authentication URI to retrieve a verifier for the request token. */ -static void -test_oauth1_authorizer_request_authorization_async (OAuth1AuthorizerInteractiveAsyncData *data, gconstpointer user_data) -{ - /* Skip the test if the user's requested */ - if (data->parent.verifier == NULL) { - return; - } - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authorization-async"); - - /* Check we're not authorised beforehand */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.parent.authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - /* Create a main loop and request authorization */ - gdata_oauth1_authorizer_request_authorization_async (data->parent.parent.authorizer, data->parent.token, data->parent.token_secret, - data->parent.verifier, NULL, - (GAsyncReadyCallback) test_oauth1_authorizer_request_authorization_async_cb, data); - - g_main_loop_run (data->main_loop); - - uhm_server_end_trace (mock_server); -} - -#ifdef ENABLE_OAUTH1 -static void -test_oauth1_authorizer_request_authorization_async_bad_credentials_cb (GDataOAuth1Authorizer *authorizer, GAsyncResult *async_result, - OAuth1AuthorizerInteractiveAsyncData *data) -{ - gboolean success; - GError *error = NULL; - - success = gdata_oauth1_authorizer_request_authorization_finish (authorizer, async_result, &error); - g_assert_error (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_FORBIDDEN); - g_assert (success == FALSE); - g_clear_error (&error); - - /* Are we authorised now? */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - g_main_loop_quit (data->main_loop); -} - -/* Test that asynchronously authorizing a request token fails if an invalid verifier is provided. */ -static void -test_oauth1_authorizer_request_authorization_async_bad_credentials (OAuth1AuthorizerInteractiveAsyncData *data, gconstpointer user_data) -{ - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authorization-async-bad-credentials"); - - /* Check we're not authorised beforehand */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.parent.authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - /* Create a main loop and request authorization */ - gdata_oauth1_authorizer_request_authorization_async (data->parent.parent.authorizer, data->parent.token, data->parent.token_secret, - data->parent.verifier, NULL, - (GAsyncReadyCallback) - test_oauth1_authorizer_request_authorization_async_bad_credentials_cb, - data); - - g_main_loop_run (data->main_loop); - - uhm_server_end_trace (mock_server); -} -#endif /* ENABLE_OAUTH1 */ - -static void -test_oauth1_authorizer_request_authorization_async_cancellation_cb (GDataOAuth1Authorizer *authorizer, GAsyncResult *async_result, - OAuth1AuthorizerInteractiveAsyncData *data) -{ - gboolean success; - GError *error = NULL; - - success = gdata_oauth1_authorizer_request_authorization_finish (authorizer, async_result, &error); - g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED); - g_assert (success == FALSE); - g_clear_error (&error); - - /* Are we authorised now? */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - g_main_loop_quit (data->main_loop); -} - -/* Test that cancelling asynchronously authorizing a request token works. Note that this test has to be interactive, as the user has to visit the - * authentication URI to retrieve a verifier for the request token. */ -static void -test_oauth1_authorizer_request_authorization_async_cancellation (OAuth1AuthorizerInteractiveAsyncData *data, gconstpointer user_data) -{ - GCancellable *cancellable; - - /* Skip the test if the user's requested */ - if (data->parent.verifier == NULL) { - return; - } - - gdata_test_mock_server_start_trace (mock_server, "oauth1-authorizer-request-authorization-async-cancellation"); - - /* Check we're not authorised beforehand */ - g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.parent.authorizer), - gdata_contacts_service_get_primary_authorization_domain ()) == FALSE); - - /* Create the cancellable */ - cancellable = g_cancellable_new (); - - /* Create a main loop and request authorization */ - gdata_oauth1_authorizer_request_authorization_async (data->parent.parent.authorizer, data->parent.token, data->parent.token_secret, - data->parent.verifier, cancellable, - (GAsyncReadyCallback) test_oauth1_authorizer_request_authorization_async_cancellation_cb, - data); - g_cancellable_cancel (cancellable); - - g_main_loop_run (data->main_loop); - - g_object_unref (cancellable); - - uhm_server_end_trace (mock_server); -} - -static void -mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer user_data) -{ - UhmServer *server; - UhmResolver *resolver; - - server = UHM_SERVER (object); - - /* Set up the expected domain names here. This should technically be split up between - * the different unit test suites, but that's too much effort. */ - resolver = uhm_server_get_resolver (server); - - if (resolver != NULL) { - const gchar *ip_address = uhm_server_get_address (server); - - uhm_resolver_add_A (resolver, "www.google.com", ip_address); - } -} - -int -main (int argc, char *argv[]) -{ - GFile *trace_directory; - gchar *path = NULL; - - gdata_test_init (argc, argv); - - mock_server = gdata_test_get_mock_server (); - g_signal_connect (G_OBJECT (mock_server), "notify::resolver", (GCallback) mock_server_notify_resolver_cb, NULL); - path = g_test_build_filename (G_TEST_DIST, "traces/oauth1-authorizer", NULL); - trace_directory = g_file_new_for_path (path); - g_free (path); - uhm_server_set_trace_directory (mock_server, trace_directory); - g_object_unref (trace_directory); - - main_thread = g_thread_self (); - - g_test_add_func ("/oauth1-authorizer/constructor", test_oauth1_authorizer_constructor); - g_test_add_func ("/oauth1-authorizer/constructor/for-domains", test_oauth1_authorizer_constructor_for_domains); - - g_test_add ("/oauth1-authorizer/properties/application-name", OAuth1AuthorizerData, NULL, set_up_oauth1_authorizer_data, - test_oauth1_authorizer_properties_application_name, tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/properties/application-name/fallback", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data_fallback_application_name, test_oauth1_authorizer_properties_application_name_fallback, - tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/properties/locale", OAuth1AuthorizerData, NULL, set_up_oauth1_authorizer_data, - test_oauth1_authorizer_properties_locale, tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/properties/proxy-resolver", OAuth1AuthorizerData, NULL, set_up_oauth1_authorizer_data, - test_oauth1_authorizer_properties_proxy_resolver, tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/properties/timeout", OAuth1AuthorizerData, NULL, set_up_oauth1_authorizer_data, - test_oauth1_authorizer_properties_timeout, tear_down_oauth1_authorizer_data); - - g_test_add ("/oauth1-authorizer/refresh-authorization/unauthenticated", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data, test_oauth1_authorizer_refresh_authorization, tear_down_oauth1_authorizer_data); - - g_test_add ("/oauth1-authorizer/process-request/null", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data, test_oauth1_authorizer_process_request_null, tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/process-request/unauthenticated", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data, test_oauth1_authorizer_process_request_unauthenticated, tear_down_oauth1_authorizer_data); - - /* Sync request-authentication-uri tests */ - g_test_add ("/oauth1-authorizer/request-authentication-uri/sync", OAuth1AuthorizerData, NULL, set_up_oauth1_authorizer_data, - test_oauth1_authorizer_request_authentication_uri_sync, tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data_multiple_domains, test_oauth1_authorizer_request_authentication_uri_sync, - tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/locale", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data_locale, test_oauth1_authorizer_request_authentication_uri_sync, - tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/cancellation", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data, test_oauth1_authorizer_request_authentication_uri_sync_cancellation, - tear_down_oauth1_authorizer_data); - - /* Async request-authentication-uri tests */ - g_test_add ("/oauth1-authorizer/request-authentication-uri/async", OAuth1AuthorizerAsyncData, NULL, - set_up_oauth1_authorizer_async_data, test_oauth1_authorizer_request_authentication_uri_async, - tear_down_oauth1_authorizer_async_data); - g_test_add ("/oauth1-authorizer/request-authentication-uri/async/multiple-domains", OAuth1AuthorizerAsyncData, NULL, - set_up_oauth1_authorizer_async_data_multiple_domains, test_oauth1_authorizer_request_authentication_uri_async, - tear_down_oauth1_authorizer_async_data); - g_test_add ("/oauth1-authorizer/request-authentication-uri/async/cancellation", OAuth1AuthorizerAsyncData, NULL, - set_up_oauth1_authorizer_async_data, test_oauth1_authorizer_request_authentication_uri_async_cancellation, - tear_down_oauth1_authorizer_async_data); - - /* Sync request-authorization tests */ - if (gdata_test_interactive () == TRUE) { - g_test_add ("/oauth1-authorizer/request-authorization/sync", OAuth1AuthorizerInteractiveData, NULL, - set_up_oauth1_authorizer_interactive_data, test_oauth1_authorizer_request_authorization_sync, - tear_down_oauth1_authorizer_interactive_data); - g_test_add ("/oauth1-authorizer/request-authorization/sync/cancellation", OAuth1AuthorizerInteractiveData, NULL, - set_up_oauth1_authorizer_interactive_data, test_oauth1_authorizer_request_authorization_sync_cancellation, - tear_down_oauth1_authorizer_interactive_data); - } - -#ifdef ENABLE_OAUTH1 - g_test_add ("/oauth1-authorizer/request-authorization/sync/bad-credentials", OAuth1AuthorizerInteractiveData, NULL, - set_up_oauth1_authorizer_interactive_data_bad_credentials, - test_oauth1_authorizer_request_authorization_sync_bad_credentials, tear_down_oauth1_authorizer_interactive_data); -#endif - - /* Async request-authorization tests */ - if (gdata_test_interactive () == TRUE) { - g_test_add ("/oauth1-authorizer/request-authorization/async", OAuth1AuthorizerInteractiveAsyncData, NULL, - set_up_oauth1_authorizer_interactive_async_data, test_oauth1_authorizer_request_authorization_async, - tear_down_oauth1_authorizer_interactive_async_data); - g_test_add ("/oauth1-authorizer/request-authorization/async/cancellation", OAuth1AuthorizerInteractiveAsyncData, NULL, - set_up_oauth1_authorizer_interactive_async_data, test_oauth1_authorizer_request_authorization_async_cancellation, - tear_down_oauth1_authorizer_interactive_async_data); - } - -#ifdef ENABLE_OAUTH1 - g_test_add ("/oauth1-authorizer/request-authorization/async/bad-credentials", OAuth1AuthorizerInteractiveAsyncData, NULL, - set_up_oauth1_authorizer_interactive_async_data_bad_credentials, - test_oauth1_authorizer_request_authorization_async_bad_credentials, tear_down_oauth1_authorizer_interactive_async_data); -#endif - - /* Miscellaneous tests */ - if (gdata_test_interactive () == TRUE) { - gboolean skip_test = FALSE; - - g_test_add ("/oauth1-authorizer/refresh-authorization/authenticated", OAuth1AuthorizerData, &skip_test, - set_up_oauth1_authorizer_data_authenticated, test_oauth1_authorizer_refresh_authorization, - tear_down_oauth1_authorizer_data); - - g_test_add ("/oauth1-authorizer/process-request/authenticated", OAuth1AuthorizerData, &skip_test, - set_up_oauth1_authorizer_data_authenticated, test_oauth1_authorizer_process_request_authenticated, - tear_down_oauth1_authorizer_data); - } - - return g_test_run (); -} - -G_GNUC_END_IGNORE_DEPRECATIONS diff --git a/gdata/tests/picasaweb.c b/gdata/tests/picasaweb.c index 19978e3c..b218aa7f 100644 --- a/gdata/tests/picasaweb.c +++ b/gdata/tests/picasaweb.c @@ -2074,7 +2074,7 @@ mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer use } /* Set up a global GDataAuthorizer to be used for all the tests. Unfortunately, - * the Google PicasaWeb API is limited to OAuth1 and OAuth2 authorisation, so + * the Google PicasaWeb API is limited to OAuth2 authorisation, so * this requires user interaction when online. * * If not online, use a dummy authoriser. */ diff --git a/gdata/tests/tasks.c b/gdata/tests/tasks.c index 6f3073ad..9ea0ed27 100644 --- a/gdata/tests/tasks.c +++ b/gdata/tests/tasks.c @@ -1303,7 +1303,7 @@ mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, } /* Set up a global GDataAuthorizer to be used for all the tests. Unfortunately, - * the Google Tasks API is limited to OAuth1 and OAuth2 authorisation, so this + * the Google Tasks API is limited to OAuth2 authorisation, so this * requires user interaction when online. * * If not online, use a dummy authoriser. */ diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-interactive-data-bad-credentials b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-interactive-data-bad-credentials deleted file mode 100644 index 5187564a..00000000 --- a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-interactive-data-bad-credentials +++ /dev/null @@ -1,25 +0,0 @@ -> POST /accounts/OAuthGetRequestToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114467 -> Soup-Debug: SoupSession 1 (0x6502c0), SoupMessage 1 (0x9750e0), SoupSocket 1 (0x9933b0) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_signature_method="HMAC-SHA1",oauth_signature="N7FRU%2BJKa4kkjlUpzlGAHSxPUqg%3D",oauth_timestamp="1375114466",oauth_nonce="JKLrpVu2KW9WiZwsbko1MHtRh",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> xoauth%5Fdisplayname=Application+name&scope=https%3A%2F%2Fwww%2Egoogle%2Ecom%2Fm8%2Ffeeds%2F&oauth%5Fcallback=oob - -< HTTP/1.1 200 OK -< Soup-Debug-Timestamp: 1375114467 -< Soup-Debug: SoupMessage 1 (0x9750e0) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:14:27 GMT -< Expires: Mon, 29 Jul 2013 16:14:27 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 118 -< Server: GSE -< -< oauth_token=4%2FcPV6prKvQtxeeXkhgI1iJ6nLQbCX&oauth_token_secret=BdUGkbnkl6_UTaa0I2049cxp&oauth_callback_confirmed=true - diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-refresh-authorization b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-refresh-authorization deleted file mode 100644 index e69de29b..00000000 diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-async b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-async deleted file mode 100644 index 282d8df2..00000000 --- a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-async +++ /dev/null @@ -1,25 +0,0 @@ -> POST /accounts/OAuthGetRequestToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114409 -> Soup-Debug: SoupSession 1 (0x650700), SoupMessage 1 (0x7fffe0012c60), SoupSocket 1 (0x7fffe0026d30) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_signature_method="HMAC-SHA1",oauth_signature="EKMKB4gUkr5rUEeps37CrSS7iWI%3D",oauth_timestamp="1375114409",oauth_nonce="IFERKYPbzEzuA3QE_Zgw1moU1ZR",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> xoauth%5Fdisplayname=Application+name&scope=https%3A%2F%2Fwww%2Egoogle%2Ecom%2Fm8%2Ffeeds%2F+http%3A%2F%2Fpicasaweb%2Egoogle%2Ecom%2Fdata%2F&oauth%5Fcallback=oob - -< HTTP/1.1 200 OK -< Soup-Debug-Timestamp: 1375114409 -< Soup-Debug: SoupMessage 1 (0x7fffe0012c60) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:13:29 GMT -< Expires: Mon, 29 Jul 2013 16:13:29 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 118 -< Server: GSE -< -< oauth_token=4%2FRzdH5fU5KLdaoDTqznYQlkMez4Wj&oauth_token_secret=GYkwQ3BIHviff69Y9Zld6g2u&oauth_callback_confirmed=true - diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-async-cancellation b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-async-cancellation deleted file mode 100644 index e69de29b..00000000 diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-sync b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-sync deleted file mode 100644 index 6a454463..00000000 --- a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-sync +++ /dev/null @@ -1,25 +0,0 @@ -> POST /accounts/OAuthGetRequestToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114409 -> Soup-Debug: SoupSession 1 (0x6505f0), SoupMessage 1 (0x975590), SoupSocket 1 (0x993530) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_signature_method="HMAC-SHA1",oauth_signature="tfOHmtfJ3fBhyQK9pvma4kx6OlM%3D",oauth_timestamp="1375114409",oauth_nonce="X4sZD_njIKcgSr6paHPVByY8LOjFA",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> xoauth%5Fdisplayname=Application+name&scope=https%3A%2F%2Fwww%2Egoogle%2Ecom%2Fm8%2Ffeeds%2F&oauth%5Fcallback=oob - -< HTTP/1.1 200 OK -< Soup-Debug-Timestamp: 1375114409 -< Soup-Debug: SoupMessage 1 (0x975590) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:13:29 GMT -< Expires: Mon, 29 Jul 2013 16:13:29 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 118 -< Server: GSE -< -< oauth_token=4%2F12bPxj_QaPxom9ALAmIMn5-ZU3wR&oauth_token_secret=Kiuy8Zz-8SzZJ8jQU_83nk9w&oauth_callback_confirmed=true - diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-sync-cancellation b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authentication-uri-sync-cancellation deleted file mode 100644 index e69de29b..00000000 diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async deleted file mode 100644 index d9ba4aee..00000000 --- a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async +++ /dev/null @@ -1,25 +0,0 @@ -> POST /accounts/OAuthGetAccessToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114434 -> Soup-Debug: SoupSession 1 (0x6503d0), SoupMessage 2 (0x7fffe0012e40), SoupSocket 2 (0x7fffe0026df0) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_token="4%2FfV2Y0aq-WjEgiSDxvVQdNqQZvX8l",oauth_signature_method="HMAC-SHA1",oauth_signature="8Px9eqo%2BkXJdZg5ufcmTGXNGHGw%3D",oauth_timestamp="1375114434",oauth_nonce="_bRhTyvvq372wr_XjB4WPWl0qt2Uq",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> oauth%5Fverifier=ks5YXkMmIT1KT4%2DG1IdRW8zH - -< HTTP/1.1 200 OK -< Soup-Debug-Timestamp: 1375114434 -< Soup-Debug: SoupMessage 2 (0x7fffe0012e40) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:13:54 GMT -< Expires: Mon, 29 Jul 2013 16:13:54 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 103 -< Server: GSE -< -< oauth_token=1%2FvMhevC5FJZeYIy87nMSvAaIoxJRDfq9MRuuYL_ASuIc&oauth_token_secret=ALKifRvO9cC4rQL43CygXqcE - diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async-bad-credentials b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async-bad-credentials deleted file mode 100644 index 492fc92b..00000000 --- a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async-bad-credentials +++ /dev/null @@ -1,26 +0,0 @@ -> POST /accounts/OAuthGetAccessToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114467 -> Soup-Debug: SoupSession 1 (0x6502c0), SoupMessage 2 (0x7fffe40108c0), SoupSocket 2 (0x7fffe0026eb0) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_token="4%2FcPV6prKvQtxeeXkhgI1iJ6nLQbCX",oauth_signature_method="HMAC-SHA1",oauth_signature="rtly12Qq%2FK30HSglMmLqwZVCpMM%3D",oauth_timestamp="1375114467",oauth_nonce="qBZpBSAZauOCA8vEqy5zOQBZcAS",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> oauth%5Fverifier=test - -< HTTP/1.1 400 Bad Request -< Soup-Debug-Timestamp: 1375114475 -< Soup-Debug: SoupMessage 2 (0x7fffe40108c0) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:14:35 GMT -< Expires: Mon, 29 Jul 2013 16:14:35 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 23 -< Server: GSE -< -< The token is invalid. -< - diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async-cancellation b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-async-cancellation deleted file mode 100644 index e69de29b..00000000 diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync deleted file mode 100644 index 7fdfe8c4..00000000 --- a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync +++ /dev/null @@ -1,25 +0,0 @@ -> POST /accounts/OAuthGetAccessToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114421 -> Soup-Debug: SoupSession 1 (0x6504e0), SoupMessage 2 (0x9753b0), SoupSocket 2 (0x993470) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_token="4%2FT27iiKNpM8PHQ2ztKzZBywZ2uKnO",oauth_signature_method="HMAC-SHA1",oauth_signature="gZChlEpXlBLy8bYjktVEfRh4XhA%3D",oauth_timestamp="1375114421",oauth_nonce="W8iIqbvygOUYCkuQdp",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> oauth%5Fverifier=7MQzdhPyajVrbVUBnaQRgj73 - -< HTTP/1.1 200 OK -< Soup-Debug-Timestamp: 1375114422 -< Soup-Debug: SoupMessage 2 (0x9753b0) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:13:41 GMT -< Expires: Mon, 29 Jul 2013 16:13:41 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 103 -< Server: GSE -< -< oauth_token=1%2FkJjrwN7c2Vzx387AQP2jL3BYQHXssRU0w3XeZq4H2Mw&oauth_token_secret=98SsHIgW-Sn8Ix0Klk3wv4oy - diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync-bad-credentials b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync-bad-credentials deleted file mode 100644 index 8809a967..00000000 --- a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync-bad-credentials +++ /dev/null @@ -1,26 +0,0 @@ -> POST /accounts/OAuthGetAccessToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114446 -> Soup-Debug: SoupSession 1 (0x6501b0), SoupMessage 2 (0x9751d0), SoupSocket 2 (0x993230) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_token="4%2FlydzQSwq7wb73eJbj197qsgNP5Kr",oauth_signature_method="HMAC-SHA1",oauth_signature="hQRNpZi3kAzkGA1sa84EjobE%2BsU%3D",oauth_timestamp="1375114446",oauth_nonce="mqbX8TahJGtxkoP3oX_73qzA",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> oauth%5Fverifier=test - -< HTTP/1.1 400 Bad Request -< Soup-Debug-Timestamp: 1375114453 -< Soup-Debug: SoupMessage 2 (0x9751d0) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:14:13 GMT -< Expires: Mon, 29 Jul 2013 16:14:13 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 23 -< Server: GSE -< -< The token is invalid. -< - diff --git a/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync-cancellation b/gdata/tests/traces/oauth1-authorizer/oauth1-authorizer-request-authorization-sync-cancellation deleted file mode 100644 index e69de29b..00000000 diff --git a/gdata/tests/traces/oauth1-authorizer/setup-oauth1-authorizer-data-authenticated b/gdata/tests/traces/oauth1-authorizer/setup-oauth1-authorizer-data-authenticated deleted file mode 100644 index 1710b251..00000000 --- a/gdata/tests/traces/oauth1-authorizer/setup-oauth1-authorizer-data-authenticated +++ /dev/null @@ -1,50 +0,0 @@ -> POST /accounts/OAuthGetRequestToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114396 -> Soup-Debug: SoupSession 1 (0x6501b0), SoupMessage 1 (0x975590), SoupSocket 1 (0x993230) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_signature_method="HMAC-SHA1",oauth_signature="VfeOs%2BWTIJRUkCErU1zxKqH38oQ%3D",oauth_timestamp="1375114396",oauth_nonce="9VmUWSVrJu_zhF2cwFRdWrZFl8WUGy",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> xoauth%5Fdisplayname=Application+name&scope=https%3A%2F%2Fwww%2Egoogle%2Ecom%2Fm8%2Ffeeds%2F&oauth%5Fcallback=oob - -< HTTP/1.1 200 OK -< Soup-Debug-Timestamp: 1375114396 -< Soup-Debug: SoupMessage 1 (0x975590) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:13:16 GMT -< Expires: Mon, 29 Jul 2013 16:13:16 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 118 -< Server: GSE -< -< oauth_token=4%2F-hFowsVMagtdWjX8hTFUGw0de9nL&oauth_token_secret=kuu2KlszmJhimCI8C7uNbV6z&oauth_callback_confirmed=true - -> POST /accounts/OAuthGetAccessToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114407 -> Soup-Debug: SoupSession 1 (0x6501b0), SoupMessage 2 (0x9752c0), SoupSocket 2 (0x9932f0) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_token="4%2F-hFowsVMagtdWjX8hTFUGw0de9nL",oauth_signature_method="HMAC-SHA1",oauth_signature="lWSS%2BTKHABoDsZuVU6LFxVgBrsM%3D",oauth_timestamp="1375114407",oauth_nonce="P1LCHSMETyO0IpQnTCVc",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> oauth%5Fverifier=qT64ktZBdmUVwpRClZmO6s7j - -< HTTP/1.1 200 OK -< Soup-Debug-Timestamp: 1375114408 -< Soup-Debug: SoupMessage 2 (0x9752c0) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:13:28 GMT -< Expires: Mon, 29 Jul 2013 16:13:28 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 103 -< Server: GSE -< -< oauth_token=1%2F17nuamcqEOCaMMCg9Oc9ekcfGEzkepP5_5ANtDkuwks&oauth_token_secret=wUozdZTGrBPaGKTEB9lfK61J - diff --git a/gdata/tests/traces/oauth1-authorizer/setup-oauth1-authorizer-interactive-data b/gdata/tests/traces/oauth1-authorizer/setup-oauth1-authorizer-interactive-data deleted file mode 100644 index 7731e22f..00000000 --- a/gdata/tests/traces/oauth1-authorizer/setup-oauth1-authorizer-interactive-data +++ /dev/null @@ -1,25 +0,0 @@ -> POST /accounts/OAuthGetRequestToken HTTP/1.1 -> Soup-Debug-Timestamp: 1375114454 -> Soup-Debug: SoupSession 1 (0x6501b0), SoupMessage 1 (0x9750e0), SoupSocket 1 (0x993230) -> Host: www.google.com -> Content-Type: application/x-www-form-urlencoded -> Authorization: OAuth oauth_consumer_key="anonymous",oauth_signature_method="HMAC-SHA1",oauth_signature="c%2FBP0C511rwGZYAGnXlXTzh5uno%3D",oauth_timestamp="1375114453",oauth_nonce="ppVVbibizHKVmJHDNHHjdc",oauth_version="1.0" -> Accept-Encoding: gzip, deflate -> Connection: Keep-Alive -> -> xoauth%5Fdisplayname=Application+name&scope=https%3A%2F%2Fwww%2Egoogle%2Ecom%2Fm8%2Ffeeds%2F&oauth%5Fcallback=oob - -< HTTP/1.1 200 OK -< Soup-Debug-Timestamp: 1375114454 -< Soup-Debug: SoupMessage 1 (0x9750e0) -< Content-Type: text/plain; charset=UTF-8 -< Date: Mon, 29 Jul 2013 16:14:14 GMT -< Expires: Mon, 29 Jul 2013 16:14:14 GMT -< Cache-Control: private, max-age=0 -< X-Content-Type-Options: nosniff -< X-XSS-Protection: 1; mode=block -< Content-Length: 118 -< Server: GSE -< -< oauth_token=4%2F-OewZRiOoq_qWvwTpTMIsvNEqMaU&oauth_token_secret=NF1c22V04ZV6SLLLnCG4w7Ue&oauth_callback_confirmed=true - diff --git a/meson.build b/meson.build index a5ec8ef3..5021f380 100644 --- a/meson.build +++ b/meson.build @@ -93,13 +93,6 @@ gdata_private_deps = [ dependency('gthread-2.0'), ] -oauth_dep = dependency('oauth', version: '>= 0.9.4', required: get_option('oauth1')) -enable_oauth1 = oauth_dep.found() -if enable_oauth1 - gdata_private_deps += oauth_dep -endif -config_h.set('ENABLE_OAUTH1', enable_oauth1) - libsoup_dep = dependency('libsoup-2.4', version: '>= 2.42.0') gdata_deps += libsoup_dep # libsoup 2.47.3 is needed for the new SoupServer API; but it contained a bug in diff --git a/meson_options.txt b/meson_options.txt index 19bfd95c..73565981 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -13,11 +13,6 @@ option('goa', value: 'enabled', description: 'enable Gnome Online Accounts (goa) support') -option('oauth1', - type: 'feature', - value: 'disabled', - description: 'enable OAuth 1.0 support (deprecated)') - option('always_build_tests', type: 'boolean', value: true, diff --git a/po/POTFILES.in b/po/POTFILES.in index 2e259b41..160a57ee 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,7 +7,6 @@ gdata/gdata-commentable.c gdata/gdata-download-stream.c gdata/gdata-entry.c gdata/gdata-feed.c -gdata/gdata-oauth1-authorizer.c gdata/gdata-oauth2-authorizer.c gdata/gdata-parsable.c gdata/gdata-parser.c -- cgit v1.2.1