flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Fixed check of HTTPS downgrade so that works with multiple redirections, and done without an extra request

Browse Source
This commit is contained in:
David A. Velasco 2014-08-06 10:59:33 +02:00
parent 585054092d
commit 07f3d9caae
1 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
View File

@ -40,7 +40,6 @@ import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.common.accounts.AccountUtils;
import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
/** /**
* Checks if the server is valid and if the server supports the Share API * Checks if the server is valid and if the server supports the Share API
@ -52,7 +51,10 @@ import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
public class GetRemoteStatusOperation extends RemoteOperation { public class GetRemoteStatusOperation extends RemoteOperation {
/** Maximum time to wait for a response from the server when the connection is being tested, in MILLISECONDs. */ /**
* Maximum time to wait for a response from the server when the connection is being tested,
* in MILLISECONDs.
*/
public static final int TRY_CONNECTION_TIMEOUT = 5000; public static final int TRY_CONNECTION_TIMEOUT = 5000;
private static final String TAG = GetRemoteStatusOperation.class.getSimpleName(); private static final String TAG = GetRemoteStatusOperation.class.getSimpleName();
@ -73,7 +75,36 @@ public class GetRemoteStatusOperation extends RemoteOperation {
String baseUrlSt = client.getBaseUri().toString(); String baseUrlSt = client.getBaseUri().toString();
try { try {
get = new GetMethod(baseUrlSt + AccountUtils.STATUS_PATH); get = new GetMethod(baseUrlSt + AccountUtils.STATUS_PATH);
client.setFollowRedirects(false);
boolean isRedirectToNonSecureConnection = false;
int status = client.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT); int status = client.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
mLatestResult = new RemoteOperationResult(
(status == HttpStatus.SC_OK),
status,
get.getResponseHeaders()
);
if (baseUrlSt.startsWith("https://")) {
String redirectedLocation = mLatestResult.getRedirectedLocation();
while (redirectedLocation != null && redirectedLocation.length() > 0
&& !mLatestResult.isSuccess()) {
isRedirectToNonSecureConnection = redirectedLocation.startsWith("http://");
get.releaseConnection();
get = new GetMethod(redirectedLocation);
status = client.executeMethod(
get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT
);
mLatestResult = new RemoteOperationResult(
(status == HttpStatus.SC_OK),
status,
get.getResponseHeaders()
);
redirectedLocation = mLatestResult.getRedirectedLocation();
}
}
String response = get.getResponseBodyAsString(); String response = get.getResponseBodyAsString();
if (status == HttpStatus.SC_OK) { if (status == HttpStatus.SC_OK) {
JSONObject json = new JSONObject(response); JSONObject json = new JSONObject(response);
@ -88,35 +119,19 @@ public class GetRemoteStatusOperation extends RemoteOperation {
RemoteOperationResult.ResultCode.BAD_OC_VERSION); RemoteOperationResult.ResultCode.BAD_OC_VERSION);
} else { } else {
mLatestResult = new RemoteOperationResult( // success
baseUrlSt.startsWith("https://") ? if (isRedirectToNonSecureConnection) {
RemoteOperationResult.ResultCode.OK_SSL : mLatestResult = new RemoteOperationResult(
RemoteOperationResult.ResultCode.OK_NO_SSL RemoteOperationResult.ResultCode.
); OK_REDIRECT_TO_NON_SECURE_CONNECTION
);
RemoteOperation operation = new ExistenceCheckRemoteOperation("", mContext, false); } else {
client.setFollowRedirects(false); mLatestResult = new RemoteOperationResult(
boolean isRedirectToNonSecureConnection = false; baseUrlSt.startsWith("https://") ?
RemoteOperationResult.ResultCode.OK_SSL :
// checks if there are any reconnection to a non secure RemoteOperationResult.ResultCode.OK_NO_SSL
// connection );
RemoteOperationResult result = operation.execute(client); }
String redirectedLocation = result.getRedirectedLocation();
while (baseUrlSt.startsWith("https://") && redirectedLocation != null
&& redirectedLocation.length() > 0
&& result.isNonSecureRedirection()) {
client.setBaseUri(Uri.parse(result.getRedirectedLocation()));
result = operation.execute(client);
redirectedLocation = result.getRedirectedLocation();
isRedirectToNonSecureConnection = true;
break;
}
if (isRedirectToNonSecureConnection) {
mLatestResult = new RemoteOperationResult(
RemoteOperationResult.ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION);
}
ArrayList<Object> data = new ArrayList<Object>(); ArrayList<Object> data = new ArrayList<Object>();
data.add(ocVersion); data.add(ocVersion);
@ -145,7 +160,8 @@ public class GetRemoteStatusOperation extends RemoteOperation {
Log.i(TAG, "Connection check at " + baseUrlSt + ": " + mLatestResult.getLogMessage()); Log.i(TAG, "Connection check at " + baseUrlSt + ": " + mLatestResult.getLogMessage());
} else if (mLatestResult.getException() != null) { } else if (mLatestResult.getException() != null) {
Log.e(TAG, "Connection check at " + baseUrlSt + ": " + mLatestResult.getLogMessage(), mLatestResult.getException()); Log.e(TAG, "Connection check at " + baseUrlSt + ": " + mLatestResult.getLogMessage(),
mLatestResult.getException());
} else { } else {
Log.e(TAG, "Connection check at " + baseUrlSt + ": " + mLatestResult.getLogMessage()); Log.e(TAG, "Connection check at " + baseUrlSt + ": " + mLatestResult.getLogMessage());