From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 22 Aug 2013 15:50:11 +0000 (+0200)
Subject: Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s... 
X-Git-Tag: oc-android-1.4.6~17^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/316a0a12ad4799ed0d43182a5b1b9bc04fbecee5?hp=--cc

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
---

316a0a12ad4799ed0d43182a5b1b9bc04fbecee5
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index bab98de6,477af967..58c0c979
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -231,9 -228,6 +235,8 @@@ implements  OnRemoteOperationListener, 
                  }
                  mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL));
                  mHostUrlInput.setText(mHostBaseUrl);
 +                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));
 +                mUsernameInput.setText(userName);
-                 mAccountNameInput.setText(userName);
              }
              initAuthorizationMethod();  // checks intent and setup.xml to determine mCurrentAuthorizationMethod
              mJustCreated = true;
@@@ -1177,49 -1157,75 +1186,79 @@@
              accountName += ":" + uri.getPort();
          }
          mAccount = new Account(accountName, AccountAuthenticator.ACCOUNT_TYPE);
-         if (isOAuth || isSaml) {
-             mAccountMgr.addAccountExplicitly(mAccount, "", null);  // with external authorizations, the password is never input in the app
+         if (AccountUtils.exists(mAccount, getApplicationContext())) {
+             // fail - not a new account, but an existing one; disallow
+             RemoteOperationResult result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_NEW); 
+             updateAuthStatusIconAndText(result);
+             showAuthStatus();
+             Log_OC.d(TAG, result.getLogMessage());
+             return false;
+             
+             
          } else {
-             mAccountMgr.addAccountExplicitly(mAccount, mPasswordInput.getText().toString(), null);
-         }
- 
-         /// add the new account as default in preferences, if there is none already
-         Account defaultAccount = AccountUtils.getCurrentOwnCloudAccount(this);
-         if (defaultAccount == null) {
-             SharedPreferences.Editor editor = PreferenceManager
-                     .getDefaultSharedPreferences(this).edit();
-             editor.putString("select_oc_account", accountName);
-             editor.commit();
+         
+             if (isOAuth || isSaml) {
+                 mAccountMgr.addAccountExplicitly(mAccount, "", null);  // with external authorizations, the password is never input in the app
+             } else {
+                 mAccountMgr.addAccountExplicitly(mAccount, mPasswordInput.getText().toString(), null);
+             }
+     
+             /// add the new account as default in preferences, if there is none already
+             Account defaultAccount = AccountUtils.getCurrentOwnCloudAccount(this);
+             if (defaultAccount == null) {
+                 SharedPreferences.Editor editor = PreferenceManager
+                         .getDefaultSharedPreferences(this).edit();
+                 editor.putString("select_oc_account", accountName);
+                 editor.commit();
+             }
+     
+             /// prepare result to return to the Authenticator
+             //  TODO check again what the Authenticator makes with it; probably has the same effect as addAccountExplicitly, but it's not well done
+             final Intent intent = new Intent();       
+             intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    AccountAuthenticator.ACCOUNT_TYPE);
+             intent.putExtra(AccountManager.KEY_ACCOUNT_NAME,    mAccount.name);
+             /*if (!isOAuth)
+                 intent.putExtra(AccountManager.KEY_AUTHTOKEN,   AccountAuthenticator.ACCOUNT_TYPE); */
+             intent.putExtra(AccountManager.KEY_USERDATA,        username);
+             if (isOAuth || isSaml) {
+                 mAccountMgr.setAuthToken(mAccount, mCurrentAuthTokenType, mAuthToken);
+             }
+             /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA
+             mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION,    mDiscoveredVersion.toString());
+             mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL,   mHostBaseUrl);
+             if (isSaml) {
+                 mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); 
+             } else if (isOAuth) {
+                 mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2, "TRUE");  
+             }
+     
+             setAccountAuthenticatorResult(intent.getExtras());
+             setResult(RESULT_OK, intent);
+     
+             /// immediately request for the synchronization of the new account
+             Bundle bundle = new Bundle();
+             bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
+             ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);
++            syncAccount();
++//          Bundle bundle = new Bundle();
++//          bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
++//          ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);
+             return true;
          }
+     }
  
-         /// prepare result to return to the Authenticator
-         //  TODO check again what the Authenticator makes with it; probably has the same effect as addAccountExplicitly, but it's not well done
-         final Intent intent = new Intent();       
-         intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    AccountAuthenticator.ACCOUNT_TYPE);
-         intent.putExtra(AccountManager.KEY_ACCOUNT_NAME,    mAccount.name);
-         /*if (!isOAuth)
-             intent.putExtra(AccountManager.KEY_AUTHTOKEN,   AccountAuthenticator.ACCOUNT_TYPE); */
-         intent.putExtra(AccountManager.KEY_USERDATA,        username);
-         if (isOAuth || isSaml) {
-             mAccountMgr.setAuthToken(mAccount, mCurrentAuthTokenType, mAuthToken);
-         }
-         /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA
-         mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION,    mDiscoveredVersion.toString());
-         mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL,   mHostBaseUrl);
-         if (isSaml) {
-             mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); 
-         } else if (isOAuth) {
-             mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2, "TRUE");  
+     
+     private String getUserNameForSamlSso() {
+         if (mAuthToken != null) {
+             String [] cookies = mAuthToken.split(";");
+             for (int i=0; i<cookies.length; i++) {
+                 if (cookies[i].startsWith(KEY_OC_USERNAME_EQUALS )) {
+                     String value = Uri.decode(cookies[i].substring(KEY_OC_USERNAME_EQUALS.length()));
+                     return value;
+                 }
+             }
          }
- 
-         setAccountAuthenticatorResult(intent.getExtras());
-         setResult(RESULT_OK, intent);
- 
-         /// immediately request for the synchronization of the new account
-         syncAccount();
- //        Bundle bundle = new Bundle();
- //        bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
- //        ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);
+         return "";
      }
  
  
diff --cc src/eu/alefzero/webdav/WebdavClient.java
index dd484084,25601902..03921ff6
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@@ -99,10 -93,9 +99,10 @@@ public class WebdavClient extends HttpC
      
      public void setSsoSessionCookie(String accessToken) {
          getParams().setAuthenticationPreemptive(false);
-         getParams().setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
+         getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
          mSsoSessionCookie = accessToken;
          mCredentials = null;
 +        mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE;
      }