inosh
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed scep impl from virtual fire alarm

Browse Source
apim420
ayyoob 8 years ago
parent 2025179df0
commit 37969ba0a0
6 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File

5
src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/mqtt/FireAlarmMQTTCommunicator.java
Unescape View File

@ -208,7 +208,10 @@ public class FireAlarmMQTTCommunicator extends MQTTTransportHandler {
@Override @Override
public void run() { public void run() {
int currentTemperature = agentManager.getTemperature(); int currentTemperature = agentManager.getTemperature();
String message = "PUBLISHER:" + AgentConstants.TEMPERATURE_CONTROL + ":" + currentTemperature; String message = "{\"event\": {\"metaData\": {\"owner\": \"" + AgentManager
.getInstance().getAgentConfigs().getDeviceOwner() + "\",\"deviceId\": \"" + AgentManager
.getInstance().getAgentConfigs().getDeviceId() + "\",\"time\": " +
"0},\"payloadData\": { \"temperature\": " + currentTemperature + "} }}";
try { try {
String payLoad = AgentUtilOperations.prepareSecurePayLoad(message); String payLoad = AgentUtilOperations.prepareSecurePayLoad(message);

6
src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/xmpp/FireAlarmXMPPCommunicator.java
Unescape View File

@ -189,8 +189,10 @@ public class FireAlarmXMPPCommunicator extends XMPPTransportHandler {
try { try {
int currentTemperature = agentManager.getTemperature(); int currentTemperature = agentManager.getTemperature();
String message = "{\"event\": {\"metaData\": {\"owner\": \"" + AgentManager
String message = AgentConstants.TEMPERATURE_CONTROL + ":" + currentTemperature; .getInstance().getAgentConfigs().getDeviceOwner() + "\",\"deviceId\": \"" + AgentManager
.getInstance().getAgentConfigs().getDeviceId() + "\",\"time\": " +
"0},\"payloadData\": { \"temperature\": " + currentTemperature + "} }}";
String payLoad = AgentUtilOperations.prepareSecurePayLoad(message); String payLoad = AgentUtilOperations.prepareSecurePayLoad(message);
xmppMessage.setTo(xmppAdminJID); xmppMessage.setTo(xmppAdminJID);

2
src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentConstants.java
Unescape View File

@ -62,7 +62,7 @@ public class AgentConstants {
public static final int DEFAULT_MQTT_RECONNECTION_INTERVAL = 2; // time in seconds public static final int DEFAULT_MQTT_RECONNECTION_INTERVAL = 2; // time in seconds
public static final int DEFAULT_MQTT_QUALITY_OF_SERVICE = 0; public static final int DEFAULT_MQTT_QUALITY_OF_SERVICE = 0;
public static final String MQTT_SUBSCRIBE_TOPIC = "%s/" + DEVICE_TYPE + "/%s"; public static final String MQTT_SUBSCRIBE_TOPIC = "%s/" + DEVICE_TYPE + "/%s";
public static final String MQTT_PUBLISH_TOPIC = "%s/" + DEVICE_TYPE + "/%s/publisher"; public static final String MQTT_PUBLISH_TOPIC = "%s/" + DEVICE_TYPE + "/%s/temperature";
/* --------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------
Device/Agent specific properties to be read from the 'deviceConfig.properties' file Device/Agent specific properties to be read from the 'deviceConfig.properties' file

18
src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentManager.java
Unescape View File

@ -153,15 +153,15 @@ public class AgentManager {
} }
} }
try { // try {
if (!EnrollmentManager.getInstance().isEnrolled()) { // if (!EnrollmentManager.getInstance().isEnrolled()) {
EnrollmentManager.getInstance().beginEnrollmentFlow(); // EnrollmentManager.getInstance().beginEnrollmentFlow();
} // }
} catch (AgentCoreOperationException e) { // } catch (AgentCoreOperationException e) {
log.error("Device Enrollment Failed:\n"); // log.error("Device Enrollment Failed:\n");
log.error(e); // log.error(e);
System.exit(0); // System.exit(0);
} // }
//Start agent communication //Start agent communication
agentCommunicator.get(protocol).connect(); agentCommunicator.get(protocol).connect();

90
src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentUtilOperations.java
Unescape View File

@ -250,57 +250,65 @@ public class AgentUtilOperations {
} }
public static String prepareSecurePayLoad(String message) throws AgentCoreOperationException { public static String prepareSecurePayLoad(String message) throws AgentCoreOperationException {
PrivateKey devicePrivateKey = EnrollmentManager.getInstance().getPrivateKey(); if (EnrollmentManager.getInstance().isEnrolled()) {
String encodedMessage = Base64.encodeBase64String(message.getBytes()); PrivateKey devicePrivateKey = EnrollmentManager.getInstance().getPrivateKey();
String signedPayload; String encodedMessage = Base64.encodeBase64String(message.getBytes());
try { String signedPayload;
signedPayload = CommunicationUtils.signMessage(encodedMessage, devicePrivateKey); try {
} catch (TransportHandlerException e) { signedPayload = CommunicationUtils.signMessage(encodedMessage, devicePrivateKey);
String errorMsg = "Error occurred whilst trying to sign encrypted message of: [" + message + "]"; } catch (TransportHandlerException e) {
log.error(errorMsg); String errorMsg = "Error occurred whilst trying to sign encrypted message of: [" + message + "]";
throw new AgentCoreOperationException(errorMsg, e); log.error(errorMsg);
} throw new AgentCoreOperationException(errorMsg, e);
}
JSONObject jsonPayload = new JSONObject(); JSONObject jsonPayload = new JSONObject();
jsonPayload.put(JSON_MESSAGE_KEY, encodedMessage); jsonPayload.put(JSON_MESSAGE_KEY, encodedMessage);
jsonPayload.put(JSON_SIGNATURE_KEY, signedPayload); jsonPayload.put(JSON_SIGNATURE_KEY, signedPayload);
//below statements are temporary fix. //below statements are temporary fix.
jsonPayload.put(JSON_SERIAL_KEY, EnrollmentManager.getInstance().getSCEPCertificate().getSerialNumber()); jsonPayload.put(JSON_SERIAL_KEY, EnrollmentManager.getInstance().getSCEPCertificate().getSerialNumber());
return jsonPayload.toString(); return jsonPayload.toString();
} else {
return message;
}
} }
public static String extractMessageFromPayload(String message) throws AgentCoreOperationException { public static String extractMessageFromPayload(String message) throws AgentCoreOperationException {
String actualMessage; if (EnrollmentManager.getInstance().isEnrolled()) {
String actualMessage;
PublicKey serverPublicKey = EnrollmentManager.getInstance().getServerPublicKey(); PublicKey serverPublicKey = EnrollmentManager.getInstance().getServerPublicKey();
JSONObject jsonPayload = new JSONObject(message); JSONObject jsonPayload = new JSONObject(message);
Object encodedMessage = jsonPayload.get(JSON_MESSAGE_KEY); Object encodedMessage = jsonPayload.get(JSON_MESSAGE_KEY);
Object signedPayload = jsonPayload.get(JSON_SIGNATURE_KEY); Object signedPayload = jsonPayload.get(JSON_SIGNATURE_KEY);
boolean verification; boolean verification;
if (encodedMessage != null && signedPayload != null) { if (encodedMessage != null && signedPayload != null) {
try { try {
verification = CommunicationUtils.verifySignature( verification = CommunicationUtils.verifySignature(
encodedMessage.toString(), signedPayload.toString(), serverPublicKey); encodedMessage.toString(), signedPayload.toString(), serverPublicKey);
} catch (TransportHandlerException e) { } catch (TransportHandlerException e) {
String errorMsg = String errorMsg =
"Error occurred whilst trying to verify signature on received message: [" + message + "]"; "Error occurred whilst trying to verify signature on received message: [" + message + "]";
log.error(errorMsg);
throw new AgentCoreOperationException(errorMsg, e);
}
} else {
String errorMsg = "The received message is in an INVALID format. " +
"Need to be JSON - {\"Msg\":\"<ENCRYPTED_MSG>\", \"Sig\":\"<SIGNED_MSG>\"}.";
throw new AgentCoreOperationException(errorMsg);
}
if (verification) {
actualMessage = new String(Base64.decodeBase64(encodedMessage.toString()), StandardCharsets.UTF_8);
} else {
String errorMsg = "Could not verify payload signature. The message was not signed by a valid client";
log.error(errorMsg); log.error(errorMsg);
throw new AgentCoreOperationException(errorMsg, e); throw new AgentCoreOperationException(errorMsg);
} }
return actualMessage;
} else { } else {
String errorMsg = "The received message is in an INVALID format. " + return message;
"Need to be JSON - {\"Msg\":\"<ENCRYPTED_MSG>\", \"Sig\":\"<SIGNED_MSG>\"}.";
throw new AgentCoreOperationException(errorMsg);
}
if (verification) {
actualMessage = new String(Base64.decodeBase64(encodedMessage.toString()), StandardCharsets.UTF_8);
} else {
String errorMsg = "Could not verify payload signature. The message was not signed by a valid client";
log.error(errorMsg);
throw new AgentCoreOperationException(errorMsg);
} }
return actualMessage;
} }
public static String getAuthenticationMethod() { public static String getAuthenticationMethod() {

2
src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java
Unescape View File

@ -111,7 +111,7 @@ public class EnrollmentManager {
*/ */
private EnrollmentManager() { private EnrollmentManager() {
this.SCEPUrl = AgentManager.getInstance().getEnrollmentEP(); this.SCEPUrl = AgentManager.getInstance().getEnrollmentEP();
setEnrollmentStatus(); //setEnrollmentStatus();
} }
/** /**

Write Preview
Loading…
Cancel
Save