From 4e70a2ca0c77de261af6eb7ddf6bf67ecf3208b1 Mon Sep 17 00:00:00 2001 From: Patrick Fallberg Date: Tue, 8 Sep 2015 23:41:33 +0200 Subject: [PATCH 1/5] Fixed "invalid suffix on literal" warning --- .../BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/MySensors/examples/BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino b/libraries/MySensors/examples/BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino index 34e0a17..bd3a81f 100644 --- a/libraries/MySensors/examples/BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino +++ b/libraries/MySensors/examples/BinarySwitchSleepSensor/BinarySwitchSleepSensor.ino @@ -75,7 +75,7 @@ void setup() digitalWrite(SECONDARY_BUTTON_PIN, HIGH); // Send the sketch version information to the gateway and Controller - sensor_node.sendSketchInfo(SKETCH_NAME, SKETCH_MAJOR_VER"."SKETCH_MINOR_VER); + sensor_node.sendSketchInfo(SKETCH_NAME, SKETCH_MAJOR_VER "." SKETCH_MINOR_VER); // Register binary input sensor to sensor_node (they will be created as child devices) // You can use S_DOOR, S_MOTION or S_LIGHT here depending on your usage. From c5a9c2e03361e4e0d4b8c0be3708607e2b68973a Mon Sep 17 00:00:00 2001 From: Patrick Fallberg Date: Sun, 10 Jan 2016 13:57:49 +0100 Subject: [PATCH 2/5] Fix addressing bug in _doSign bitfield --- libraries/MySensors/MySensor.cpp | 6 +++--- libraries/MySensors/MySensor.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/MySensors/MySensor.cpp b/libraries/MySensors/MySensor.cpp index 6c3a348..8409e5d 100644 --- a/libraries/MySensors/MySensor.cpp +++ b/libraries/MySensors/MySensor.cpp @@ -24,9 +24,9 @@ #ifdef MY_SIGNING_FEATURE // Macros for manipulating signing requirement table -#define DO_SIGN(node) (node == 0 ? (~doSign[0]&1) : (~doSign[node>>4]&(node%16))) -#define SET_SIGN(node) (node == 0 ? (doSign[0]&=~1) : (doSign[node>>4]&=~(node%16))) -#define CLEAR_SIGN(node) (node == 0 ? (doSign[0]|=1) : (doSign[node>>4]|=(node%16))) +#define DO_SIGN(node) (~_doSign[node>>3]&(1<<(node%8))) +#define SET_SIGN(node) (_doSign[node>>3]&=~(1<<(node%8))) +#define CLEAR_SIGN(node) (_doSign[node>>3]|=(1<<(node%8))) #endif // Inline function and macros diff --git a/libraries/MySensors/MySensor.h b/libraries/MySensors/MySensor.h index 18f4cb7..ba6edc3 100644 --- a/libraries/MySensors/MySensor.h +++ b/libraries/MySensors/MySensor.h @@ -366,7 +366,7 @@ class MySensor MyTransport& radio; #ifdef MY_SIGNING_FEATURE - uint16_t doSign[16]; // Bitfield indicating which sensors require signed communication + uint8_t doSign[32]; // Bitfield indicating which sensors require signed communication MyMessage msgSign; // Buffer for message to sign. MySigning& signer; #endif From ed75b16ea2d972b544e9719304d15f6ac1d18851 Mon Sep 17 00:00:00 2001 From: Patrick Fallberg Date: Sun, 10 Jan 2016 13:59:56 +0100 Subject: [PATCH 3/5] Make sure nodes not supporting signing informs GW A node that does not support signing, still needs to inform the gateway about this to make sure the gateway carries a valid signing requirement table when a node Id that was requiering signing stops doing this. This fixes #286. --- libraries/MySensors/MySensor.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/MySensors/MySensor.cpp b/libraries/MySensors/MySensor.cpp index 8409e5d..e101dd1 100644 --- a/libraries/MySensors/MySensor.cpp +++ b/libraries/MySensors/MySensor.cpp @@ -268,6 +268,9 @@ void MySensor::setupNode() { if (signer.requestSignatures()) { wait(2000); } +#else + // We do not support signing, make sure gateway knows this + sendRoute(build(msg, nc.nodeId, GATEWAY_ADDRESS, NODE_SENSOR_ID, C_INTERNAL, I_REQUEST_SIGNING, false).set(false)); #endif // Send presentation for this radio node (attach From ae7a8893895e7bcc3a952f119cb195ac7e7fb648 Mon Sep 17 00:00:00 2001 From: Patrick Fallberg Date: Wed, 16 Dec 2015 09:47:05 +0100 Subject: [PATCH 4/5] Prevent SecureActuator from accepting ACKs as commands As ACKs are not currently signed, allowing ACKs as commands is a considerable security hole for this sketch. This is now resolved. --- libraries/MySensors/examples/SecureActuator/SecureActuator.ino | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/MySensors/examples/SecureActuator/SecureActuator.ino b/libraries/MySensors/examples/SecureActuator/SecureActuator.ino index cb69354..7399c01 100644 --- a/libraries/MySensors/examples/SecureActuator/SecureActuator.ino +++ b/libraries/MySensors/examples/SecureActuator/SecureActuator.ino @@ -102,7 +102,8 @@ void loop() void incomingMessage(const MyMessage &message) { // We only expect one type of message from controller. But we better check anyway. - if (message.type==V_LOCK_STATUS && message.sensor<=NOF_LOCKS) { + // And acks are not accepted as control messages + if (message.type==V_LOCK_STATUS && message.sensor<=NOF_LOCKS && !mGetAck(message)) { // Change relay state digitalWrite(message.sensor-1+LOCK_1, message.getBool()?LOCK_LOCK:LOCK_UNLOCK); // Store state in eeprom From 29a5bfbafa2f356dd8b5caebda23533cb28e6452 Mon Sep 17 00:00:00 2001 From: Patrick Fallberg Date: Tue, 12 Jan 2016 08:39:05 +0100 Subject: [PATCH 5/5] Backport of bugfix (#259) in repeaters when forwarding signed messages --- libraries/MySensors/MySensor.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libraries/MySensors/MySensor.cpp b/libraries/MySensors/MySensor.cpp index e101dd1..b97ccae 100644 --- a/libraries/MySensors/MySensor.cpp +++ b/libraries/MySensors/MySensor.cpp @@ -396,7 +396,9 @@ boolean MySensor::sendRoute(MyMessage &message) { } // After this point, only the 'last' member of the message structure is allowed to be altered if the message has been signed, // or signature will become invalid and the message rejected by the receiver - } else mSetSigned(message, 0); // Message is not supposed to be signed, make sure it is marked unsigned + } else if (nc.nodeId == message.sender) { + mSetSigned(message, 0); // Message is not supposed to be signed, make sure it is marked unsigned + } #endif if (dest == GATEWAY_ADDRESS || !repeaterMode) { @@ -588,11 +590,18 @@ boolean MySensor::process() { } #endif - // Add string termination, good if we later would want to print it. - msg.data[mGetLength(msg)] = '\0'; - debug(PSTR("read: %d-%d-%d s=%d,c=%d,t=%d,pt=%d,l=%d,sg=%d:%s\n"), + if (msg.destination == nc.nodeId) { + debug(PSTR("read: %d-%d-%d s=%d,c=%d,t=%d,pt=%d,l=%d,sg=%d:%s\n"), + msg.sender, msg.last, msg.destination, msg.sensor, mGetCommand(msg), msg.type, mGetPayloadType(msg), mGetLength(msg), mGetSigned(msg), msg.getString(convBuf)); + } else { + if (repeaterMode && nc.nodeId != AUTO) { + debug(PSTR("read and forward: %d-%d-%d s=%d,c=%d,t=%d,pt=%d,l=%d,sg=%d:%s\n"), msg.sender, msg.last, msg.destination, msg.sensor, mGetCommand(msg), msg.type, mGetPayloadType(msg), mGetLength(msg), mGetSigned(msg), msg.getString(convBuf)); - mSetSigned(msg,0); // Clear the sign-flag now as verification (and debug printing) is completed + } else { + debug(PSTR("read and drop: %d-%d-%d s=%d,c=%d,t=%d,pt=%d,l=%d,sg=%d:%s\n"), + msg.sender, msg.last, msg.destination, msg.sensor, mGetCommand(msg), msg.type, mGetPayloadType(msg), mGetLength(msg), mGetSigned(msg), msg.getString(convBuf)); + } + } if(!(mGetVersion(msg) == PROTOCOL_VERSION)) { debug(PSTR("ver mismatch\n")); @@ -610,6 +619,7 @@ boolean MySensor::process() { if (destination == nc.nodeId) { // This message is addressed to this node + mSetSigned(msg,0); if (repeaterMode && last != nc.parentNodeId) { // Message is from one of the child nodes. Add it to routing table.