[Pkg-owncloud-commits] [owncloud-client] 61/70: Shibboleth: Always ask for the password if we are going to open the log window

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit b7b6cf4b3fb746a07c561d7de7de56dc01a6eab2
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Jun 20 15:18:38 2014 +0200

    Shibboleth: Always ask for the password if we are going to open the log window
    
    If we don't have the cookie in the keychain (e.g. the keychain is
    unavailable) but there is still session cookie in the cookie jar,
    showing the browser won't ask for authentication.
---
 src/creds/shibbolethcredentials.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp
index d9e3217..bf8fea4 100644
--- a/src/creds/shibbolethcredentials.cpp
+++ b/src/creds/shibbolethcredentials.cpp
@@ -371,6 +371,13 @@ void ShibbolethCredentials::showLoginWindow(Account* account)
         // FIXME On OS X this does not raise properly
         return;
     }
+
+    CookieJar *jar = static_cast<CookieJar*>(account->networkAccessManager()->cookieJar());
+    // When opening a new window clear all the session cookie that might keep the user from logging in
+    // (or the session may already be open in the server, and there will not be redirect asking for the
+    // real long term cookie we want to store)
+    jar->clearSessionCookies();
+
     _browser = new ShibbolethWebView(account);
     connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie, Account*)),
             this, SLOT(onShibbolethCookieReceived(QNetworkCookie, Account*)), Qt::QueuedConnection);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git