make redirect more or less work

Author: theScrabi

src/com/owncloud/android/lib/common/OwnCloudClient.java

@@ -25,7 +25,6 @@
 
 package com.owncloud.android.lib.common;
 
-import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
 import android.content.Context;
@@ -37,17 +36,16 @@
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
-import com.owncloud.android.lib.common.http.methods.nonwebdav.HttpMethod;
 import com.owncloud.android.lib.common.network.RedirectionPath;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.List;
 
+import at.bitfire.dav4android.exception.HttpException;
 import okhttp3.Cookie;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
@@ -136,9 +134,16 @@ public int executeHttpMethod (HttpBaseMethod method) throws Exception {
         int status;
 
         do {
-            //TODO Dav4Android doesn't allow follow redirections right now
-//            method.setFollowRedirects(mFollowRedirects);
-            status = method.execute();
+            try {
+                status = method.execute();
+            } catch (HttpException e) {
+                if(e.getMessage().contains(Integer.toString(HttpConstants.HTTP_MOVED_TEMPORARILY))) {
+                    status = followRedirection(method).getLastStatus();
+                } else {
+                    throw e;
+                }
+            }
+
             repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
             if (repeatWithFreshCredentials) {
                 repeatCounter++;
@@ -148,41 +153,26 @@ public int executeHttpMethod (HttpBaseMethod method) throws Exception {
         return status;
     }
 
-    private void checkFirstRedirection(HttpMethod method) {
-        final String location = method.getResponseHeaders()
-                .get("location");
+    private int executeRedirectedHttpMethod (HttpBaseMethod method) throws Exception {
+        boolean repeatWithFreshCredentials;
+        int repeatCounter = 0;
+        int status;
 
-        if(location != null && !location.isEmpty()) {
-            mRedirectedLocation = location;
-        }
-    }
+        do {
+            status = method.execute();
 
-    /**
-     * Fix for https://github.com/owncloud/android/issues/1847#issuecomment-267558274
-     *
-     * The problem: default SocketFactory in HTTPClient 3.x for HTTP connections creates a separate thread
-     * to create the socket. When a port out of TCP bounds is passed, an exception is thrown in that
-     * separate thread, and our original thread is not able to catch it. This is not happenning with HTTPS
-     * connections because we had to define our own socket factory,
-     * {@link com.owncloud.android.lib.common.network.AdvancedSslSocketFactory}, and it does not mess with
-     * threads.
-     *
-     * The solution: validate the input (the port number) ourselves before let the work to HTTPClient 3.x.
-     *
-     * @param method HTTP method to run.
-     * @throws IllegalArgumentException If 'method' targets an invalid port in an HTTP URI.
-     */
-    private void preventCrashDueToInvalidPort(HttpMethod method) {
-        final int port = method.getUrl().port();
-        String scheme = method.getUrl().scheme().toLowerCase();
-        if ("http".equals(scheme) && port > 0xFFFF) {
-            // < 0 is not tested because -1 is used when no port number is specified in the URL;
-            // no problem, the network library will convert that in the default HTTP port
-            throw new IllegalArgumentException("Invalid port number " + port);
-        }
+            repeatWithFreshCredentials = checkUnauthorizedAccess(status, repeatCounter);
+            if (repeatWithFreshCredentials) {
+                repeatCounter++;
+            }
+        } while (repeatWithFreshCredentials);
+
+        return status;
     }
 
-    public RedirectionPath followRedirection(HttpMethod method) throws Exception {
+
+
+    public RedirectionPath followRedirection(HttpBaseMethod method) throws Exception {
         int redirectionsCount = 0;
         int status = method.getStatusCode();
         RedirectionPath result = new RedirectionPath(status, MAX_REDIRECTIONS_COUNT);
@@ -215,13 +205,19 @@ public RedirectionPath followRedirection(HttpMethod method) throws Exception {
                 if (destination != null) {
                     final int suffixIndex = location.lastIndexOf(WEBDAV_PATH_4_0);
                     final String redirectionBase = location.substring(0, suffixIndex);
-
                     final String destinationPath = destination.substring(mBaseUri.toString().length());
-                    final String redirectedDestination = redirectionBase + destinationPath;
 
-                    method.setRequestHeader("destination", destination);
+                    method.setRequestHeader("destination", redirectionBase + destinationPath);
+                }
+                try {
+                    status = executeRedirectedHttpMethod(method);
+                } catch (HttpException e) {
+                    if(e.getMessage().contains(Integer.toString(HttpConstants.HTTP_MOVED_TEMPORARILY))) {
+                        status = HttpConstants.HTTP_MOVED_TEMPORARILY;
+                    } else  {
+                        throw e;
+                    }
                 }
-                status = executeHttpMethod(method);
                 result.addStatus(status);
                 redirectionsCount++;
 

src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java

@@ -23,10 +23,6 @@
  */
 package com.owncloud.android.lib.common.authentication;
 
-
-
-import android.net.Uri;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.http.HttpClient;
 import com.owncloud.android.lib.common.http.interceptors.BarearAuthInterceptor;
@@ -36,7 +32,6 @@
 
 import java.util.ArrayList;
 
-import okhttp3.Cookie;
 
 public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
 

src/com/owncloud/android/lib/common/http/HttpClient.java

@@ -58,9 +58,6 @@ public class HttpClient {
     private static HttpInterceptor sOkHttpInterceptor;
     private static Context sContext;
 
-    public HttpClient() {
-
-    }
 
     public static void setContext(Context context) {
         sContext = context;
@@ -78,7 +75,9 @@ public static OkHttpClient getOkHttpClient() {
                         .protocols(Arrays.asList(Protocol.HTTP_1_1))
                         .followRedirects(false)
                         .sslSocketFactory(sslContext.getSocketFactory(), trustManager)
-                        .hostnameVerifier(new BrowserCompatHostnameVerifier());
+                        .hostnameVerifier((asdf, usdf) -> true);
+                        // TODO: Not verifying the hostname against certificate. ask owncloud security human if this is ok.
+                        //.hostnameVerifier(new BrowserCompatHostnameVerifier());
                 if(BuildConfig.DEBUG) {
                     clientBuilder.addNetworkInterceptor(new StethoInterceptor());
                 }