From 87b22b55636caf5e09b62a39055038030d26b626 Mon Sep 17 00:00:00 2001
From: Alberto Mardegan <alberto.mardegan@canonical.com>
Date: Tue, 3 Dec 2013 14:41:26 +0200
Subject: [PATCH] signon: add Ubuntu Online Accounts support

Add a new configuration flag (--enable-uoa) to enable building the
signon backend for Ubuntu Online Accounts. The work done for gSSO is
reused and just slightly adapted (using preprocessor conditions) to work
with UOA as well.
---
 .../signon/accounts/google-caldav.service.in       | 10 +++---
 .../signon/accounts/google-carddav.service.in      | 10 +++---
 src/backends/signon/configure-sub.in               | 26 ++++++++++++++++
 src/backends/signon/signon.am                      | 36 +++++++++++++++++-----
 src/backends/signon/signon.cpp                     | 31 ++++++++++++++-----
 src/backends/signon/signon.h                       |  4 +--
 src/backends/signon/signonRegister.cpp             | 17 +++++++---
 7 files changed, 103 insertions(+), 31 deletions(-)

diff --git a/src/backends/signon/accounts/google-caldav.service.in b/src/backends/signon/accounts/google-caldav.service.in
index 3e6c577..453f155 100644
--- a/src/backends/signon/accounts/google-caldav.service.in
+++ b/src/backends/signon/accounts/google-caldav.service.in
@@ -7,11 +7,11 @@
   <!-- default settings (account settings have precedence over these) -->
   <template>
     <group name="auth">
-      <setting name="method">oauth</setting>
-      <setting name="mechanism">oauth2</setting>
-      <group name="oauth">
-        <group name="oauth2">
-          <setting name="Scope">email https://www.googleapis.com/auth/calendar</setting>
+      <setting name="method">@GOOGLE_METHOD@</setting>
+      <setting name="mechanism">@GOOGLE_MECHANISM@</setting>
+      <group name="@GOOGLE_METHOD@">
+        <group name="@GOOGLE_MECHANISM@">
+          <setting type="as" name="Scope">['email','https://www.googleapis.com/auth/calendar']</setting>
           <!-- workaround for (g)signond token cache issue: use different client IDs for each service and the provider -->
           <setting name="ClientId">@GOOGLE_CLIENT_ID_CALDAV@</setting>
           <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET_CALDAV@</setting>
diff --git a/src/backends/signon/accounts/google-carddav.service.in b/src/backends/signon/accounts/google-carddav.service.in
index e830c3e..1694f7e 100644
--- a/src/backends/signon/accounts/google-carddav.service.in
+++ b/src/backends/signon/accounts/google-carddav.service.in
@@ -7,11 +7,11 @@
   <!-- default settings (account settings have precedence over these) -->
   <template>
     <group name="auth">
-      <setting name="method">oauth</setting>
-      <setting name="mechanism">oauth2</setting>
-      <group name="oauth">
-        <group name="oauth2">
-          <setting name="Scope">email https://www.googleapis.com/auth/carddav</setting>
+      <setting name="method">@GOOGLE_METHOD@</setting>
+      <setting name="mechanism">@GOOGLE_MECHANISM@</setting>
+      <group name="@GOOGLE_METHOD@">
+        <group name="@GOOGLE_MECHANISM@">
+          <setting type="as" name="Scope">['email','https://www.googleapis.com/auth/carddav']</setting>
           <!-- workaround for (g)signond token cache issue: use different client IDs for each service and the provider -->
           <setting name="ClientId">@GOOGLE_CLIENT_ID_CARDDAV@</setting>
           <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET_CARDDAV@</setting>
diff --git a/src/backends/signon/configure-sub.in b/src/backends/signon/configure-sub.in
index f95f42e..b286170 100644
--- a/src/backends/signon/configure-sub.in
+++ b/src/backends/signon/configure-sub.in
@@ -11,11 +11,37 @@ if test $enable_gsso = "yes"; then
     AC_DEFINE(USE_GSSO, 1, [use gSSO])
     # link into static executables, similar to a SyncSource
     SYNCSOURCES="$SYNCSOURCES src/backends/gsso/providergsso.la"
+    GOOGLE_METHOD="oauth"
+    GOOGLE_MECHANISM="oauth2"
+    AC_SUBST(GOOGLE_METHOD)
+    AC_SUBST(GOOGLE_MECHANISM)
 fi
 
 # conditional compilation in make
 AM_CONDITIONAL([USE_GSSO], [test "$use_gsso" = "yes"])
 
+PKG_CHECK_MODULES(UOA, [libsignon-glib libaccounts-glib], HAVE_UOA=yes, HAVE_UOA=no)
+
+AC_ARG_ENABLE(uoa,
+              AS_HELP_STRING([--enable-uoa],
+                             [enables or disables support for the UOA single-sign-on system; default is on if development files are available]),
+              [enable_uoa="$enableval"
+               test "$enable_uoa" = "yes" || test "$enable_uoa" = "no" || AC_MSG_ERROR([invalid value for --enable-uoa: $enable_uoa])
+               test "$enable_uoa" = "no" || test "$HAVE_UOA" = "yes" || AC_MSG_ERROR([required pkg(s) not found that are needed for --enable-uoa])],
+              enable_uoa="$HAVE_UOA")
+if test $enable_uoa = "yes"; then
+    AC_DEFINE(USE_UOA, 1, [use UOA])
+    # link into static executables, similar to a SyncSource
+    SYNCSOURCES="$SYNCSOURCES src/backends/uoa/provideruoa.la"
+    GOOGLE_METHOD="oauth2"
+    GOOGLE_MECHANISM="web_server"
+    AC_SUBST(GOOGLE_METHOD)
+    AC_SUBST(GOOGLE_MECHANISM)
+fi
+
+# conditional compilation in make
+AM_CONDITIONAL([USE_UOA], [test "$enable_uoa" = "yes"])
+
 AC_ARG_WITH([google-client-id],
             AS_HELP_STRING([--with-google-client-id=...], [OAuth2 client ID for google.provider]),
             [GOOGLE_CLIENT_ID=$withval],
diff --git a/src/backends/signon/signon.am b/src/backends/signon/signon.am
index e29c182..acef8b4 100644
--- a/src/backends/signon/signon.am
+++ b/src/backends/signon/signon.am
@@ -24,10 +24,14 @@ dist_accounts_service_types_DATA = \
   src/backends/signon/accounts/carddav.service-type \
   $(NONE)
 
+if USE_GSSO
 src_backends_signon_lib = src/backends/signon/providergsso.la
+else
+src_backends_signon_lib = src/backends/signon/provideruoa.la
+endif
 MOSTLYCLEANFILES += $(src_backends_signon_lib)
 
-src_backends_signon_providergsso_la_SOURCES = \
+src_backends_signon_common_sources = \
   src/backends/signon/signon.h \
   src/backends/signon/signon.cpp \
   $(NONE)
@@ -35,15 +39,33 @@ src_backends_signon_providergsso_la_SOURCES = \
 if ENABLE_MODULES
 src_backends_signon_backenddir = $(BACKENDS_DIRECTORY)
 src_backends_signon_backend_LTLIBRARIES = $(src_backends_signon_lib)
-src_backends_signon_providergsso_la_SOURCES += \
+src_backends_signon_common_sources += \
   src/backends/signon/signonRegister.cpp
 else
 noinst_LTLIBRARIES += $(src_backends_signon_lib)
 endif
 
-src_backends_signon_providergsso_la_LIBADD = $(GSSO_LIBS) $(SYNCEVOLUTION_LIBS) 
-src_backends_signon_providergsso_la_LDFLAGS = -module -avoid-version
-src_backends_signon_providergsso_la_CXXFLAGS = $(GSSO_CFLAGS) $(SYNCEVOLUTION_CFLAGS)
-src_backends_signon_providergsso_la_CPPFLAGS = -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_signon_providergsso_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
+src_backends_signon_common_libadd = $(SYNCEVOLUTION_LIBS) 
+src_backends_signon_common_ldflags = -module -avoid-version
+src_backends_signon_common_cxxflags = $(SYNCEVOLUTION_CFLAGS)
+src_backends_signon_common_cppflags = -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
+src_backends_signon_common_dependencies = src/syncevo/libsyncevolution.la
+
+if USE_GSSO
+src_backends_signon_providergsso_la_SOURCES = $(src_backends_signon_common_sources)
+src_backends_signon_providergsso_la_LIBADD = $(GSSO_LIBS) $(src_backends_signon_common_libadd) 
+src_backends_signon_providergsso_la_LDFLAGS = $(src_backends_signon_common_ldflags)
+src_backends_signon_providergsso_la_CXXFLAGS = $(GSSO_CFLAGS) $(src_backends_signon_common_cxxflags)
+src_backends_signon_providergsso_la_CPPFLAGS = $(src_backends_signon_common_cppflags)
+src_backends_signon_providergsso_la_DEPENDENCIES = $(src_backends_signon_common_dependencies)
+endif
+
+if USE_UOA
+src_backends_signon_provideruoa_la_SOURCES = $(src_backends_signon_common_sources)
+src_backends_signon_provideruoa_la_LIBADD = $(UOA_LIBS) $(src_backends_signon_common_libadd)
+src_backends_signon_provideruoa_la_LDFLAGS = $(src_backends_signon_common_ldflags)
+src_backends_signon_provideruoa_la_CXXFLAGS = $(UOA_CFLAGS) $(src_backends_signon_common_cxxflags)
+src_backends_signon_provideruoa_la_CPPFLAGS = $(src_backends_signon_common_cppflags)
+src_backends_signon_provideruoa_la_DEPENDENCIES = $(src_backends_signon_common_dependencies)
+endif
 
diff --git a/src/backends/signon/signon.cpp b/src/backends/signon/signon.cpp
index 070cee1..44246a3 100644
--- a/src/backends/signon/signon.cpp
+++ b/src/backends/signon/signon.cpp
@@ -21,9 +21,16 @@
 
 #include <syncevo/IdentityProvider.h>
 
+#define USE_SIGNON (defined USE_GSSO || defined USE_UOA)
+
+#if USE_SIGNON
 #ifdef USE_GSSO
 #include "libgsignon-glib/signon-auth-service.h"
 #include "libgsignon-glib/signon-identity.h"
+#elif defined USE_UOA
+#include "libsignon-glib/signon-auth-service.h"
+#include "libsignon-glib/signon-identity.h"
+#endif // USE_GSSO
 #include "libaccounts-glib/ag-account.h"
 #include "libaccounts-glib/ag-account-service.h"
 #include <libaccounts-glib/ag-auth-data.h>
@@ -45,12 +52,12 @@ SE_GLIB_TYPE(AgService, ag_service)
 SE_GLIB_TYPE(AgAuthData, ag_auth_data)
 SE_GLIB_TYPE(GHashTable, g_hash_table)
 
-#endif // USE_GSSO
+#endif // USE_SIGNON
 
 #include <syncevo/declarations.h>
 SE_BEGIN_CXX
 
-#ifdef USE_GSSO
+#ifdef USE_SIGNON
 
 typedef GListCXX<AgService, GList, ag_service_unref> ServiceListCXX;
 
@@ -167,7 +174,7 @@ public:
                                m_authSession, sessionDataVar, m_mechanism.c_str(), NULL);
         buffer.reset(resultDataVar ? g_variant_print(resultDataVar, true) : NULL);
         SE_LOG_DEBUG(NULL, "OAuth2 token result: %s, %s",
-                     buffer ? buffer.get() : "<<null>>",
+                     buffer.get(),
                      gerror ? gerror->message : "???");
         if (!resultDataVar || gerror) {
             SE_THROW_EXCEPTION_STATUS(StatusException,
@@ -210,8 +217,8 @@ static void StoreIdentityCB(SignonIdentity *self,
     data->m_gerror = error;
 }
 
-boost::shared_ptr<AuthProvider> createGSSOAuthProvider(const InitStateString &username,
-                                                       const InitStateString &password)
+boost::shared_ptr<AuthProvider> createSignonAuthProvider(const InitStateString &username,
+                                                         const InitStateString &password)
 {
     boost::shared_ptr<AuthProvider> provider;
 
@@ -276,7 +283,11 @@ boost::shared_ptr<AuthProvider> createGSSOAuthProvider(const InitStateString &us
     // store its ID permanently.
     if (!signonID) {
         SE_LOG_DEBUG(NULL, "have to create signon identity");
-        SignonIdentityCXX identity(signon_identity_new(NULL), TRANSFER_REF);
+        SignonIdentityCXX identity(signon_identity_new(
+#ifdef USE_GSSO
+                                                       NULL
+#endif
+                                                       ), TRANSFER_REF);
         boost::shared_ptr<SignonIdentityInfo> identityInfo(signon_identity_info_new(), signon_identity_info_free);
         signon_identity_info_set_caption(identityInfo.get(),
                                          StringPrintf("created by SyncEvolution for account #%d and service %s",
@@ -315,7 +326,11 @@ boost::shared_ptr<AuthProvider> createGSSOAuthProvider(const InitStateString &us
 
     GVariantCXX sessionDataVar(ag_auth_data_get_login_parameters(authData, NULL));
     GHashTableCXX sessionData(Variant2HashTable(sessionDataVar), TRANSFER_REF);
-    SignonIdentityCXX identity(signon_identity_new_from_db(signonID, NULL), TRANSFER_REF);
+    SignonIdentityCXX identity(signon_identity_new_from_db(signonID
+#ifdef USE_GSSO
+                                                           , NULL
+#endif
+                                                           ), TRANSFER_REF);
     SE_LOG_DEBUG(NULL, "using signond identity %d", signonID);
     SignonAuthSessionCXX authSession(signon_identity_create_session(identity, method, gerror), TRANSFER_REF);
 
@@ -326,7 +341,7 @@ boost::shared_ptr<AuthProvider> createGSSOAuthProvider(const InitStateString &us
     return provider;
 }
 
-#endif // USE_GSSO
+#endif // USE_SIGNON
 
 SE_END_CXX
 
diff --git a/src/backends/signon/signon.h b/src/backends/signon/signon.h
index eddb0f3..7843ab0 100644
--- a/src/backends/signon/signon.h
+++ b/src/backends/signon/signon.h
@@ -27,8 +27,8 @@
 SE_BEGIN_CXX
 
 class AuthProvider;
-boost::shared_ptr<AuthProvider> createGSSOAuthProvider(const InitStateString &username,
-                                                       const InitStateString &password);
+boost::shared_ptr<AuthProvider> createSignonAuthProvider(const InitStateString &username,
+                                                         const InitStateString &password);
 
 SE_END_CXX
 #endif
diff --git a/src/backends/signon/signonRegister.cpp b/src/backends/signon/signonRegister.cpp
index 0415fee..b7188b1 100644
--- a/src/backends/signon/signonRegister.cpp
+++ b/src/backends/signon/signonRegister.cpp
@@ -26,21 +26,30 @@
 #include <syncevo/declarations.h>
 SE_BEGIN_CXX
 
-static class gSSOProvider : public IdentityProvider
+static class SignonProvider : public IdentityProvider
 {
 public:
-    gSSOProvider() :
+    SignonProvider() :
         // This uses "gsso" at the moment. The advantage of that is that if
         // gSSO and UOA were installed in parallel, the user could choose which
         // one to use. If it turns out that the two will never be installed at the
         // same time, then this perhaps should be "signon" instead, which then would
         // pick either a gSSO or UAO backend depending on which is available.
+#ifdef USE_GSSO
         IdentityProvider("gsso",
                          "gsso:<numeric account ID>[,<service name>]\n"
                          "   Authentication using libgsignond + libaccounts,\n"
                          "   using an account created and managed with libaccounts.\n"
                          "   The service name is optional. If not given, the\n"
                          "   settings from the account will be used.")
+#elif defined USE_UOA
+        IdentityProvider("uoa",
+                         "uoa:<numeric account ID>[,<service name>]\n"
+                         "   Authentication using libsignon + libaccounts,\n"
+                         "   using an account created and managed with libaccounts.\n"
+                         "   The service name is optional. If not given, the\n"
+                         "   settings from the account will be used.")
+#endif // USE_GSSO
     {}
 
     virtual boost::shared_ptr<AuthProvider> create(const InitStateString &username,
@@ -48,8 +57,8 @@ public:
     {
         // Returning NULL if not enabled...
         boost::shared_ptr<AuthProvider> provider;
-#ifdef USE_GSSO
-        provider = createGSSOAuthProvider(username, password);
+#if (defined USE_GSSO || defined USE_UOA)
+        provider = createSignonAuthProvider(username, password);
 #endif
         return provider;
     }
-- 
1.8.5