community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding payload validation for global proxy

Browse Source
This commit is contained in:
Madawa Soysa 2019-02-08 21:37:20 +11:00
parent 601f527fb5
commit f19ce5f8e1
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/GlobalProxy.java
View File

@ -21,6 +21,7 @@ package org.wso2.carbon.mdm.services.android.bean;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang.StringUtils;
import java.io.Serializable; import java.io.Serializable;
@ -66,6 +67,22 @@ public class GlobalProxy extends AndroidOperation implements Serializable {
) )
private String proxyPacUrl; private String proxyPacUrl;
public boolean validateRequest() {
if (ProxyType.MANUAL.equals(this.proxyConfigType)) {
if (StringUtils.isEmpty(this.proxyHost)) {
return false;
}
if (this.proxyPort < 0 || this.proxyPort > 65535) {
return false;
}
} else if (ProxyType.AUTO.equals(this.proxyConfigType)) {
if (StringUtils.isEmpty(proxyPacUrl)) {
return false;
}
}
return false;
}
public ProxyType getProxyConfigType() { public ProxyType getProxyConfigType() {
return proxyConfigType; return proxyConfigType;
} }

21
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java
View File

@ -995,14 +995,21 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
} }
GlobalProxy globalProxy = globalProxyBeanWrapper.getOperation(); GlobalProxy globalProxy = globalProxyBeanWrapper.getOperation();
ProfileOperation operation = new ProfileOperation(); if (globalProxy.validateRequest()) {
operation.setCode(AndroidConstants.OperationCodes.GLOBAL_PROXY); ProfileOperation operation = new ProfileOperation();
operation.setType(Operation.Type.PROFILE); operation.setCode(AndroidConstants.OperationCodes.GLOBAL_PROXY);
operation.setPayLoad(globalProxy.toJSON()); operation.setType(Operation.Type.PROFILE);
operation.setPayLoad(globalProxy.toJSON());
Activity activity = AndroidDeviceUtils Activity activity = AndroidDeviceUtils
.getOperationResponse(globalProxyBeanWrapper.getDeviceIDs(), operation); .getOperationResponse(globalProxyBeanWrapper.getDeviceIDs(), operation);
return Response.status(Response.Status.CREATED).entity(activity).build(); return Response.status(Response.Status.CREATED).entity(activity).build();
} else {
String errorMessage = "The payload of the global proxy operation is incorrect";
log.error(errorMessage);
throw new BadRequestException(
new ErrorResponse.ErrorResponseBuilder().setCode(400L).setMessage(errorMessage).build());
}
} catch (InvalidDeviceException e) { } catch (InvalidDeviceException e) {
String errorMessage = "Invalid Device Identifiers found."; String errorMessage = "Invalid Device Identifiers found.";
log.error(errorMessage, e); log.error(errorMessage, e);