From c436a555bcd4025a139068351792560db24f8519 Mon Sep 17 00:00:00 2001
From: Shabirmean <shabir_tck09@hotmail.com>
Date: Fri, 29 Apr 2016 16:41:19 +0530
Subject: [PATCH] Changes to use keystones provided by default and subsequent
 modifications to the agent enrolment code

---
 .../agent/enrollment/EnrollmentManager.java     |  12 +++++++++---
 .../src/main/resources/certs/wso2certs.jks      | Bin 0 -> 11731 bytes
 .../src/main/resources/p2.inf                   |   3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/certs/wso2certs.jks

diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java
index a4347cbae0..87cd25e28f 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java
@@ -44,6 +44,7 @@ import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentManager;
 import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.exception.AgentCoreOperationException;
 import sun.security.x509.X509CertImpl;
 
+import java.io.IOException;
 import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -82,6 +83,7 @@ public class EnrollmentManager {
     private static final String KEY_PAIR_ALGORITHM = "RSA";
     private static final String PROVIDER = "BC";
     private static final String SIGNATURE_ALG = "SHA1withRSA";
+    private static final String CERT_IS_CA_EXTENSION = "is_ca";
     private static final int KEY_SIZE = 2048;
 
     // Seed to our PRNG. Make sure this is initialised randomly, NOT LIKE THIS
@@ -376,9 +378,9 @@ public class EnrollmentManager {
                         log.debug(((X509Certificate) cert).getIssuerDN().getName());
                     }
 
-                    //TODO: Need to identify the correct certificate.
-                    // I have chosen the CA cert based on its BasicConstraint criticality being set to "true"
-                    if (((X509CertImpl) cert).getBasicConstraintsExtension().isCritical()) {
+                    // I have chosen the CA cert based on its BasicConstraintExtension "is_ca" being set to "true"
+                    // This is because the returned keystore may contain many certificates including RAs.
+                    if (((Boolean) ((X509CertImpl) cert).getBasicConstraintsExtension().get(CERT_IS_CA_EXTENSION))) {
                         serverCertPublicKey = cert.getPublicKey();
                     }
                 }
@@ -396,6 +398,10 @@ public class EnrollmentManager {
             String errorMsg = "Could not retrieve [Server-Certificates] from the response message from SCEP-Server.";
             log.error(errorMsg);
             throw new AgentCoreOperationException(errorMsg, e);
+        } catch (IOException e) {
+            String errorMsg = "Error occurred whilst trying to get property ['is_ca'] from the retreived Certificates";
+            log.error(errorMsg);
+            throw new AgentCoreOperationException(errorMsg, e);
         }
 
         return serverCertPublicKey;
diff --git a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/certs/wso2certs.jks b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/certs/wso2certs.jks
new file mode 100644
index 0000000000000000000000000000000000000000..00589cdf0d75c0f87bdf9dc63d601d58abb3e0d1
GIT binary patch
literal 11731
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
BICB61

literal 0
HcmV?d00001

diff --git a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf
index ec1c2fafbb..1cf4d078d2 100644
--- a/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf
+++ b/features/iot-plugins-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/p2.inf
@@ -14,6 +14,8 @@ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../featur
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../database/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/database/,target:${installFolder}/../../database/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/security/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.virtualfirealarm_${feature.version}/certs/,target:${installFolder}/../../resources/security/,overwrite:true);\
 
 instructions.unconfigure = \
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/device-types/virtual_firealarm.json);\
@@ -30,3 +32,4 @@ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../dep
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.policy-edit);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.policy-view);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../resources/security/wso2certs.jks);\