Skip to content

do not use ocClient for anonymous connections #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 1 commit into from
Aug 20, 2019
Merged

do not use ocClient for anonymous connections #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...d/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public RegisterAccountDeviceForNotificationsOperation(String pushTokenHash, Stri

@Override
protected RemoteOperationResult run(OwnCloudClient client) {
RemoteOperationResult result = null;
int status = -1;
RemoteOperationResult result;
int status;
PushResponse pushResponse;
PostMethod post = null;

Expand Down Expand Up @@ -109,11 +109,9 @@ protected RemoteOperationResult run(OwnCloudClient client) {
result = new RemoteOperationResult(false, status, post.getResponseHeaders());
}
}

} catch (Exception e) {
result = new RemoteOperationResult(e);
Log_OC.e(TAG, "Exception while registering device for notifications", e);

} finally {
if (post != null) {
post.releaseConnection();
Expand Down
21 changes: 9 additions & 12 deletions .../owncloud/android/lib/resources/notifications/RegisterAccountDeviceForProxyOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,19 @@
*/
package com.owncloud.android.lib.resources.notifications;

import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC;

import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.PostMethod;

import java.net.URLEncoder;

public class RegisterAccountDeviceForProxyOperation extends RemoteOperation {
import static com.owncloud.android.lib.common.operations.RemoteOperation.CONTENT_TYPE;
import static com.owncloud.android.lib.common.operations.RemoteOperation.FORM_URLENCODED;

public class RegisterAccountDeviceForProxyOperation {
private static final String PROXY_ROUTE = "/devices";

private static final String TAG = RegisterAccountDeviceForProxyOperation.class.getSimpleName();
Expand All @@ -62,10 +64,9 @@ public RegisterAccountDeviceForProxyOperation(String proxyUrl, String pushToken,
this.userPublicKey = userPublicKey;
}

@Override
protected RemoteOperationResult run(OwnCloudClient client) {
RemoteOperationResult result = null;
int status = -1;
public RemoteOperationResult run() {
RemoteOperationResult result;
int status;
PostMethod post = null;

try {
Expand All @@ -77,13 +78,9 @@ protected RemoteOperationResult run(OwnCloudClient client) {
uriToPost += USER_PUBLIC_KEY + "=" + URLEncoder.encode(userPublicKey);

post = new PostMethod(uriToPost);
post.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);

post.setRequestHeader(CONTENT_TYPE, FORM_URLENCODED);

client.clearCredentials();

status = client.executeMethod(post);
status = new HttpClient().executeMethod(post);
String response = post.getResponseBodyAsString();

if(isSuccess(status)) {
Expand Down
20 changes: 9 additions & 11 deletions ...wncloud/android/lib/resources/notifications/UnregisterAccountDeviceForProxyOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,19 @@
*/
package com.owncloud.android.lib.resources.notifications;

import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.HttpDeleteWithBody;
import com.owncloud.android.lib.common.utils.Log_OC;

import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;

import java.net.URLEncoder;

public class UnregisterAccountDeviceForProxyOperation extends RemoteOperation {
import static com.owncloud.android.lib.common.operations.RemoteOperation.CONTENT_TYPE;
import static com.owncloud.android.lib.common.operations.RemoteOperation.FORM_URLENCODED;

public class UnregisterAccountDeviceForProxyOperation {
private static final String PROXY_ROUTE = "/devices";

private static final String TAG = RegisterAccountDeviceForProxyOperation.class.getSimpleName();
Expand All @@ -59,10 +61,9 @@ public UnregisterAccountDeviceForProxyOperation(String proxyUrl, String deviceId
this.userPublicKey = userPublicKey;
}

@Override
protected RemoteOperationResult run(OwnCloudClient client) {
RemoteOperationResult result = null;
int status = -1;
public RemoteOperationResult run() {
RemoteOperationResult result;
int status;
HttpDeleteWithBody delete = null;

try {
Expand All @@ -73,12 +74,9 @@ protected RemoteOperationResult run(OwnCloudClient client) {
uriToPost += USER_PUBLIC_KEY + "=" + URLEncoder.encode(userPublicKey);

delete = new HttpDeleteWithBody(uriToPost);
delete.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
delete.setRequestHeader(CONTENT_TYPE, FORM_URLENCODED);

client.clearCredentials();

status = client.executeMethod(delete);
status = new HttpClient().executeMethod(delete);
String response = delete.getResponseBodyAsString();

if(isSuccess(status)) {
Expand Down