andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-07 04:09:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

mac save&AC swmode fixes, sha256 sign for cmd tst

Browse Source
This commit is contained in:
Климов Андрей Николаевич
2023-07-16 20:29:59 +03:00
parent eb68556012
commit 3907158437
11 changed files with 143 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lighthub/config.cpp
View File

@@ -44,7 +44,7 @@ bool systemConfig::isValidSysConf()
bool isMacValid = false;
for (short i = 0; i < 6; i++) {
mac[i] = stream->read();
if (mac[i] != 0 && mac[i] != 0xff) isMacValid = true;
if ((mac[i] != 0) && (mac[i] != 0xff)) isMacValid = true;
}
stream->close();
return isMacValid;
@@ -53,7 +53,7 @@ bool systemConfig::isValidSysConf()
bool systemConfig::setMAC(macAddress& _mac)
{
if (!stream || !isValidSysConf()) return false;
openStream('a');
openStream('r'); //was 'a'
stream->seek(offsetof(systemConfigData,mac));
stream->write ((const uint8_t *)&_mac,sizeof(_mac));
memcpy(mac, _mac, sizeof(mac));

23
lighthub/flashstream.cpp
View File

@@ -23,30 +23,13 @@
#if defined(__SAM3X8E__)
#include <DueFlashStorage.h>
extern DueFlashStorage EEPROM;
#endif
#ifdef NRF5
#include <NRFFlashStorage.h> //STUB
extern NRFFlashStorage EEPROM;
#endif
//#ifdef ARDUINO_ARCH_STM32
//#include <NRFFlashStorage.h> //STUB
//extern NRFFlashStorage EEPROM;
// static char samBuffer[64];
// short samBufferPos = 0;
//#endif
#if defined(__SAM3X8E__)
DueFlashStorage EEPROM;
static char samBuffer[64];
short samBufferPos = 0;
#endif
#ifdef NRF5
#include <NRFFlashStorage.h> //STUB
NRFFlashStorage EEPROM;
#endif
@@ -201,7 +184,9 @@ NRFFlashStorage EEPROM;
#endif
pos=min(_pos, streamSize);
//debugSerial<<F("Seek:")<<pos<<endl;
//Serial.print("StartPos=");Serial.println(startPos);
//Serial.print("Pos=");Serial.println(pos);
//Serial.print("streamSize=");Serial.println(streamSize);
return pos;
};

27
lighthub/item.cpp
View File

@@ -26,6 +26,7 @@ e-mail anklimov@gmail.com
#include "main.h"
#include "bright.h"
#include "itemCmd.h"
//#include "SHA256.h"
#ifdef _dmxout
#include "dmx.h"
@@ -597,6 +598,17 @@ if (suffixCode == S_RAW)
return Ctrl(ic,subItem);
}
//debugSerial<<F("SuffixCode: ")<<suffixCode<<endl;
bool authorized = false;
char * authPos = strchr(payload,'@');
if (authPos)
{
*authPos=0;
//char * authToken=payload;
authorized = checkToken(payload,authPos+1);
payload=authPos+1;
}
int i=0;
while (payload[i]) {payload[i]=toupper(payload[i]);i++;};
@@ -660,7 +672,7 @@ st.setSuffix(suffixCode);
}
}
return Ctrl(st,subItem);
return Ctrl(st,subItem,true,authorized);
} //Void command
break;
@@ -824,7 +836,7 @@ int Item::scheduleCommand(itemCmd cmd)
// -3 ignored
// -1 system error
// -4 invalid argument
int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion, bool authorized)
{
int fr = freeRam();
if (fr < minimalMemory)
@@ -945,6 +957,8 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
}
break;
case CMD_TOGGLE:
if (suffixCode != S_CTRL)
{
chActive=(isActive()>0);
toExecute=true;
@@ -955,6 +969,13 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
cmd.Cmd(CMD_ON);
}
status2Send |=FLAG_COMMAND | FLAG_SEND_IMMEDIATE;
}
else
{
if (getFlag(FLAG_DISABLED)) clearFlag(FLAG_DISABLED); else setFlag(FLAG_DISABLED);
status2Send |= FLAG_FLAGS | FLAG_SEND_IMMEDIATE;
res=1;
}
break;
@@ -1127,7 +1148,7 @@ int Item::Ctrl(itemCmd cmd, char* subItem, bool allowRecursion)
else // Fast track for commands to subitems
{
if (driver) return driver->Ctrl(cmd,subItem,toExecute);
return 0;
///// return 0;
}
}

2
lighthub/item.h
View File

@@ -119,7 +119,7 @@ class Item
boolean Setup();
void Stop();
//int Ctrl(short cmd, short n=0, int * Parameters=NULL, int suffixCode=0, char* subItem=NULL);
int Ctrl(itemCmd cmd, char* subItem=NULL, bool allowRecursion = true);
int Ctrl(itemCmd cmd, char* subItem=NULL, bool allowRecursion = true, bool authorized=false);
int Ctrl(char * payload, char * subItem=NULL);
int getArg(short n=0);

4
lighthub/itemCmd.h
View File

@@ -46,8 +46,8 @@ const cmdstr commands_P[] PROGMEM =
#define CMD_ENABLE 0xa /// for PID regulator and XON/XOFF - chan limitation
#define CMD_DISABLE 0xb /// for PID regulator
#define CMD_UNFREEZE 0xc /// Aliase for ON
#define CMD_FREEZE 0xd /// Aliase for OFF
#define CMD_UNFREEZE 0xc ///
#define CMD_FREEZE 0xd ///
#define CMD_AUTO 0xe /// Thermostat/AC set to Auto mode
#define CMD_FAN 0xf /// AC set to Fan-only mode

38
lighthub/main.cpp
View File

@@ -27,6 +27,9 @@ e-mail anklimov@gmail.com
#include "TimerInterrupt_Generic.h"
#endif
#ifdef CRYPT
#include "RNG.h"
#endif
#ifdef SYSLOG_ENABLE
#include <Syslog.h>
@@ -132,6 +135,7 @@ volatile uint32_t timerSensorCheck =0;
volatile unsigned long timerCount=0;
volatile int16_t timerNumber=-1;
volatile int8_t timerHandlerBusy=0;
volatile uint32_t cryptoSalt=0;
aJsonObject *pollingItem = NULL;
@@ -681,6 +685,12 @@ lan_status lanLoop() {
onMQTTConnect();
#ifdef CRYPT
//setTopic(buf,sizeof(buf),T_OUT);
strncpy(buf, "+/+/$salt", sizeof(buf)); // Only on separated cmd/val topics
mqttClient.subscribe(buf);
#endif
lanStatus = OPERATION;//3;
infoSerial<<F("Accepting commands...\n");
}
@@ -839,6 +849,16 @@ void onMQTTConnect(){
strncpy_P(buf, statsval_P, sizeof(buf)-1);
mqttClient.publish(topic,buf,true);
#ifdef CRYPT
RNG.rand((uint8_t *) &cryptoSalt,sizeof(cryptoSalt));
setTopic(topic,sizeof(topic),T_DEV);
//strncat_P(topic, stats_P, sizeof(topic)-1);
//strncat(topic, "/", sizeof(topic));
strncat_P(topic, salt_P, sizeof(topic)-1);
printUlongValueToStr(buf, cryptoSalt);
mqttClient.publish(topic,buf,true);
#endif
#ifndef NO_HOMIE
// strncpy_P(topic, outprefix, sizeof(topic));
@@ -1510,7 +1530,7 @@ int loadConfigFromEEPROM()
#endif
if (sysConfStream.peek() == '{') {
debugSerial<<F("Trying Load from EEPROM")<<endl;
debugSerial<<F("JSON detected")<<endl;
aJsonStream as = aJsonStream(&sysConfStream);
cleanConf();
root = aJson.parse(&as);
@@ -2179,6 +2199,7 @@ void setup_main() {
#endif
sysConf.clear();
}
else debugSerialPort << F("EEPROM signature ok")<<endl;
// scan_i2c_bus();
serialDebugLevel=sysConf.getSerialDebuglevel();
@@ -2200,7 +2221,9 @@ void setup_main() {
#ifdef SD_CARD_INSERTED
sd_card_w5100_setup();
#endif
setupMacAddress();
// Serial.print("Sig4=");
// Serial.println(FLASH_START[0],HEX);
setupMacAddress(); //тут почему-то не считывается из флэш
#ifdef _modbus
#ifdef CONTROLLINO
@@ -2485,10 +2508,21 @@ void publishStat(){
strncat_P(topic, state_P, sizeof(topic)-1);
strncpy_P(intbuf, ready_P, sizeof(intbuf)-1);
mqttClient.publish(topic,intbuf,true);
#ifdef CRYPT
RNG.rand((uint8_t *) &cryptoSalt,sizeof(cryptoSalt));
setTopic(topic,sizeof(topic),T_DEV);
//strncat_P(topic, stats_P, sizeof(topic)-1);
//strncat(topic, "/", sizeof(topic));
strncat_P(topic, salt_P, sizeof(topic)-1);
printUlongValueToStr(intbuf, cryptoSalt);
mqttClient.publish(topic,intbuf,true);
#endif
}
void setupMacAddress() {
//Check MAC, stored in NVRAM
if (!sysConf.getMAC()) {
infoSerial<<F("No MAC configured: set firmware's MAC\n");

2
lighthub/modules/out_ac.cpp
View File

@@ -124,7 +124,7 @@ void out_AC::InsertData(byte data[], size_t size){
publishTopic(item->itemArr->name, "OFF","/compressor");
publishTopic(item->itemArr->name, (long) swing,"/swing");
//publishTopic(item->itemArr->name, (long) swing,"/swing");
//publishTopic(item->itemArr->name, (long) fan_spd,"/fan");
/////////////////////////////////

1
lighthub/textconst.h
View File

@@ -3,6 +3,7 @@
const char state_P[] PROGMEM = "$state";
const char disconnected_P[] PROGMEM = "disconnected";
const char ready_P[] PROGMEM = "ready";
const char salt_P[] PROGMEM = "$salt";
const char homie_P[] PROGMEM = "$homie";
const char homiever_P[] PROGMEM = "3.0.1";

62
lighthub/utils.cpp
View File

@@ -28,6 +28,10 @@ e-mail anklimov@gmail.com
#include <PubSubClient.h>
#include <HardwareSerial.h>
#ifdef CRYPT
#include "SHA256.h"
#endif
#ifndef debugSerialPort
#define debugSerialPort Serial
#endif
@@ -324,8 +328,8 @@ Awesome work Mark T!*/
__attribute__ ((section (".ramfunc")))
void ReadUniqueID( uint32_t * pdwUniqueID )
// #pragma optimize("", off)
uint32_t ReadUniqueID( uint32_t * pdwUniqueID )
{
unsigned int status ;
@@ -354,8 +358,14 @@ void ReadUniqueID( uint32_t * pdwUniqueID )
{
status = EFC1->EEFC_FSR ;
} while ( (status & EEFC_FSR_FRDY) != EEFC_FSR_FRDY ) ;
return *(uint32_t *)(IFLASH1_ADDR + 128); // dont remove: SAM defect workaround - MPU dont leave Unique Identifier mode until read flash out UID of range
#endif
}
//#pragma optimize("", on)
int _inet_aton(const char* aIPAddrString, IPAddress& aResult)
@@ -804,7 +814,55 @@ bool getPinVal(uint8_t pin)
{
return (0!=(*portOutputRegister( digitalPinToPort(pin) ) & digitalPinToBitMask(pin)));
}
#ifdef CRYPT
#define HASH_SIZE 32
SHA256 sha256;
extern uint32_t cryptoSalt;
//extern
const char cryptoKey[] ="12345678";
bool checkToken(char * token, char * data)
{
// Make valid random salted data
char saltStr[32];
printUlongValueToStr(saltStr, cryptoSalt);
// get hash
uint8_t result[HASH_SIZE];
memset(result, 0xAA, sizeof(result));
sha256.reset();
sha256.update(saltStr,strlen(saltStr));
sha256.update(cryptoKey,strlen(cryptoKey));
if (data) sha256.update(data,strlen(data));
sha256.finalize(result,sizeof(result));
sha256.clear();
//hmac<SHA256>(result, HASH_SIZE, cryptoKey, strlen(cryptoKey), testData, strlen(testData));
//for (int i=0;i<HASH_SIZE;i++) {if(result[i]<0x10) debugSerial.print('0'); debugSerial.print(result[i],HEX);}
//debugSerial.println();
for (unsigned int i=0;i<strlen(token)/2;i++)
{
uint8_t digit = ((((token[i*2] <= '9') ? token[i*2] - '0' : (token[i*2] & 0x7) + 9) << 4) +
((token[i*2+1] <= '9') ? token[i*2+1] - '0' : (token[i*2+1] & 0x7) + 9));
//debugSerial.print(digit,HEX);
if (digit!=result[i])
{
debugSerial.println(F("signature Failed"));
return false;
}
}
debugSerial.println(F("signature Passed"));
return true;
}
#else
bool checkToken(char * token, char * data)
{return true;}
#endif
#pragma message(VAR_NAME_VALUE(debugSerial))
#pragma message(VAR_NAME_VALUE(SERIAL_BAUD))

3
lighthub/utils.h
View File

@@ -59,7 +59,7 @@ unsigned long freeRam ();
void parseBytes(const char* str, char separator, byte* bytes, int maxBytes, int base);
int log(const char *str, ...);
void printFloatValueToStr(char *valstr, float value);
void ReadUniqueID( uint32_t * pdwUniqueID );
uint32_t ReadUniqueID( uint32_t * pdwUniqueID );
int _inet_aton(const char* aIPAddrString, IPAddress& aResult);
char *_inet_ntoa_r(IPAddress addr, char *buf, int buflen);
void printIPAddress(IPAddress ipAddress);
@@ -77,3 +77,4 @@ serialParamType str2SerialParam(char * str);
String toString(const IPAddress& address);
bool getPinVal(uint8_t pin);
int str2regSize(char * str);
bool checkToken(char * token, char * data);

4
platformio.ini
View File

@@ -325,6 +325,7 @@ lib_deps =
br3ttb/PID@^1.2.1
ArduinoMDNS
https://github.com/khoih-prog/TimerInterrupt_Generic.git
rweather/Crypto
monitor_speed = 115200
[env:mega2560slim-5100]
@@ -460,6 +461,7 @@ lib_deps =
br3ttb/PID@^1.2.1
ArduinoMDNS
https://github.com/khoih-prog/TimerInterrupt_Generic.git
rweather/Crypto
monitor_speed = 115200
@@ -713,7 +715,7 @@ lib_deps =
ArduinoMDNS
https://github.com/khoih-prog/TimerInterrupt_Generic.git
https://github.com/rlogiacco/CircularBuffer
rweather/Crypto
monitor_speed = 115200
[env:controllino]