From 7db99295f5c2fa1dae6eec63628c9374c012e131 Mon Sep 17 00:00:00 2001
From: Janak Amarasena <janakamarasena@gmail.com>
Date: Fri, 28 Apr 2017 16:58:21 +0530
Subject: [PATCH 1/3] Add synapse configs to handle mutual ssl auth for android

---
 ...id-Mutual-SSL-Configuration-Management.xml | 49 ++++++++++
 ...--Android-Mutual-SSL-Device-Management.xml | 96 +++++++++++++++++++
 ...min--Android-Mutual-SSL-Event-Receiver.xml | 48 ++++++++++
 .../src/main/resources/p2.inf                 |  3 +
 4 files changed, 196 insertions(+)
 create mode 100644 features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Configuration-Management.xml
 create mode 100644 features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Device-Management.xml
 create mode 100644 features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Event-Receiver.xml

diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Configuration-Management.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Configuration-Management.xml
new file mode 100644
index 0000000000..68abdccad6
--- /dev/null
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Configuration-Management.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api xmlns="http://ws.apache.org/ns/synapse"
+     name="admin--Android-Mutual-SSL-Configuration-Management"
+     context="/api/device-mgt/android/mssl/v1.0/configuration">
+   <resource methods="GET" url-mapping="/license" faultSequence="fault">
+      <inSequence>
+         <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+         <send>
+            <endpoint name="admin--Android Mutual SSL Configuration Management_APIproductionEndpoint_0">
+               <http uri-template="https://localhost:9443/api/device-mgt/android/v1.0/configuration"/>
+               <property name="ENDPOINT_ADDRESS"
+                         value="https://localhost:9443/api/device-mgt/android/v1.0/configuration"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+         <send/>
+      </outSequence>
+   </resource>
+   <resource methods="PUT GET" url-mapping="/*" faultSequence="fault">
+      <inSequence>
+         <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+         <send>
+            <endpoint name="admin--Android Mutual SSL Configuration Management_APIproductionEndpoint_1">
+               <http uri-template="https://localhost:9443/api/device-mgt/android/v1.0/configuration"/>
+               <property name="ENDPOINT_ADDRESS"
+                         value="https://localhost:9443/api/device-mgt/android/v1.0/configuration"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+         <send/>
+      </outSequence>
+   </resource>
+   <handlers>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+         <property name="apiImplementationType" value="ENDPOINT"/>
+      </handler>
+      <handler class="org.wso2.carbon.apimgt.handlers.AuthenticationHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+         <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+      </handler>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+   </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Device-Management.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Device-Management.xml
new file mode 100644
index 0000000000..3309b14f3d
--- /dev/null
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Device-Management.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api xmlns="http://ws.apache.org/ns/synapse" name="admin--Android-Mutual-SSL-Device-Management"
+     context="/api/device-mgt/android/mssl/v1.0/devices">
+   <resource methods="GET" uri-template="/{id}/status" faultSequence="fault">
+      <inSequence>
+         <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+         <send>
+            <endpoint name="admin--Android Mutual SSL Device Management_APIproductionEndpoint_0">
+               <http uri-template="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+               <property name="ENDPOINT_ADDRESS"
+                         value="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+         <send/>
+      </outSequence>
+   </resource>
+   <resource methods="DELETE PUT" uri-template="/{id}" faultSequence="fault">
+      <inSequence>
+         <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+         <send>
+            <endpoint name="admin--Android Mutual SSL Device Management_APIproductionEndpoint_1">
+               <http uri-template="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+               <property name="ENDPOINT_ADDRESS"
+                         value="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+         <send/>
+      </outSequence>
+   </resource>
+   <resource methods="PUT" uri-template="/{id}/applications" faultSequence="fault">
+      <inSequence>
+         <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+         <send>
+            <endpoint name="admin--Android Mutual SSL Device Management_APIproductionEndpoint_2">
+               <http uri-template="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+               <property name="ENDPOINT_ADDRESS"
+                         value="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+         <send/>
+      </outSequence>
+   </resource>
+   <resource methods="POST" url-mapping="/*" faultSequence="fault">
+      <inSequence>
+         <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+         <send>
+            <endpoint name="admin--Android Mutual SSL Device Management_APIproductionEndpoint_3">
+               <http uri-template="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+               <property name="ENDPOINT_ADDRESS"
+                         value="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+         <send/>
+      </outSequence>
+   </resource>
+   <resource methods="PUT" uri-template="/{id}/pending-operations" faultSequence="fault">
+      <inSequence>
+         <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+         <send>
+            <endpoint name="admin--Android Mutual SSL Device Management_APIproductionEndpoint_4">
+               <http uri-template="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+               <property name="ENDPOINT_ADDRESS"
+                         value="https://localhost:9443/api/device-mgt/android/v1.0/devices"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+         <send/>
+      </outSequence>
+   </resource>
+   <handlers>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+         <property name="apiImplementationType" value="ENDPOINT"/>
+      </handler>
+      <handler class="org.wso2.carbon.apimgt.handlers.AuthenticationHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+         <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+      </handler>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+   </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Event-Receiver.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Event-Receiver.xml
new file mode 100644
index 0000000000..7836dd8a2c
--- /dev/null
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Event-Receiver.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<api xmlns="http://ws.apache.org/ns/synapse" name="admin--Android-Mutual-SSL-Event-Receiver"
+     context="/api/device-mgt/android/mssl/v1.0/events">
+   <resource methods="GET" url-mapping="/*" faultSequence="fault">
+      <inSequence>
+         <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+         <send>
+            <endpoint name="admin--Android Mutual SSL Event Receiver_APIproductionEndpoint_0">
+               <http uri-template="https://localhost:9443/api/device-mgt/android/v1.0/events"/>
+               <property name="ENDPOINT_ADDRESS"
+                         value="https://localhost:9443/api/device-mgt/android/v1.0/events"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+         <send/>
+      </outSequence>
+   </resource>
+   <resource methods="POST" url-mapping="/publish" faultSequence="fault">
+      <inSequence>
+         <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+         <send>
+            <endpoint name="admin--Android Event Receiver_APIproductionEndpoint_1">
+               <http uri-template="https://localhost:9443/api/device-mgt/android/v1.0/events"/>
+               <property name="ENDPOINT_ADDRESS"
+                         value="https://localhost:9443/api/device-mgt/android/v1.0/events"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+         <send/>
+      </outSequence>
+   </resource>
+   <handlers>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+         <property name="apiImplementationType" value="ENDPOINT"/>
+      </handler>
+      <handler class="org.wso2.carbon.apimgt.handlers.AuthenticationHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
+         <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
+      </handler>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
+   </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
index 838bf97d3a..0bee863963 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/p2.inf
@@ -13,6 +13,9 @@ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../featur
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/devicetypes/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/devicetypes/,target:${installFolder}/../../deployment/server/devicetypes/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/email/templates,target:${installFolder}/../../../repository/resources/email-templates,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/apis/admin--Android-Mutual-SSL-Configuration-Management.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Android-Mutual-SSL-Configuration-Management.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/apis/admin--Android-Mutual-SSL-Device-Management.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Android-Mutual-SSL-Device-Management.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.android_${feature.version}/apis/admin--Android-Mutual-SSL-Event-Receiver.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Android-Mutual-SSL-Event-Receiver.xml,overwrite:true);\
 
 instructions.unconfigure = \
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/mdm-android-agent.war);\

From 67510b007f6792b9c33c070a976aeca6f3eff198 Mon Sep 17 00:00:00 2001
From: Janak Amarasena <janakamarasena@gmail.com>
Date: Tue, 2 May 2017 17:02:53 +0530
Subject: [PATCH 2/3] Removed unwanted handlers

---
 ...dmin--Android-Mutual-SSL-Configuration-Management.xml | 9 ---------
 .../apis/admin--Android-Mutual-SSL-Device-Management.xml | 9 ---------
 .../apis/admin--Android-Mutual-SSL-Event-Receiver.xml    | 9 ---------
 3 files changed, 27 deletions(-)

diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Configuration-Management.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Configuration-Management.xml
index 68abdccad6..41596567af 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Configuration-Management.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Configuration-Management.xml
@@ -35,15 +35,6 @@
       </outSequence>
    </resource>
    <handlers>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
-         <property name="apiImplementationType" value="ENDPOINT"/>
-      </handler>
       <handler class="org.wso2.carbon.apimgt.handlers.AuthenticationHandler"/>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-         <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-      </handler>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
    </handlers>
 </api>
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Device-Management.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Device-Management.xml
index 3309b14f3d..d7fa119def 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Device-Management.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Device-Management.xml
@@ -82,15 +82,6 @@
       </outSequence>
    </resource>
    <handlers>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
-         <property name="apiImplementationType" value="ENDPOINT"/>
-      </handler>
       <handler class="org.wso2.carbon.apimgt.handlers.AuthenticationHandler"/>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-         <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-      </handler>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
    </handlers>
 </api>
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Event-Receiver.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Event-Receiver.xml
index 7836dd8a2c..e39eb25e96 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Event-Receiver.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/apis/admin--Android-Mutual-SSL-Event-Receiver.xml
@@ -34,15 +34,6 @@
       </outSequence>
    </resource>
    <handlers>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
-         <property name="apiImplementationType" value="ENDPOINT"/>
-      </handler>
       <handler class="org.wso2.carbon.apimgt.handlers.AuthenticationHandler"/>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-         <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-      </handler>
-      <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
    </handlers>
 </api>

From 477ff6faeeca7d562d86d816f5b6f9f6600de06d Mon Sep 17 00:00:00 2001
From: Janak Amarasena <janakamarasena@gmail.com>
Date: Tue, 2 May 2017 17:30:58 +0530
Subject: [PATCH 3/3] Changed CDM version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aed7d4e4af..b02357140a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1128,7 +1128,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>2.0.49</carbon.devicemgt.version>
+        <carbon.devicemgt.version>2.0.56</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[2.0.0, 3.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->