Attachment 105914 Details for Bug 83396 – simplify oauth2 backend config

[patch] simplify oauth2 backend config

0009-oauth2-use-simpler-username-syntax.patch (text/plain), 5.23 KB, created by Patrick Ohly on 2014-09-08 18:49:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Ohly

Created: 2014-09-08 18:49:43 UTC

Size: 5.23 KB

patch

obsolete

>From bd56683bd91de0643c95d5ff044a486bc86ac7a8 Mon Sep 17 00:00:00 2001
>From: Patrick Ohly <patrick.ohly@intel.com>
>Date: Mon, 8 Sep 2014 16:59:29 +0200
>Subject: [PATCH 09/10] oauth2: use simpler username syntax
>
>All the values in the username hash are strings. This is unlikely to
>change and if it does, we can always do some string-to-value
>conversion in our own code. Therefore use the simpler syntax without
>the angle brackets marking a variant value.
>
>Simplifies our C++ code, too, and now also compiles on Ubuntu Trusty
>(which doesn't have a recent enough glib for G_VARIANT_TYPE_VARDICT).
>---
> src/backends/oauth2/README     |  2 +-
> src/backends/oauth2/oauth2.cpp | 38 +++++++++++++-------------------------
> 2 files changed, 14 insertions(+), 26 deletions(-)
>
>diff --git a/src/backends/oauth2/README b/src/backends/oauth2/README
>index aefbbda..29f7bcb 100644
>--- a/src/backends/oauth2/README
>+++ b/src/backends/oauth2/README
>@@ -11,7 +11,7 @@ UI support, described below).
> 
> OAuth2 authentication using refresh token is enabled by setting OAuth2
> refresh token as password and setting username to
>-"username=refresh_token:{'TokenHost': <'https://accounts.google.com'>, 'TokenPath': <'/o/oauth2/token'>, 'Scope': <'https://www.googleapis.com/auth/carddav https://www.googleapis.com/auth/calendar'>, 'ClientID': <'923794261470.apps.googleusercontent.com'>, 'ClientSecret': <'SlVBAcxamM0TBPlvX2c1zbEY'>}"
>+"username=refresh_token:{'TokenHost': 'https://accounts.google.com', 'TokenPath': '/o/oauth2/token', 'Scope': 'https://www.googleapis.com/auth/carddav https://www.googleapis.com/auth/calendar', 'ClientID': '923794261470.apps.googleusercontent.com', 'ClientSecret': 'SlVBAcxamM0TBPlvX2c1zbEY'}"
> 
> Values of ClientId and ClientSecret need to be substituted with
> correct values (values here are from GOA, see below).
>diff --git a/src/backends/oauth2/oauth2.cpp b/src/backends/oauth2/oauth2.cpp
>index c916caa..5a8d19d 100644
>--- a/src/backends/oauth2/oauth2.cpp
>+++ b/src/backends/oauth2/oauth2.cpp
>@@ -158,7 +158,7 @@ boost::shared_ptr<AuthProvider> createOAuth2AuthProvider(const InitStateString &
>                                                          const InitStateString &password)
> {
>     // Expected content of parameter GVariant.
>-    boost::shared_ptr<GVariantType> hashtype(g_variant_type_new("a{sv}"), g_variant_type_free);
>+    boost::shared_ptr<GVariantType> hashtype(g_variant_type_new("a{ss}"), g_variant_type_free);
> 
>     // 'username' is the part after refresh_token: which we can parse directly.
>     GErrorCXX gerror;
>@@ -166,7 +166,7 @@ boost::shared_ptr<AuthProvider> createOAuth2AuthProvider(const InitStateString &
>     if (!parametersVar) {
>         gerror.throwError(SE_HERE, "parsing 'refresh_token:' username");
>     }
>-    GHashTableCXX parameters(Variant2HashTable(parametersVar));
>+    GHashTableCXX parameters(Variant2StrHashTable(parametersVar));
> 
>     // Extract the values that we expect in the parameters hash.
>     const char *tokenHost;
>@@ -175,43 +175,31 @@ boost::shared_ptr<AuthProvider> createOAuth2AuthProvider(const InitStateString &
>     const char *clientID;
>     const char *clientSecret;
> 
>-    GVariant *value;
>-
>-    value = (GVariant *)g_hash_table_lookup(parameters, "TokenHost");
>-    if (!value ||
>-        !g_variant_type_equal(G_VARIANT_TYPE_STRING, g_variant_get_type(value))) {
>+    tokenHost = (const gchar *)g_hash_table_lookup(parameters, "TokenHost");
>+    if (!tokenHost) {
>         SE_THROW("need 'TokenHost: <string>' in 'refresh_token:' parameters");
>     }
>-    tokenHost = g_variant_get_string(value, NULL);
> 
>-    value = (GVariant *)g_hash_table_lookup(parameters, "TokenPath");
>-    if (!value ||
>-        !g_variant_type_equal(G_VARIANT_TYPE_STRING, g_variant_get_type(value))) {
>+    tokenPath = (const gchar *)g_hash_table_lookup(parameters, "TokenPath");
>+    if (!tokenPath) {
>         SE_THROW("need 'TokenPath: <string>' in 'refresh_token:' parameters");
>     }
>-    tokenPath = g_variant_get_string(value, NULL);
> 
>-    value = (GVariant *)g_hash_table_lookup(parameters, "Scope");
>-    if (!value ||
>-        !g_variant_type_equal(G_VARIANT_TYPE_STRING, g_variant_get_type(value))) {
>+    scope = (const gchar *)g_hash_table_lookup(parameters, "Scope");
>+    if (!scope) {
>         SE_THROW("need 'Scope: <string>' in 'refresh_token:' parameters");
>     }
>-    scope = g_variant_get_string(value, NULL);
> 
>-    value = (GVariant *)g_hash_table_lookup(parameters, "ClientID");
>-    if (!value ||
>-        !g_variant_type_equal(G_VARIANT_TYPE_STRING, g_variant_get_type(value))) {
>+    clientID = (const gchar *)g_hash_table_lookup(parameters, "ClientID");
>+    if (!clientID) {
>         SE_THROW("need 'ClientID: <string>' in 'refresh_token:' parameters");
>     }
>-    clientID = g_variant_get_string(value, NULL);
> 
>-    value = (GVariant *)g_hash_table_lookup(parameters, "ClientSecret");
>-    if (!value ||
>-        !g_variant_type_equal(G_VARIANT_TYPE_STRING, g_variant_get_type(value))) {
>+    clientSecret = (const gchar *)g_hash_table_lookup(parameters, "ClientSecret");
>+    if (!clientSecret) {
>         SE_THROW("need 'ClientSecret: <string>' in 'refresh_token:' parameters");
>     }
>-    clientSecret = g_variant_get_string(value, NULL);
>-    
>+
>     if (password.empty()) {
>         SE_THROW("need refresh token provided as password");
>     }
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 83396: 105605 | 105737 | 105906 | 105907 | 105908 | 105909 | 105910 | 105911 | 105912 | 105913 | 105914 | 105915 | 105955 | 105956 | 105981

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.