OC-3260: Detect authentication method

[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 f18ff2a..73bbaec 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -48,6 +48,7 @@ import android.view.View.OnFocusChangeListener;
 import android.view.View.OnTouchListener;\r
 import android.view.Window;\r
 import android.view.inputmethod.EditorInfo;\r
 import android.view.View.OnTouchListener;\r
 import android.view.Window;\r
 import android.view.inputmethod.EditorInfo;\r

+import android.webkit.SslErrorHandler;\r

 import android.widget.Button;\r
 import android.widget.CheckBox;\r
 import android.widget.EditText;\r
 import android.widget.Button;\r
 import android.widget.CheckBox;\r
 import android.widget.EditText;\r


@@ -64,6 +65,7 @@ import com.owncloud.android.lib.common.OwnCloudClientFactory;
 import com.owncloud.android.lib.common.OwnCloudClient;\r
 import com.owncloud.android.operations.OAuth2GetAccessToken;\r
 
 import com.owncloud.android.lib.common.OwnCloudClient;\r
 import com.owncloud.android.operations.OAuth2GetAccessToken;\r
 

+import com.owncloud.android.lib.common.network.CertificateCombinedException;\r

 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;\r
 import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation;\r
 import com.owncloud.android.lib.common.operations.RemoteOperation;\r
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;\r
 import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation;\r
 import com.owncloud.android.lib.common.operations.RemoteOperation;\r


@@ -75,7 +77,6 @@ import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r

-import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r

 import com.owncloud.android.utils.Log_OC;\r
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;\r
 \r
 import com.owncloud.android.utils.Log_OC;\r
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;\r
 \r


@@ -86,7 +87,7 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
  * @author David A. Velasco\r
  */\r
 public class AuthenticatorActivity extends AccountAuthenticatorActivity\r
  * @author David A. Velasco\r
  */\r
 public class AuthenticatorActivity extends AccountAuthenticatorActivity\r

-    implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener, OnEditorActionListener, \r
+    implements  OnRemoteOperationListener, OnFocusChangeListener, OnEditorActionListener, \r

     SsoWebViewClientListener, OnSslUntrustedCertListener {\r
 \r
     private static final String TAG = AuthenticatorActivity.class.getSimpleName();\r
     SsoWebViewClientListener, OnSslUntrustedCertListener {\r
 \r
     private static final String TAG = AuthenticatorActivity.class.getSimpleName();\r


@@ -174,6 +175,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private boolean mResumed; // Control if activity is resumed\r
 \r
     public static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";\r
     private boolean mResumed; // Control if activity is resumed\r
 \r
     public static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";\r

+    \r
+    private boolean mTryEmptyAuthorization = false;\r

 \r
 \r
     /**\r
 \r
 \r
     /**\r


@@ -814,6 +817,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }\r
 \r
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r
     }\r
 \r
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r

+        \r

         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = operation.getUserName();\r
         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = operation.getUserName();\r


@@ -838,7 +842,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             if (success)\r
                 finish();\r
         } else {\r
             if (success)\r
                 finish();\r
         } else {\r

-            updateAuthStatusIconAndText(result);\r
+            updateStatusIconFailUserName();\r

             showAuthStatus();\r
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());\r
         }\r
             showAuthStatus();\r
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());\r
         }\r


@@ -891,6 +895,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             /// update status icon and text\r
             if (mServerIsValid) {\r
                 hideRefreshButton();\r
             /// update status icon and text\r
             if (mServerIsValid) {\r
                 hideRefreshButton();\r

+                // Try to create an account with user and pass "", to know if it is a regular server\r
+                tryEmptyAuthorization();\r

             } else {\r
                 showRefreshButton();\r
             }\r
             } else {\r
                 showRefreshButton();\r
             }\r


@@ -906,14 +912,40 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mDiscoveredVersion = operation.getDiscoveredVersion();\r
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
 \r
             mDiscoveredVersion = operation.getDiscoveredVersion();\r
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
 \r

-            /// allow or not the user try to access the server\r
-            mOkButton.setEnabled(mServerIsValid);\r
+//            /// allow or not the user try to access the server\r
+//            mOkButton.setEnabled(mServerIsValid);\r

             \r
         }   // else nothing ; only the last check operation is considered; \r
         // multiple can be triggered if the user amends a URL before a previous check can be triggered\r
     }\r
 \r
 \r
             \r
         }   // else nothing ; only the last check operation is considered; \r
         // multiple can be triggered if the user amends a URL before a previous check can be triggered\r
     }\r
 \r
 \r

+    /**\r
+     *  Try to access with  user/pass ""/"", to know if it is a regular server\r
+     */\r
+    private void tryEmptyAuthorization() {\r
+        mTryEmptyAuthorization = true;\r
+        \r
+        Log_OC.d(TAG, "Trying empty authorization to detect authentication method");\r
+        \r
+        /// be gentle with the user\r
+        showDialog(DIALOG_LOGIN_PROGRESS);\r
+        \r
+        /// get the path to the root folder through WebDAV from the version server\r
+        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
+\r
+        /// get basic credentials entered by user\r
+        String username = "";\r
+        String password = "";\r
+\r
+        /// test credentials \r
+        mAuthCheckOperation = new  ExistenceCheckRemoteOperation("", this, false);\r
+        OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, true);\r
+        client.setBasicCredentials(username, password);\r
+        mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
+    }\r
+    \r
+    \r

     private String normalizeUrl(String url) {\r
         if (url != null && url.length() > 0) {\r
             url = url.trim();\r
     private String normalizeUrl(String url) {\r
         if (url != null && url.length() > 0) {\r
             url = url.trim();\r


@@ -1110,6 +1142,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }\r
 \r
 \r
     }\r
 \r
 \r

+    private void updateStatusIconFailUserName(){\r
+        mAuthStatusIcon = android.R.drawable.ic_secure;\r
+        mAuthStatusText = R.string.auth_fail_get_user_name;\r
+    }\r
+    \r

     /**\r
      * Processes the result of the request for and access token send \r
      * to an OAuth authorization server.\r
     /**\r
      * Processes the result of the request for and access token send \r
      * to an OAuth authorization server.\r


@@ -1159,21 +1196,29 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         } catch (IllegalArgumentException e) {\r
             // 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
         } catch (IllegalArgumentException e) {\r
             // 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
+        \r

         if (result.isSuccess()) {\r
         if (result.isSuccess()) {\r

-            Log_OC.d(TAG, "Successful access - time to save the account");\r
+            \r
+            if (mTryEmptyAuthorization) {\r
+                //allow or not the user try to access the server\r
+                mOkButton.setEnabled(mServerIsValid);\r
+                mTryEmptyAuthorization = false;\r
+                \r
+            } else {\r
+                Log_OC.d(TAG, "Successful access - time to save the account");\r

 \r
 \r

-            boolean success = false;\r
-            if (mAction == ACTION_CREATE) {\r
-                success = createAccount();\r
+                boolean success = false;\r
+                if (mAction == ACTION_CREATE) {\r
+                    success = createAccount();\r

 \r
 \r

-            } else {\r
-                updateToken();\r
-                success = true;\r
-            }\r
+                } else {\r
+                    updateToken();\r
+                    success = true;\r
+                }\r

 \r
 \r

-            if (success) {\r
-                finish();\r
+                if (success) {\r
+                    finish();\r
+                }\r

             }\r
 \r
         } else if (result.isServerFail() || result.isException()) {\r
             }\r
 \r
         } else if (result.isServerFail() || result.isException()) {\r


@@ -1530,26 +1575,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }\r
     \r
     /**\r
     }\r
     \r
     /**\r

-     * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
-     */\r
-    public void onSavedCertificate() {\r
-        checkOcServer();\r
-        reloadWebView();\r
-        \r
-    }\r
-\r
-    /**\r
-     * Called from SslValidatorDialog when a new server certificate could not be saved \r
-     * when the user requested it.\r
-     */\r
-    @Override\r
-    public void onFailedSavingCertificate() {\r
-        showDialog(DIALOG_CERT_NOT_SAVED);\r
-        cancelWebView();\r
-    }\r
-\r
-\r
-    /**\r

      *  Called when the 'action' button in an IME is pressed ('enter' in software keyboard).\r
      * \r
      *  Used to trigger the authentication check when the user presses 'enter' after writing the password, \r
      *  Called when the 'action' button in an IME is pressed ('enter' in software keyboard).\r
      * \r
      *  Used to trigger the authentication check when the user presses 'enter' after writing the password, \r


@@ -1665,40 +1690,21 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }\r
 \r
 \r
     }\r
 \r
 \r

-\r
-    public void cancelWebView() {\r
-        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
-        if (fd != null && fd instanceof SherlockDialogFragment) {\r
-            Dialog d = ((SherlockDialogFragment)fd).getDialog();\r
-            if (d != null && d.isShowing()) {\r
-                d.dismiss();\r
-            }\r
-        }\r
-        \r
-    }\r
-\r
-    public void reloadWebView() {\r
-        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
-        if (fd != null && fd instanceof SamlWebViewDialog) {\r
-                ((SamlWebViewDialog) fd).reloadWebView();\r
-        }\r
-    }\r
-\r
-    @Override\r
-    public void onCancelCertificate() {\r
-        cancelWebView();\r
-    }\r
-    \r

     /**\r
      * Show untrusted cert dialog \r
      */\r
     /**\r
      * Show untrusted cert dialog \r
      */\r

-    public void showUntrustedCertDialog(X509Certificate x509Certificate, SslError error) {\r
+    public void showUntrustedCertDialog(X509Certificate x509Certificate, SslError error, SslErrorHandler handler) {\r

         // Show a dialog with the certificate info\r
         // Show a dialog with the certificate info\r

-        SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstance(x509Certificate, error);\r
+        SslUntrustedCertDialog dialog = null;\r
+        if (x509Certificate == null) {\r
+            dialog = SslUntrustedCertDialog.newInstanceForEmptySslError(error, handler);\r
+        } else {\r
+            dialog = SslUntrustedCertDialog.newInstanceForFullSslError(x509Certificate, error, handler);\r
+        }\r

         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r

+        ft.addToBackStack(null);\r

         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r

-        \r

     }\r
     \r
     /**\r
     }\r
     \r
     /**\r


@@ -1706,9 +1712,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      */\r
     public void showUntrustedCertDialog(RemoteOperationResult result) {\r
         // Show a dialog with the certificate info\r
      */\r
     public void showUntrustedCertDialog(RemoteOperationResult result) {\r
         // Show a dialog with the certificate info\r

-        SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstance(result, this);\r
+        SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());\r

         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r

+        ft.addToBackStack(null);\r

         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
         \r
     }\r
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
         \r
     }\r


@@ -1717,11 +1724,50 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * Dismiss untrusted cert dialog\r
      */\r
     public void dismissUntrustedCertDialog(){\r
      * Dismiss untrusted cert dialog\r
      */\r
     public void dismissUntrustedCertDialog(){\r

-        Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_UNTRUSTED_CERT);\r
+        /*Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_UNTRUSTED_CERT);\r

         if (frag != null) {\r
         if (frag != null) {\r

-            SslUntrustedCertDialog dialog = (SslUntrustedCertDialog) frag;\r
+            SslErrorViewAdapter dialog = (SslErrorViewAdapter) frag;\r

             dialog.dismiss();\r
         }\r
             dialog.dismiss();\r
         }\r

+        */\r

     }\r
     \r
     }\r
     \r

+    /**\r
+     * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
+     */\r
+    public void onSavedCertificate() {\r
+        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
+        if (fd == null) {\r
+            // if SAML dialog is not shown, the SslDialog was shown due to an SSL error in the server check\r
+            checkOcServer();\r
+        }\r
+    }\r
+\r
+    /**\r
+     * Called from SslValidatorDialog when a new server certificate could not be saved \r
+     * when the user requested it.\r
+     */\r
+    @Override\r
+    public void onFailedSavingCertificate() {\r
+        showDialog(DIALOG_CERT_NOT_SAVED);\r
+        cancelWebView();\r
+    }\r
+\r
+    @Override\r
+    public void onCancelCertificate() {\r
+        cancelWebView();\r
+    }\r
+    \r
+\r
+    public void cancelWebView() {\r
+        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
+        if (fd != null && fd instanceof SherlockDialogFragment) {\r
+            Dialog d = ((SherlockDialogFragment)fd).getDialog();\r
+            if (d != null && d.isShowing()) {\r
+                d.dismiss();\r
+            }\r
+        }\r
+        \r
+    }\r
+\r

 }\r
 }\r