Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / AuthenticatorActivity.java

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 58c0c97..9ba0970 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -18,8 +18,6 @@
 \r
 package com.owncloud.android.authentication;\r
 \r
-import java.net.URLDecoder;\r
-\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
@@ -51,7 +49,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 import android.widget.TextView.OnEditorActionListener;\r
-import android.widget.Toast;\r
 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.Log_OC;\r
@@ -742,6 +739,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mAuthCheckOperation = new  ExistenceCheckOperation("", this, false);\r
         WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, false);\r
         mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
+      \r
     }\r
 \r
     /**\r
@@ -776,7 +774,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
         }\r
         \r
-        if (result.isTemporalRedirection() || result.isIdPRedirection()) {\r
+        if (result.isTemporalRedirection() && result.isIdPRedirection()) {\r
             String url = result.getRedirectedLocation();\r
             String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\r
             \r
@@ -784,8 +782,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mSamlDialog = SamlWebViewDialog.newInstance(url, targetUrl);            \r
             mSamlDialog.show(getSupportFragmentManager(), TAG_SAML_DIALOG);\r
             \r
-            mAuthStatusIcon = android.R.drawable.ic_secure;\r
-            mAuthStatusText = R.string.auth_follow_auth_server;\r
+            mAuthStatusIcon = 0;\r
+            mAuthStatusText = 0;\r
             \r
         } else {\r
             mAuthStatusIcon = R.drawable.common_error;\r
@@ -1021,6 +1019,9 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         case ACCOUNT_NOT_NEW:\r
             mAuthStatusText = R.string.auth_account_not_new;\r
             break;\r
+        case ACCOUNT_NOT_THE_SAME:\r
+            mAuthStatusText = R.string.auth_account_not_the_same;\r
+            break;\r
         case UNHANDLED_HTTP_CODE:\r
         case UNKNOWN_ERROR:\r
             mAuthStatusText = R.string.auth_unknown_error_title;\r
@@ -1085,12 +1086,12 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         if (result.isSuccess()) {\r
             Log_OC.d(TAG, "Successful access - time to save the account");\r
 \r
-            boolean success = true;\r
+            boolean success = false;\r
             if (mAction == ACTION_CREATE) {\r
                 success = createAccount();\r
 \r
             } else {\r
-                updateToken();\r
+                success = updateToken();\r
             }\r
 \r
             if (success) {\r
@@ -1128,6 +1129,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             showAuthStatus();\r
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
         }\r
+\r
     }\r
 \r
 \r
@@ -1135,7 +1137,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      * Sets the proper response to get that the Account Authenticator that started this activity saves \r
      * a new authorization token for mAccount.\r
      */\r
-    private void updateToken() {\r
+    private boolean updateToken() {\r
         Bundle response = new Bundle();\r
         response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);\r
         response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);\r
@@ -1146,6 +1148,17 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mAccountMgr.setAuthToken(mAccount, mCurrentAuthTokenType, mAuthToken);\r
             \r
         } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mCurrentAuthTokenType)) {\r
+            String username = getUserNameForSamlSso();\r
+            if (!mUsernameInput.getText().toString().equals(username)) {\r
+                // fail - not a new account, but an existing one; disallow\r
+                RemoteOperationResult result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_THE_SAME); \r
+                updateAuthStatusIconAndText(result);\r
+                showAuthStatus();\r
+                Log_OC.d(TAG, result.getLogMessage());\r
+                \r
+                return false;\r
+            }\r
+            \r
             response.putString(AccountManager.KEY_AUTHTOKEN, mAuthToken);\r
             // the next line is necessary; by now, notifications are calling directly to the AuthenticatorActivity to update, without AccountManager intervention\r
             mAccountMgr.setAuthToken(mAccount, mCurrentAuthTokenType, mAuthToken);\r
@@ -1156,8 +1169,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         }\r
         setAccountAuthenticatorResult(response);\r
         \r
-        // Sync Account\r
-        syncAccount();\r
+        return true;\r
     }\r
 \r
 \r
@@ -1194,7 +1206,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             Log_OC.d(TAG, result.getLogMessage());\r
             return false;\r
             \r
-            \r
         } else {\r
         \r
             if (isOAuth || isSaml) {\r
@@ -1562,17 +1573,18 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         if (sessionCookie != null && sessionCookie.length() > 0) {\r
             Log_OC.d(TAG, "Successful SSO - time to save the account");\r
             mAuthToken = sessionCookie;\r
-            boolean success = true;\r
+            boolean success = false;\r
             if (mAction == ACTION_CREATE) {\r
                 success = createAccount();\r
         \r
             } else {\r
-                updateToken();\r
+                success = updateToken();\r
             }\r
             if (success) {\r
                 finish();\r
             }\r
         }\r
+\r
             \r
     }\r
 \r
@@ -1596,8 +1608,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             // TODO - show fail\r
             Log_OC.d(TAG, "SSO failed");\r
         }\r
-    }\r
     \r
+    }\r
     \r
     /** Show auth_message \r
      * \r