Merge pull request #663 from janakamarasena/master

Add synapse configs to handle mutual ssl auth for android
revert-dabc3590
Amal Gunatilake 8 years ago committed by GitHub
commit ddc1e8bef4

@ -0,0 +1,40 @@
<?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.handlers.AuthenticationHandler"/>
</handlers>
</api>

@ -0,0 +1,87 @@
<?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.handlers.AuthenticationHandler"/>
</handlers>
</api>

@ -0,0 +1,39 @@
<?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.handlers.AuthenticationHandler"/>
</handlers>
</api>

@ -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);\

@ -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 -->

Loading…
Cancel
Save