fixup! readapting ConnectionHandler implementation to use setting struct

andreagilardoni · andreagilardoni · commit be61e436bdde · 2025-04-09T10:34:01.000+02:00
diff --git a/src/CatM1ConnectionHandler.cpp b/src/CatM1ConnectionHandler.cpp
@@ -37,10 +37,10 @@ CatM1ConnectionHandler::CatM1ConnectionHandler(
 : ConnectionHandler{keep_alive, NetworkAdapter::CATM1}
 {
   _settings.type = NetworkAdapter::CATM1;
-  strcpy(_settings.catm1.pin, pin);
-  strcpy(_settings.catm1.apn, apn);
-  strcpy(_settings.catm1.login, login);
-  strcpy(_settings.catm1.pass, pass);
+  strncpy(_settings.catm1.pin, pin, sizeof(_settings.catm1.pin)-1);
+  strncpy(_settings.catm1.apn, apn, sizeof(_settings.catm1.apn)-1);
+  strncpy(_settings.catm1.login, login, sizeof(_settings.catm1.login)-1);
+  strncpy(_settings.catm1.pass, pass, sizeof(_settings.catm1.pass)-1);
   _settings.catm1.rat  = static_cast<uint8_t>(rat);
   _settings.catm1.band = band;
 }
diff --git a/src/CellularConnectionHandler.cpp b/src/CellularConnectionHandler.cpp
@@ -28,10 +28,10 @@ CellularConnectionHandler::CellularConnectionHandler(const char * pin, const cha
 : ConnectionHandler{keep_alive, NetworkAdapter::CELL}
 {
   _settings.type = NetworkAdapter::CELL;
-  strcpy(_settings.cell.pin, pin);
-  strcpy(_settings.cell.apn, apn);
-  strcpy(_settings.cell.login, login);
-  strcpy(_settings.cell.pass, pass);
+  strncpy(_settings.cell.pin, pin, sizeof(_settings.cell.pin)-1);
+  strncpy(_settings.cell.apn, apn, sizeof(_settings.cell.apn)-1);
+  strncpy(_settings.cell.login, login, sizeof(_settings.cell.login)-1);
+  strncpy(_settings.cell.pass, pass, sizeof(_settings.cell.pass)-1);
 
 }
 
diff --git a/src/GSMConnectionHandler.cpp b/src/GSMConnectionHandler.cpp
@@ -53,10 +53,10 @@ GSMConnectionHandler::GSMConnectionHandler(const char * pin, const char * apn, c
 : ConnectionHandler{keep_alive, NetworkAdapter::GSM}
 {
   _settings.type = NetworkAdapter::GSM;
-  strcpy(_settings.gsm.pin, pin);
-  strcpy(_settings.gsm.apn, apn);
-  strcpy(_settings.gsm.login, login);
-  strcpy(_settings.gsm.pass, pass);
+  strncpy(_settings.gsm.pin, pin, sizeof(_settings.gsm.pin)-1);
+  strncpy(_settings.gsm.apn, apn, sizeof(_settings.gsm.apn)-1);
+  strncpy(_settings.gsm.login, login, sizeof(_settings.gsm.login)-1);
+  strncpy(_settings.gsm.pass, pass, sizeof(_settings.gsm.pass)-1);
 }
 
 /******************************************************************************
diff --git a/src/LoRaConnectionHandler.cpp b/src/LoRaConnectionHandler.cpp
@@ -48,10 +48,10 @@ LoRaConnectionHandler::LoRaConnectionHandler(char const * appeui, char const * a
 : ConnectionHandler{false, NetworkAdapter::LORA}
 {
   _settings.type = NetworkAdapter::LORA;
-  strcpy(_settings.lora.appeui, appeui);
-  strcpy(_settings.lora.appkey, appkey);
+  strncpy(_settings.lora.appeui, appeui, sizeof(_settings.lora.appeui)-1);
+  strncpy(_settings.lora.appkey, appkey, sizeof(_settings.lora.appkey)-1);
   _settings.lora.band = band;
-  strcpy(_settings.lora.channelMask, channelMask);
+  strncpy(_settings.lora.channelMask, channelMask, sizeof(_settings.lora.channelMask)-1);
   _settings.lora.deviceClass = device_class;
 }
 
diff --git a/src/NBConnectionHandler.cpp b/src/NBConnectionHandler.cpp
@@ -65,10 +65,10 @@ NBConnectionHandler::NBConnectionHandler(char const * pin, char const * apn, cha
 : ConnectionHandler{keep_alive, NetworkAdapter::NB}
 {
   _settings.type = NetworkAdapter::NB;
-  strcpy(_settings.nb.pin, pin);
-  strcpy(_settings.nb.apn, apn);
-  strcpy(_settings.nb.login, login);
-  strcpy(_settings.nb.pass, pass);
+  strncpy(_settings.nb.pin, pin, sizeof(_settings.nb.pin)-1);
+  strncpy(_settings.nb.apn, apn, sizeof(_settings.nb.apn)-1);
+  strncpy(_settings.nb.login, login, sizeof(_settings.nb.login)-1);
+  strncpy(_settings.nb.pass, pass, sizeof(_settings.nb.pass)-1);
 }
 
 /******************************************************************************
diff --git a/src/WiFiConnectionHandler.cpp b/src/WiFiConnectionHandler.cpp
@@ -43,8 +43,8 @@ WiFiConnectionHandler::WiFiConnectionHandler(char const * ssid, char const * pas
 : ConnectionHandler{keep_alive, NetworkAdapter::WIFI}
 {
   _settings.type = NetworkAdapter::WIFI;
-  strcpy(_settings.wifi.ssid, ssid);
-  strcpy(_settings.wifi.pwd, pass);
+  strncpy(_settings.wifi.ssid, ssid, sizeof(_settings.wifi.ssid)-1);
+  strncpy(_settings.wifi.pwd, pass, sizeof(_settings.wifi.pwd)-1);
 }
 
 /******************************************************************************

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,10 @@ CellularConnectionHandler::CellularConnectionHandler(const char * pin, const cha`
`28`	`28`	`: ConnectionHandler{keep_alive, NetworkAdapter::CELL}`
`29`	`29`	`{`
`30`	`30`	`_settings.type = NetworkAdapter::CELL;`
`31`		`- strcpy(_settings.cell.pin, pin);`
`32`		`- strcpy(_settings.cell.apn, apn);`
`33`		`- strcpy(_settings.cell.login, login);`
`34`		`- strcpy(_settings.cell.pass, pass);`
	`31`	`+ strncpy(_settings.cell.pin, pin, sizeof(_settings.cell.pin)-1);`
	`32`	`+ strncpy(_settings.cell.apn, apn, sizeof(_settings.cell.apn)-1);`
	`33`	`+ strncpy(_settings.cell.login, login, sizeof(_settings.cell.login)-1);`
	`34`	`+ strncpy(_settings.cell.pass, pass, sizeof(_settings.cell.pass)-1);`
`35`	`35`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ GSMConnectionHandler::GSMConnectionHandler(const char * pin, const char * apn, c`
`53`	`53`	`: ConnectionHandler{keep_alive, NetworkAdapter::GSM}`
`54`	`54`	`{`
`55`	`55`	`_settings.type = NetworkAdapter::GSM;`
`56`		`- strcpy(_settings.gsm.pin, pin);`
`57`		`- strcpy(_settings.gsm.apn, apn);`
`58`		`- strcpy(_settings.gsm.login, login);`
`59`		`- strcpy(_settings.gsm.pass, pass);`
	`56`	`+ strncpy(_settings.gsm.pin, pin, sizeof(_settings.gsm.pin)-1);`
	`57`	`+ strncpy(_settings.gsm.apn, apn, sizeof(_settings.gsm.apn)-1);`
	`58`	`+ strncpy(_settings.gsm.login, login, sizeof(_settings.gsm.login)-1);`
	`59`	`+ strncpy(_settings.gsm.pass, pass, sizeof(_settings.gsm.pass)-1);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/******************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,10 @@ LoRaConnectionHandler::LoRaConnectionHandler(char const * appeui, char const * a`
`48`	`48`	`: ConnectionHandler{false, NetworkAdapter::LORA}`
`49`	`49`	`{`
`50`	`50`	`_settings.type = NetworkAdapter::LORA;`
`51`		`- strcpy(_settings.lora.appeui, appeui);`
`52`		`- strcpy(_settings.lora.appkey, appkey);`
	`51`	`+ strncpy(_settings.lora.appeui, appeui, sizeof(_settings.lora.appeui)-1);`
	`52`	`+ strncpy(_settings.lora.appkey, appkey, sizeof(_settings.lora.appkey)-1);`
`53`	`53`	`_settings.lora.band = band;`
`54`		`- strcpy(_settings.lora.channelMask, channelMask);`
	`54`	`+ strncpy(_settings.lora.channelMask, channelMask, sizeof(_settings.lora.channelMask)-1);`
`55`	`55`	`_settings.lora.deviceClass = device_class;`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,10 @@ NBConnectionHandler::NBConnectionHandler(char const * pin, char const * apn, cha`
`65`	`65`	`: ConnectionHandler{keep_alive, NetworkAdapter::NB}`
`66`	`66`	`{`
`67`	`67`	`_settings.type = NetworkAdapter::NB;`
`68`		`- strcpy(_settings.nb.pin, pin);`
`69`		`- strcpy(_settings.nb.apn, apn);`
`70`		`- strcpy(_settings.nb.login, login);`
`71`		`- strcpy(_settings.nb.pass, pass);`
	`68`	`+ strncpy(_settings.nb.pin, pin, sizeof(_settings.nb.pin)-1);`
	`69`	`+ strncpy(_settings.nb.apn, apn, sizeof(_settings.nb.apn)-1);`
	`70`	`+ strncpy(_settings.nb.login, login, sizeof(_settings.nb.login)-1);`
	`71`	`+ strncpy(_settings.nb.pass, pass, sizeof(_settings.nb.pass)-1);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/******************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ WiFiConnectionHandler::WiFiConnectionHandler(char const * ssid, char const * pas`
`43`	`43`	`: ConnectionHandler{keep_alive, NetworkAdapter::WIFI}`
`44`	`44`	`{`
`45`	`45`	`_settings.type = NetworkAdapter::WIFI;`
`46`		`- strcpy(_settings.wifi.ssid, ssid);`
`47`		`- strcpy(_settings.wifi.pwd, pass);`
	`46`	`+ strncpy(_settings.wifi.ssid, ssid, sizeof(_settings.wifi.ssid)-1);`
	`47`	`+ strncpy(_settings.wifi.pwd, pass, sizeof(_settings.wifi.pwd)-1);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/******************************************************************************`