mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4046 from nextcloud/fix-issues-sso-ocs-header

Browse source 
throw exception if sso users try to set the OCS-APIREQUEST header the…
This commit is contained in:
Andy Scherzinger 2019-05-21 15:23:02 +02:00 committed by GitHub
commit 762a80666f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/com/nextcloud/android/sso/InputStreamBinder.java
View file

@ -32,6 +32,7 @@ import android.os.Binder;
import android.os.ParcelFileDescriptor;
import android.text.TextUtils;
import android.util.Log;
import com.nextcloud.android.sso.aidl.IInputStreamService;
import com.nextcloud.android.sso.aidl.NextcloudRequest;
import com.nextcloud.android.sso.aidl.ParcelFileDescriptorUtil;
@ -42,6 +43,7 @@ import com.owncloud.android.lib.common.OwnCloudClientManager;
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.utils.EncryptionUtils;
import org.apache.commons.httpclient.HttpConnection;
import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.HttpState;
@ -112,8 +114,9 @@ public class InputStreamBinder extends IInputStreamService.Stub {
return performNextcloudRequestAndBodyStream(input, null);
}
public ParcelFileDescriptor performNextcloudRequestAndBodyStream(ParcelFileDescriptor input,
ParcelFileDescriptor requestBodyParcelFileDescriptor) {
public ParcelFileDescriptor performNextcloudRequestAndBodyStream(
ParcelFileDescriptor input,
ParcelFileDescriptor requestBodyParcelFileDescriptor) {
// read the input
final InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(input);
@ -192,11 +195,10 @@ public class InputStreamBinder extends IInputStreamService.Stub {
case "POST":
method = new PostMethod(requestUrl);
if(requestBodyInputStream != null){
if (requestBodyInputStream != null) {
RequestEntity requestEntity = new InputStreamRequestEntity(requestBodyInputStream);
((PostMethod) method).setRequestEntity(requestEntity);
}
else if (request.getRequestBody() != null) {
} else if (request.getRequestBody() != null) {
StringRequestEntity requestEntity = new StringRequestEntity(
request.getRequestBody(),
CONTENT_TYPE_APPLICATION_JSON,
@ -207,11 +209,10 @@ public class InputStreamBinder extends IInputStreamService.Stub {
case "PUT":
method = new PutMethod(requestUrl);
if(requestBodyInputStream != null){
if (requestBodyInputStream != null) {
RequestEntity requestEntity = new InputStreamRequestEntity(requestBodyInputStream);
((PutMethod) method).setRequestEntity(requestEntity);
}
else if (request.getRequestBody() != null) {
} else if (request.getRequestBody() != null) {
StringRequestEntity requestEntity = new StringRequestEntity(
request.getRequestBody(),
CONTENT_TYPE_APPLICATION_JSON,
@ -252,7 +253,7 @@ public class InputStreamBinder extends IInputStreamService.Stub {
com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException,
OperationCanceledException, AuthenticatorException, IOException {
Account account = AccountUtils.getOwnCloudAccountByName(context, request.getAccountName());
if(account == null) {
if (account == null) {
throw new IllegalStateException(EXCEPTION_ACCOUNT_NOT_FOUND);
}
@ -276,9 +277,15 @@ public class InputStreamBinder extends IInputStreamService.Stub {
method.setQueryString(convertMapToNVP(request.getParameter()));
method.addRequestHeader("OCS-APIREQUEST", "true");
for(Map.Entry<String, List<String>> header : request.getHeader().entrySet()) {
for (Map.Entry<String, List<String>> header : request.getHeader().entrySet()) {
// https://stackoverflow.com/a/3097052
method.addRequestHeader(header.getKey(), TextUtils.join(",", header.getValue()));
if ("OCS-APIREQUEST".equalsIgnoreCase(header.getKey())) {
throw new IllegalStateException(
"The 'OCS-APIREQUEST' header will be automatically added by the Nextcloud SSO Library. " +
"Please remove the header before making a request");
}
}
client.setFollowRedirects(request.isFollowRedirects());
@ -301,7 +308,8 @@ public class InputStreamBinder extends IInputStreamService.Stub {
Log_OC.e(TAG, total.toString());
}
throw new IllegalStateException(EXCEPTION_HTTP_REQUEST_FAILED,
new IllegalStateException(String.valueOf(status), new Throwable(total.toString())));
new IllegalStateException(String.valueOf(status),
new Throwable(total.toString())));
}
}
@ -309,7 +317,7 @@ public class InputStreamBinder extends IInputStreamService.Stub {
String callingPackageName = context.getPackageManager().getNameForUid(Binder.getCallingUid());
SharedPreferences sharedPreferences = context.getSharedPreferences(SSO_SHARED_PREFERENCE,
Context.MODE_PRIVATE);
Context.MODE_PRIVATE);
String hash = sharedPreferences.getString(callingPackageName + DELIMITER + request.getAccountName(), "");
return validateToken(hash, request.getToken());
}