make oidc discovery work again

Author: theScrabi

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/ConnectionValidator.kt

@@ -20,11 +20,10 @@ class ConnectionValidator (
             var validationRetryCount = 0
             val client = OwnCloudClient(baseClient.baseUri, null, false)
             if (clearCookiesOnValidation) {
-                client.cookiesForBaseUri = emptyList()
+                client.clearCookies()
             } else {
                 client.cookiesForBaseUri = baseClient.cookiesForBaseUri
             }
-            //TODO: Also handle cookies
 
             client.credentials = baseClient.credentials
             client.setFollowRedirects(true)

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

@@ -62,7 +62,6 @@ public class OwnCloudClient extends HttpClient {
     private static final int MAX_REDIRECTIONS_COUNT = 5;
     private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1;
 
-    private static byte[] sExhaustBuffer = new byte[1024];
     private static int sIntanceCounter = 0;
     private OwnCloudCredentials mCredentials = null;
     private int mInstanceNumber;
@@ -80,7 +79,7 @@ public class OwnCloudClient extends HttpClient {
 
     private SingleSessionManager mSingleSessionManager = null;
 
-    private boolean mFollowRedirects;
+    private boolean mFollowRedirects = false;
 
     public OwnCloudClient(Uri baseUri, ConnectionValidator connectionValidator, boolean synchronizeRequests) {
         if (baseUri == null) {
@@ -357,6 +356,10 @@ public List<Cookie> getCookiesForBaseUri() {
                     HttpUrl.parse(mBaseUri.toString()));
     }
 
+    public void clearCookies() {
+        setCookiesForBaseUri(new ArrayList<>());
+    }
+
     public OwnCloudVersion getOwnCloudVersion() {
         return mVersion;
     }
@@ -453,7 +456,7 @@ private void invalidateAccountCredentials() {
         am.clearPassword(mAccount.getSavedAccount()); // being strict, only needed for Basic Auth credentials
     }
 
-    public boolean followRedirects() {
+    public boolean getFollowRedirects() {
         return mFollowRedirects;
     }
 

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

@@ -57,7 +57,6 @@
 public class HttpClient {
     private static OkHttpClient sOkHttpClient;
     private static Context sContext;
-    private static HashMap<String, List<Cookie>> sCookieStore = new HashMap<>();
     private static LogInterceptor sLogInterceptor;
     private static Interceptor sDebugInterceptor;
 
@@ -68,11 +67,10 @@ public static OkHttpClient getOkHttpClient() {
                         NetworkUtils.getKnownServersStore(sContext));
                 final SSLSocketFactory sslSocketFactory = getNewSslSocketFactory(trustManager);
                 // Automatic cookie handling, NOT PERSISTENT
-                final CookieJar cookieJar = new CookieJarImpl(sCookieStore);
 
                 // TODO: Not verifying the hostname against certificate. ask owncloud security human if this is ok.
                 //.hostnameVerifier(new BrowserCompatHostnameVerifier());
-                sOkHttpClient = buildNewOkHttpClient(sslSocketFactory, trustManager, cookieJar);
+                sOkHttpClient = buildNewOkHttpClient(sslSocketFactory, trustManager);
 
             } catch (Exception e) {
                 Timber.e(e, "Could not setup SSL system.");
@@ -109,8 +107,7 @@ private static SSLSocketFactory getNewSslSocketFactory(X509TrustManager trustMan
         return sslContext.getSocketFactory();
     }
 
-    private static OkHttpClient buildNewOkHttpClient(SSLSocketFactory sslSocketFactory, X509TrustManager trustManager,
-                                                     CookieJar cookieJar) {
+    private static OkHttpClient buildNewOkHttpClient(SSLSocketFactory sslSocketFactory, X509TrustManager trustManager){
         return new OkHttpClient.Builder()
                 .addNetworkInterceptor(getLogInterceptor())
                 .addNetworkInterceptor(DebugInterceptorFactory.INSTANCE.getInterceptor())
@@ -121,7 +118,6 @@ private static OkHttpClient buildNewOkHttpClient(SSLSocketFactory sslSocketFacto
                 .followRedirects(false)
                 .sslSocketFactory(sslSocketFactory, trustManager)
                 .hostnameVerifier((asdf, usdf) -> true)
-                .cookieJar(cookieJar)
                 .build();
     }
 
@@ -132,19 +128,11 @@ public static LogInterceptor getLogInterceptor() {
         return sLogInterceptor;
     }
 
-    public static List<Cookie> getCookiesFromUrl(HttpUrl httpUrl) {
-        return sCookieStore.get(httpUrl.host());
-    }
-
     public Context getContext() {
         return sContext;
     }
 
     public static void setContext(Context context) {
         sContext = context;
     }
-
-    public void clearCookies() {
-        sCookieStore.clear();
-    }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt

@@ -60,7 +60,7 @@ class CheckPathExistenceRemoteOperation(
         private set
 
     override fun run(client: OwnCloudClient): RemoteOperationResult<Boolean> {
-        val previousFollowRedirects = client.followRedirects()
+        val previousFollowRedirects = client.getFollowRedirects()
         return try {
             val stringUrl =
                 if (isUserLogged) client.baseFilesWebDavUri.toString()
@@ -71,7 +71,6 @@ class CheckPathExistenceRemoteOperation(
                 setConnectionTimeout(TIMEOUT.toLong(), TimeUnit.SECONDS)
             }
 
-            client.setFollowRedirects(false)
             var status = client.executeHttpMethod(propFindMethod)
             if (previousFollowRedirects) {
                 redirectionPath = client.followRedirection(propFindMethod)

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java

@@ -77,8 +77,6 @@ protected RemoteOperationResult<ArrayList<RemoteFile>> run(OwnCloudClient client
                     DavConstants.DEPTH_1,
                     DavUtils.getAllPropset());
 
-            client.setFollowRedirects(true);
-
             int status = client.executeHttpMethod(propfindMethod);
 
             if (isSuccess(status)) {

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt

@@ -55,6 +55,7 @@ class GetOIDCDiscoveryRemoteOperation : RemoteOperation<OIDCDiscoveryResponse>()
                 addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE)
             }
 
+            getMethod.setFollowRedirects(true)
             val status = client.executeHttpMethod(getMethod)
 
             val responseBody = getMethod.getResponseBodyAsString()