community
/
device-mgt-plugins
10
0
Fork 39
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x

Browse Source
merge-requests/1/head
kamidu 8 years ago
parent eb9c789b51 5c27cb9e6e
commit 09de477e74
4 changed files with 94 additions and 87 deletions
Show Stats Download Patch File Download Diff File

19
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationCode.java
Unescape View File

@ -114,15 +114,16 @@ public class OperationCode {
CAMERA_STATUS("./Vendor/MSFT/PolicyManager/Device/Camera/AllowCamera"), CAMERA_STATUS("./Vendor/MSFT/PolicyManager/Device/Camera/AllowCamera"),
ENCRYPT_STORAGE("./Vendor/MSFT/PolicyManager/My/Security/RequireDeviceEncryption"), ENCRYPT_STORAGE("./Vendor/MSFT/PolicyManager/My/Security/RequireDeviceEncryption"),
ENCRYPT_STORAGE_STATUS("./Vendor/MSFT/PolicyManager/Device/Security/RequireDeviceEncryption"), ENCRYPT_STORAGE_STATUS("./Vendor/MSFT/PolicyManager/Device/Security/RequireDeviceEncryption"),
PASSWORD_MAX_FAIL_ATTEMPTS("./Vendor/MSFT/PolicyManager/My/DeviceLock/MaxDevicePasswordFailedAttempts"), PASSWORD_MAX_FAIL_ATTEMPTS("./Vendor/MSFT/DeviceLock/Provider/TestMDMServer/MaxDevicePasswordFailedAttempts"),
DEVICE_PASSWORD_ENABLE("./Vendor/MSFT/PolicyManager/My/DeviceLock/DevicePasswordEnabled"), DEVICE_PASSWORD_ENABLE("./Vendor/MSFT/DeviceLock/Provider/TestMDMServer/DevicePasswordEnabled"),
SIMPLE_PASSWORD("./Vendor/MSFT/PolicyManager/My/DeviceLock/AllowSimpleDevicePassword"), SIMPLE_PASSWORD("./Vendor/MSFT/DeviceLock/Provider/TestMDMServer/AllowSimpleDevicePassword"),
MIN_PASSWORD_LENGTH("./Vendor/MSFT/PolicyManager/My/DeviceLock/MinDevicePasswordLength"), MIN_PASSWORD_LENGTH("./Vendor/MSFT/DeviceLock/Provider/TestMDMServer/MinDevicePasswordLength"),
Alphanumeric_PASSWORD("./Vendor/MSFT/PolicyManager/My/DeviceLock/AlphanumericDevicePasswordRequired"), ALPHANUMERIC_PASSWORD("./Vendor/MSFT/DeviceLock/Provider/TestMDMServer/AlphanumericDevicePasswordRequired"),
PASSWORD_EXPIRE("./Vendor/MSFT/PolicyManager/My/DeviceLock/DevicePasswordExpiration"), PASSWORD_EXPIRE("./Vendor/MSFT/DeviceLock/Provider/TestMDMServer/DevicePasswordExpiration"),
PASSWORD_HISTORY("./Vendor/MSFT/PolicyManager/My/DeviceLock/DevicePasswordHistory"), PASSWORD_HISTORY("./Vendor/MSFT/DeviceLock/Provider/TestMDMServer/DevicePasswordHistory"),
MAX_PASSWORD_INACTIVE_TIME("./Vendor/MSFT/PolicyManager/My/DeviceLock/MaxInactivityTimeDeviceLock"), MAX_PASSWORD_INACTIVE_TIME("./Vendor/MSFT/DeviceLock/Provider/TestMDMServer/MaxInactivityTimeDeviceLock"),
MIN_PASSWORD_COMPLEX_CHARACTERS("./Vendor/MSFT/PolicyManager/My/DeviceLock/MinDevicePasswordComplexCharacters"); MIN_PASSWORD_COMPLEX_CHARACTERS("./Vendor/MSFT/DeviceLock/Provider/TestMDMServer/MinDevicePasswordComplexCharacters");
private final String code; private final String code;

104
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/OperationReply.java
Unescape View File

@ -316,7 +316,9 @@ public class OperationReply {
if (this.syncmlDocument.getBody().getAlert() != null) { if (this.syncmlDocument.getBody().getAlert() != null) {
if (Constants.INITIAL_ALERT_DATA.equals(this.syncmlDocument.getBody(). if (Constants.INITIAL_ALERT_DATA.equals(this.syncmlDocument.getBody().
getAlert().getData())) { getAlert().getData()) || Constants.INITIAL_WIN10_ALERT_DATA.
equals(this.syncmlDocument.getBody()
.getAlert().getData())) {
monitorSequence.setCommandId(operation.getId()); monitorSequence.setCommandId(operation.getId());
DeviceIdentifier deviceIdentifier = convertToDeviceIdentifierObject( DeviceIdentifier deviceIdentifier = convertToDeviceIdentifierObject(
@ -740,45 +742,105 @@ public class OperationReply {
} }
public AddTag generatePasscodeBooleanData(Operation operation, Configure configure) { public AddTag generatePasscodeBooleanData(Operation operation, Configure configure) {
TargetTag target = new TargetTag();
MetaTag meta = new MetaTag();
AddTag addTag = null; AddTag addTag = null;
PasscodePolicy passcodePolicy = gson.fromJson((String) operation.getPayLoad(), PasscodePolicy.class); PasscodePolicy passcodePolicy = gson.fromJson((String) operation.getPayLoad(), PasscodePolicy.class);
if (operation.getCode() != null && (PluginConstants.OperationCodes.DEVICE_PASSWORD_ENABLE. if (operation.getCode() != null && (PluginConstants.OperationCodes.DEVICE_PASSWORD_ENABLE.
equals(configure.name()))) { equals(configure.name()))) {
if (passcodePolicy.isEnablePassword()) { if (passcodePolicy.isEnablePassword()) {
target.setLocURI(configure.getCode()); addTag = new AddTag();
meta.setFormat(Constants.META_FORMAT_INT); List<ItemTag> itemList = new ArrayList<>();
addTag = TagUtil.buildAddTag(operation, Constants.SyncMLResponseCodes.NEGATIVE_CSP_DATA); ItemTag item = new ItemTag();
TargetTag targetTag = new TargetTag();
targetTag.setLocURI(configure.getCode());
MetaTag metaag = new MetaTag();
metaag.setFormat(Constants.META_FORMAT_INT);
item.setTarget(targetTag);
item.setMeta(metaag);
item.setData(Constants.SyncMLResponseCodes.NEGATIVE_CSP_DATA);
itemList.add(item);
addTag.setCommandId(Constants.SyncmlMessageCodes.addCommandId);
addTag.setItems(itemList);
} else { } else {
target.setLocURI(configure.getCode()); addTag = new AddTag();
meta.setFormat(Constants.META_FORMAT_INT); List<ItemTag> itemList = new ArrayList<>();
addTag = TagUtil.buildAddTag(operation, Constants.SyncMLResponseCodes.POSITIVE_CSP_DATA); ItemTag item = new ItemTag();
TargetTag targetTag = new TargetTag();
targetTag.setLocURI(configure.getCode());
MetaTag metaag = new MetaTag();
metaag.setFormat(Constants.META_FORMAT_INT);
item.setTarget(targetTag);
item.setMeta(metaag);
item.setData(Constants.SyncMLResponseCodes.POSITIVE_CSP_DATA);
itemList.add(item);
addTag.setCommandId(Constants.SyncmlMessageCodes.addCommandId);
addTag.setItems(itemList);
} }
} }
if (PluginConstants.OperationCodes.ALPHANUMERIC_PASSWORD. if (PluginConstants.OperationCodes.ALPHANUMERIC_PASSWORD.
equals(configure.name())) { equals(configure.name())) {
if (passcodePolicy.isRequireAlphanumeric()) { if (passcodePolicy.isRequireAlphanumeric()) {
target.setLocURI(configure.getCode()); addTag = new AddTag();
meta.setFormat(Constants.META_FORMAT_INT); List<ItemTag> itemList = new ArrayList<>();
addTag = TagUtil.buildAddTag(operation, Constants.SyncMLResponseCodes.POSITIVE_CSP_DATA); ItemTag item = new ItemTag();
TargetTag targetTag = new TargetTag();
targetTag.setLocURI(configure.getCode());
MetaTag metaag = new MetaTag();
metaag.setFormat(Constants.META_FORMAT_INT);
item.setTarget(targetTag);
item.setMeta(metaag);
item.setData(Constants.SyncMLResponseCodes.POSITIVE_CSP_DATA);
itemList.add(item);
addTag.setCommandId(Constants.SyncmlMessageCodes.addCommandId);
addTag.setItems(itemList);
} else { } else {
target.setLocURI(configure.getCode()); addTag = new AddTag();
meta.setFormat(Constants.META_FORMAT_INT); List<ItemTag> itemList = new ArrayList<>();
addTag = TagUtil.buildAddTag(operation, Constants.SyncMLResponseCodes.NEGATIVE_CSP_DATA); ItemTag item = new ItemTag();
TargetTag targetTag = new TargetTag();
targetTag.setLocURI(configure.getCode());
MetaTag metaag = new MetaTag();
metaag.setFormat(Constants.META_FORMAT_INT);
item.setTarget(targetTag);
item.setMeta(metaag);
item.setData(Constants.SyncMLResponseCodes.NEGATIVE_CSP_DATA);
itemList.add(item);
addTag.setCommandId(Constants.SyncmlMessageCodes.addCommandId);
addTag.setItems(itemList);
} }
} }
if (PluginConstants.OperationCodes.SIMPLE_PASSWORD. if (PluginConstants.OperationCodes.SIMPLE_PASSWORD.
equals(configure.name())) { equals(configure.name())) {
if (passcodePolicy.isAllowSimple()) { if (passcodePolicy.isAllowSimple()) {
target.setLocURI(configure.getCode()); addTag = new AddTag();
meta.setFormat(Constants.META_FORMAT_INT); List<ItemTag> itemList = new ArrayList<>();
addTag = TagUtil.buildAddTag(operation, Constants.SyncMLResponseCodes.POSITIVE_CSP_DATA); ItemTag item = new ItemTag();
TargetTag targetTag = new TargetTag();
targetTag.setLocURI(configure.getCode());
MetaTag metaag = new MetaTag();
metaag.setFormat(Constants.META_FORMAT_INT);
item.setTarget(targetTag);
item.setMeta(metaag);
item.setData(Constants.SyncMLResponseCodes.POSITIVE_CSP_DATA);
itemList.add(item);
addTag.setCommandId(Constants.SyncmlMessageCodes.addCommandId);
addTag.setItems(itemList);
} else { } else {
target.setLocURI(configure.getCode()); addTag = new AddTag();
meta.setFormat(Constants.META_FORMAT_INT); List<ItemTag> itemList = new ArrayList<>();
addTag = TagUtil.buildAddTag(operation, Constants.SyncMLResponseCodes.NEGATIVE_CSP_DATA); ItemTag item = new ItemTag();
TargetTag targetTag = new TargetTag();
targetTag.setLocURI(configure.getCode());
MetaTag metaag = new MetaTag();
metaag.setFormat(Constants.META_FORMAT_INT);
item.setTarget(targetTag);
item.setMeta(metaag);
item.setData(Constants.SyncMLResponseCodes.NEGATIVE_CSP_DATA);
itemList.add(item);
addTag.setCommandId(Constants.SyncmlMessageCodes.addCommandId);
addTag.setItems(itemList);
} }
} }
return addTag; return addTag;

56
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/operations/util/TagUtil.java
Unescape View File

@ -1,56 +0,0 @@
/*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* you may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.mobile.windows.api.operations.util;
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.AddTag;
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.ItemTag;
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.MetaTag;
import org.wso2.carbon.device.mgt.mobile.windows.api.operations.TargetTag;
import java.util.ArrayList;
import java.util.List;
/**
* Contains utility methods which are used while creating Syncml Messages.
*/
public class TagUtil {
/**
* Build syncml AddTag for Device response message.
*
* @param operation Policy operation
* @param data Configuration service provider(CSP) data value 1/0
* @return Syncml AddTag type object.
*/
public static AddTag buildAddTag(Operation operation, String data) {
TargetTag target = new TargetTag();
MetaTag meta = new MetaTag();
AddTag add = new AddTag();
List<ItemTag> itemTags = new ArrayList<>();
ItemTag itemTag = new ItemTag();
itemTag.setTarget(target);
itemTag.setMeta(meta);
itemTag.setData(data);
itemTags.add(itemTag);
add.setCommandId(operation.getId());
add.setItems(itemTags);
return add;
}
}

2
pom.xml
Unescape View File

@ -1290,7 +1290,7 @@
<!-- Carbon Analytics --> <!-- Carbon Analytics -->
<carbon.analytics.common.version>5.1.3</carbon.analytics.common.version> <carbon.analytics.common.version>5.1.3</carbon.analytics.common.version>
<carbon.analytics.common.version.range>[5.1.3,6.0.0)</carbon.analytics.common.version.range> <carbon.analytics.common.version.range>[5.1.3,6.0.0)</carbon.analytics.common.version.range>
<carbon.analytics.version>1.3.0</carbon.analytics.version> <carbon.analytics.version>1.3.3</carbon.analytics.version>
<carbon.analytics.version.range>[1.3.0,2.0.0)</carbon.analytics.version.range> <carbon.analytics.version.range>[1.3.0,2.0.0)</carbon.analytics.version.range>
<carbon.event.processing.version>2.1.4</carbon.event.processing.version> <carbon.event.processing.version>2.1.4</carbon.event.processing.version>

Write Preview
Loading…
Cancel
Save