Attachment 105907 Details for Bug 83396 – identity provider + password

[patch] identity provider + password

0002-identity-allow-using-and-updating-the-password-prope.patch (text/plain), 7.64 KB, created by Patrick Ohly on 2014-09-08 18:46:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Ohly

Created: 2014-09-08 18:46:50 UTC

Size: 7.64 KB

patch

obsolete

>From ece9806773269154b70c2b55f3ee270f8678d74e Mon Sep 17 00:00:00 2001
>From: Mateusz Polrola <mateusz.polrola@gmail.com>
>Date: Mon, 8 Sep 2014 12:00:15 +0200
>Subject: [PATCH 02/10] identity: allow using and updating the "password"
> property
>
>So far, only the "username" property was used once identity providers
>were involved. The upcoming oauth2 provider uses the "password"
>property for the refresh token and needs the ability to store a new
>token if the OAuth2 server updates it.
>
>Setting the new value will not always be possible (for example,
>when running a command line operation where all properties were
>provided on the command line without a permanent config). This still
>needs to be handled.
>---
> src/backends/goa/goa.cpp             | 3 ++-
> src/backends/signon/signon.cpp       | 3 ++-
> src/backends/webdav/NeonCXX.cpp      | 3 ++-
> src/backends/webdav/NeonCXX.h        | 5 +++++
> src/backends/webdav/WebDAVSource.cpp | 8 ++++++++
> src/syncevo/IdentityProvider.cpp     | 2 +-
> src/syncevo/IdentityProvider.h       | 8 ++++++--
> src/syncevo/SyncConfig.cpp           | 8 --------
> 8 files changed, 26 insertions(+), 14 deletions(-)
>
>diff --git a/src/backends/goa/goa.cpp b/src/backends/goa/goa.cpp
>index ad32282..45b7604 100644
>--- a/src/backends/goa/goa.cpp
>+++ b/src/backends/goa/goa.cpp
>@@ -199,7 +199,8 @@ public:
> 
>     virtual Credentials getCredentials() const { SE_THROW("only OAuth2 is supported"); }
> 
>-    virtual std::string getOAuth2Bearer(int failedTokens) const
>+    virtual std::string getOAuth2Bearer(int failedTokens,
>+                                        const PasswordUpdateCallback &passwordUpdateCallback) const
>     {
>         m_account->m_ensureCredentials();
>         std::string token = m_account->m_getAccessToken();
>diff --git a/src/backends/signon/signon.cpp b/src/backends/signon/signon.cpp
>index 2fb1880..e473c69 100644
>--- a/src/backends/signon/signon.cpp
>+++ b/src/backends/signon/signon.cpp
>@@ -85,7 +85,8 @@ public:
> 
>     virtual Credentials getCredentials() const { SE_THROW("only OAuth2 is supported"); }
> 
>-    virtual std::string getOAuth2Bearer(int failedTokens) const
>+    virtual std::string getOAuth2Bearer(int failedTokens,
>+                                        const PasswordUpdateCallback &passwordUpdateCallback) const
>     {
>         SE_LOG_DEBUG(NULL, "retrieving OAuth2 token, attempt %d", failedTokens);
> 
>diff --git a/src/backends/webdav/NeonCXX.cpp b/src/backends/webdav/NeonCXX.cpp
>index 1412e04..676679a 100644
>--- a/src/backends/webdav/NeonCXX.cpp
>+++ b/src/backends/webdav/NeonCXX.cpp
>@@ -957,7 +957,8 @@ void Session::checkAuthorization()
>         // Count the number of times we asked for new tokens. This helps
>         // the provider determine whether the token that it returns are valid.
>         try {
>-            m_oauth2Bearer = m_authProvider->getOAuth2Bearer(m_oauthTokenRejections);
>+            m_oauth2Bearer = m_authProvider->getOAuth2Bearer(m_oauthTokenRejections,
>+                                                             boost::bind(&Settings::updatePassword, m_settings, _1));
>             SE_LOG_DEBUG(NULL, "got new OAuth2 token '%s' for next request", m_oauth2Bearer.c_str());
>         } catch (...) {
>             std::string explanation;
>diff --git a/src/backends/webdav/NeonCXX.h b/src/backends/webdav/NeonCXX.h
>index 3630876..7bfb7cc 100644
>--- a/src/backends/webdav/NeonCXX.h
>+++ b/src/backends/webdav/NeonCXX.h
>@@ -94,6 +94,11 @@ class Settings {
>     virtual boost::shared_ptr<AuthProvider> getAuthProvider() = 0;
> 
>     /**
>+     * Updates password to new one returned during OAuth2 authorization.
>+     */
>+    virtual void updatePassword(const std::string& password) = 0;
>+
>+    /**
>      * Google returns a 401 error even if the credentials
>      * are valid. It seems to use that to throttle request
>      * rates. This read/write setting remembers whether the
>diff --git a/src/backends/webdav/WebDAVSource.cpp b/src/backends/webdav/WebDAVSource.cpp
>index d4774a1..9f90cf4 100644
>--- a/src/backends/webdav/WebDAVSource.cpp
>+++ b/src/backends/webdav/WebDAVSource.cpp
>@@ -157,6 +157,8 @@ public:
> 
>     virtual boost::shared_ptr<AuthProvider> getAuthProvider();
> 
>+    void updatePassword(const string &password);
>+
>     std::string getUsername()
>     {
>         lookupAuthProvider();
>@@ -205,6 +207,12 @@ boost::shared_ptr<AuthProvider> ContextSettings::getAuthProvider()
>     return m_authProvider;
> }
> 
>+void ContextSettings::updatePassword(const std::string &password)
>+{
>+    m_context->setSyncPassword(password, false);
>+    m_context->flush();
>+}
>+
> void ContextSettings::lookupAuthProvider()
> {
>     if (m_authProvider) {
>diff --git a/src/syncevo/IdentityProvider.cpp b/src/syncevo/IdentityProvider.cpp
>index 782a74e..d36b6ff 100644
>--- a/src/syncevo/IdentityProvider.cpp
>+++ b/src/syncevo/IdentityProvider.cpp
>@@ -61,7 +61,7 @@ public:
>     virtual bool wasConfigured() const { return !m_creds.m_username.empty() || !m_creds.m_password.empty(); }
>     virtual bool methodIsSupported(AuthMethod method) const { return method == AUTH_METHOD_CREDENTIALS; }
>     virtual Credentials getCredentials() const { return m_creds; }
>-    virtual std::string getOAuth2Bearer(int failedTokens) const { SE_THROW("OAuth2 not supported"); return ""; }
>+    virtual std::string getOAuth2Bearer(int failedTokens, const PasswordUpdateCallback &passwordUpdateCallback) const { SE_THROW("OAuth2 not supported"); return ""; }
>     virtual std::string getUsername() const { return m_creds.m_username; }
> };
> 
>diff --git a/src/syncevo/IdentityProvider.h b/src/syncevo/IdentityProvider.h
>index 63f0f49..4ca7beb 100644
>--- a/src/syncevo/IdentityProvider.h
>+++ b/src/syncevo/IdentityProvider.h
>@@ -104,11 +104,15 @@ class AuthProvider
>      * To achieve that, the caller must count how often he got a token that
>      * did not work.
>      *
>-     * @param failedTokens   zero when asking for initial token, one for refresh, two for full re-authorization
>+     * @param failedTokens           zero when asking for initial token, one for refresh, two for full re-authorization
>+     * @param passwordUpdateCallback callback function to be called when stored refresh token need to be updated.
>+     *                               Only parameter of this callback function is new value of refresh token.
>      *
>      * @return a base64 encoded token, ready to be used in "Authorization: Bearer %s"
>      */
>-    virtual std::string getOAuth2Bearer(int failedTokens) const = 0;
>+    typedef boost::function<void (const std::string &newPassword)> PasswordUpdateCallback;
>+    virtual std::string getOAuth2Bearer(int failedTokens,
>+                                        const PasswordUpdateCallback &passwordUpdateCallback) const = 0;
> 
>     /**
>      * Returns username at the remote service. Works for
>diff --git a/src/syncevo/SyncConfig.cpp b/src/syncevo/SyncConfig.cpp
>index f130a72..e63a9d7 100644
>--- a/src/syncevo/SyncConfig.cpp
>+++ b/src/syncevo/SyncConfig.cpp
>@@ -2194,14 +2194,6 @@ void PasswordConfigProperty::savePassword(UserInterface &ui,
>         }
>         credConfig->setSyncPassword(password, false);
>         syncPropPassword.savePassword(ui, *credConfig);
>-    } else if (identity.m_provider != USER_IDENTITY_PLAIN_TEXT) {
>-        // Cannot store passwords in providers.
>-        if (password.wasSet() && !password.empty()) {
>-            SE_THROW(StringPrintf("setting property '%s' not supported for provider '%s' from property '%s'",
>-                                  getMainName().c_str(),
>-                                  identity.m_provider.c_str(),
>-                                  usernameProperty.getMainName().c_str()));
>-        }
>     } else {
>         if (password == "-" || password == "" ||
>             (boost::starts_with(password, "${") && boost::ends_with(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.