Airsoft/DarkEmergency-Timer
Airsoft/DarkEmergency-Timer
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

switched to device-specific WiFI-AP-password

Browse Source
This commit is contained in:
Marcel Peterkau 2024-06-06 20:32:13 +02:00
parent 2fea8cfdd6
commit 024a00e1bf
10 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Software/codegen/wifiAP_passcalc.py
View File

@ -1,13 +1,17 @@
import hashlib def djb2_hash(s):
hash = 5381
SEED = "letmelubeyou" for c in s:
hash = ((hash << 5) + hash) + ord(c) # hash * 33 + c
return hash & 0xFFFFFFFF # Ensure it's a 32-bit unsigned integer
def generate_password(seed, chip_id): def generate_password(seed, chip_id):
combined = seed + chip_id combined = (seed + chip_id)[:24] # Ensure the combined string is up to 24 characters
hash_object = hashlib.md5(combined.encode()) hash_value = djb2_hash(combined)
return hash_object.hexdigest()[:16] # First 16 characters of the MD5 hash hash_str = f"{hash_value:08X}{hash_value:08X}" # Repeat the hash to ensure at least 16 characters
return hash_str[:32] # Ensure the password is at most 32 characters
if __name__ == "__main__": if __name__ == "__main__":
SEED = "letmelubeyou"
chip_id = input("Enter the Chip ID in hex (e.g., 1A2B3C4D): ").strip() chip_id = input("Enter the Chip ID in hex (e.g., 1A2B3C4D): ").strip()
chip_id = chip_id.zfill(8).upper() # Ensure it's 8 characters, upper case chip_id = chip_id.zfill(8).upper() # Ensure it's 8 characters, upper case

4
Software/include/eeprom.h
View File

@ -66,8 +66,6 @@ typedef struct
char Faction_1_Name[33]; char Faction_1_Name[33];
char Faction_2_Name[33]; char Faction_2_Name[33];
char Faction_3_Name[33]; char Faction_3_Name[33];
char wifi_ap_ssid[33];
char wifi_ap_password[64];
char wifi_client_ssid[33]; char wifi_client_ssid[33];
char wifi_client_password[64]; char wifi_client_password[64];
bool wifi_autoconnect; bool wifi_autoconnect;
@ -82,8 +80,6 @@ const configData_t ConfigData_defaults = {
"FACTION 1", // Faction_1_Name "FACTION 1", // Faction_1_Name
"FACTION 2", // Faction_2_Name "FACTION 2", // Faction_2_Name
"FACTION 3", // Faction_3_Name "FACTION 3", // Faction_3_Name
HOST_NAME,
QUOTE(WIFI_AP_PASSWORD),
QUOTE(WIFI_SSID_CLIENT), QUOTE(WIFI_SSID_CLIENT),
QUOTE(WIFI_PASSWORD_CLIENT), QUOTE(WIFI_PASSWORD_CLIENT),
true, true,

6
Software/include/struct2json.h
View File

@ -3,10 +3,10 @@
* *
* @brief Header file for converting structs to JSON objects. * @brief Header file for converting structs to JSON objects.
* *
* @note This file is auto-generated by a script on 2024-05-30 22:54:25. * @note This file is auto-generated by a script on 2024-06-06 18:52:33.
* *
* @author Marcel Peterkau * @author Marcel Peterkau
* @date 30.05.2024 * @date 06.06.2024
*/ */
#ifndef _STRUCT2JSON_H_ #ifndef _STRUCT2JSON_H_
@ -23,4 +23,4 @@ void generateJsonObject_PersistenceData(JsonObject data);
#endif /* _STRUCT2JSON_H_ */ #endif /* _STRUCT2JSON_H_ */
// CODEGENERATOR_CHECKSUM: 735cd4daf9a46bd773bdf5e6cd5a58d61b0d877196399bc2784a0d0ea7af717d // CODEGENERATOR_CHECKSUM: 3a3fd3024dd9dd769ff5d62f61b3ba1b781b7d06e7568a1ddac56d193dba9ee5

3
Software/platformio.ini
View File

@ -22,7 +22,7 @@ custom_flash_version = 1.08
upload_protocol = esptool upload_protocol = esptool
upload_speed = 921600 upload_speed = 921600
;upload_port = 10.0.1.48 ;upload_port = 10.0.0.1
;upload_flags = ;upload_flags =
; --port=8266 ; --port=8266
; --auth=${wifi_cred.admin_password} ; --auth=${wifi_cred.admin_password}
@ -36,7 +36,6 @@ build_flags=
-DADMIN_PASSWORD=${wifi_cred.admin_password} -DADMIN_PASSWORD=${wifi_cred.admin_password}
-DWIFI_SSID_CLIENT=${wifi_cred.wifi_ssid_client} -DWIFI_SSID_CLIENT=${wifi_cred.wifi_ssid_client}
-DWIFI_PASSWORD_CLIENT=${wifi_cred.wifi_password_client} -DWIFI_PASSWORD_CLIENT=${wifi_cred.wifi_password_client}
-DADMIN_PASSWORD=${wifi_cred.admin_password}
-DWIFI_PASS_SEED=${wifi_cred.wifi_pass_seed} -DWIFI_PASS_SEED=${wifi_cred.wifi_pass_seed}
-DDEVICE_NAME='"Dark Emergency Timer"' -DDEVICE_NAME='"Dark Emergency Timer"'

7
Software/src/debugger.cpp
View File

@ -126,8 +126,6 @@ const size_t NUM_HELP_LINES = sizeof(helpText) / sizeof(helpText[0]);
// Überprüfen, ob die Anzahl der Commands und Hilfetext-Zeilen übereinstimmen // Überprüfen, ob die Anzahl der Commands und Hilfetext-Zeilen übereinstimmen
static_assert(NUM_COMMANDS == NUM_HELP_LINES, "Number of commands and help text lines do not match!"); static_assert(NUM_COMMANDS == NUM_HELP_LINES, "Number of commands and help text lines do not match!");
/** /**
* @brief Initializes the debugger by setting the initial status for different debug ports. * @brief Initializes the debugger by setting the initial status for different debug ports.
* Serial debug output is turned off. * Serial debug output is turned off.
@ -370,8 +368,6 @@ void Debug_dumpConfig()
Debug_pushMessage("Faction_1_Name: %s\n", ConfigData.Faction_3_Name); Debug_pushMessage("Faction_1_Name: %s\n", ConfigData.Faction_3_Name);
Debug_pushMessage("active_faction_on_reboot: %d\n", ConfigData.active_faction_on_reboot); Debug_pushMessage("active_faction_on_reboot: %d\n", ConfigData.active_faction_on_reboot);
Debug_pushMessage("wifi_autoconnect: %d\n", ConfigData.wifi_autoconnect); Debug_pushMessage("wifi_autoconnect: %d\n", ConfigData.wifi_autoconnect);
Debug_pushMessage("wifi_ap_password: %s\n", ConfigData.wifi_ap_password);
Debug_pushMessage("wifi_ap_ssid: %s\n", ConfigData.wifi_ap_ssid);
Debug_pushMessage("wifi_client_ssid: %s\n", ConfigData.wifi_client_ssid); Debug_pushMessage("wifi_client_ssid: %s\n", ConfigData.wifi_client_ssid);
Debug_pushMessage("wifi_client_password: %s\n", ConfigData.wifi_client_password); Debug_pushMessage("wifi_client_password: %s\n", ConfigData.wifi_client_password);
Debug_pushMessage("EEPROM_Version: %d\n", ConfigData.EEPROM_Version); Debug_pushMessage("EEPROM_Version: %d\n", ConfigData.EEPROM_Version);
@ -412,7 +408,10 @@ void Debug_dumpPersistance()
*/ */
void Debug_printWifiInfo() void Debug_printWifiInfo()
{ {
char buffer[33];
GenerateDeviceSpecificPassword(QUOTE(WIFI_PASS_SEED), buffer, sizeof(buffer));
Debug_pushMessage("IP Adress: %s\n", WiFi.localIP().toString().c_str()); Debug_pushMessage("IP Adress: %s\n", WiFi.localIP().toString().c_str());
Debug_pushMessage("WiFi AP Pw: %s\n", buffer);
} }
/** /**

18
Software/src/eeprom.cpp
View File

@ -400,30 +400,16 @@ uint32_t ConfigSanityCheck(bool autocorrect)
{ {
uint32_t setting_reset_bits = 0; uint32_t setting_reset_bits = 0;
if (!validateWiFiString(ConfigData.wifi_ap_ssid, sizeof(ConfigData.wifi_ap_ssid)))
{
SET_BIT(setting_reset_bits, 1);
if (autocorrect)
strncpy(ConfigData.wifi_ap_ssid, ConfigData_defaults.wifi_ap_ssid, sizeof(ConfigData.wifi_ap_ssid));
}
if (!validateWiFiString(ConfigData.wifi_ap_password, sizeof(ConfigData.wifi_ap_password)))
{
SET_BIT(setting_reset_bits, 2);
if (autocorrect)
strncpy(ConfigData.wifi_ap_password, ConfigData_defaults.wifi_ap_password, sizeof(ConfigData.wifi_ap_password));
}
if (!validateWiFiString(ConfigData.wifi_client_ssid, sizeof(ConfigData.wifi_client_ssid))) if (!validateWiFiString(ConfigData.wifi_client_ssid, sizeof(ConfigData.wifi_client_ssid)))
{ {
SET_BIT(setting_reset_bits, 3); SET_BIT(setting_reset_bits, 0);
if (autocorrect) if (autocorrect)
strncpy(ConfigData.wifi_client_ssid, ConfigData_defaults.wifi_client_ssid, sizeof(ConfigData.wifi_client_ssid)); strncpy(ConfigData.wifi_client_ssid, ConfigData_defaults.wifi_client_ssid, sizeof(ConfigData.wifi_client_ssid));
} }
if (!validateWiFiString(ConfigData.wifi_client_password, sizeof(ConfigData.wifi_client_password))) if (!validateWiFiString(ConfigData.wifi_client_password, sizeof(ConfigData.wifi_client_password)))
{ {
SET_BIT(setting_reset_bits, 4); SET_BIT(setting_reset_bits, 1);
if (autocorrect) if (autocorrect)
strncpy(ConfigData.wifi_client_password, ConfigData_defaults.wifi_client_password, sizeof(ConfigData.wifi_client_password)); strncpy(ConfigData.wifi_client_password, ConfigData_defaults.wifi_client_password, sizeof(ConfigData.wifi_client_password));
} }

4
Software/src/main.cpp
View File

@ -573,6 +573,7 @@ void wifiMaintainConnectionTicker_callback()
void toggleWiFiAP(bool shutdown) void toggleWiFiAP(bool shutdown)
{ {
char buffer[33]; char buffer[33];
char buffer_pass[33];
// Check if WiFi is currently active // Check if WiFi is currently active
if (WiFi.getMode() != WIFI_OFF) if (WiFi.getMode() != WIFI_OFF)
{ {
@ -591,7 +592,8 @@ void toggleWiFiAP(bool shutdown)
WiFi.mode(WIFI_AP); WiFi.mode(WIFI_AP);
WiFi.softAPConfig(IPAddress(WIFI_AP_IP_GW), IPAddress(WIFI_AP_IP_GW), IPAddress(255, 255, 255, 0)); WiFi.softAPConfig(IPAddress(WIFI_AP_IP_GW), IPAddress(WIFI_AP_IP_GW), IPAddress(255, 255, 255, 0));
sanitizeWiFiString(globals.DeviceNameId, buffer, sizeof(buffer)); sanitizeWiFiString(globals.DeviceNameId, buffer, sizeof(buffer));
WiFi.softAP(buffer, QUOTE(WIFI_AP_PASSWORD)); GenerateDeviceSpecificPassword(QUOTE(WIFI_PASS_SEED), buffer_pass, sizeof(buffer_pass));
WiFi.softAP(buffer, buffer_pass);
// Stop WiFi maintenance connection ticker if enabled and display debug messages // Stop WiFi maintenance connection ticker if enabled and display debug messages
#ifdef FEATURE_ENABLE_WIFI_CLIENT #ifdef FEATURE_ENABLE_WIFI_CLIENT

8
Software/src/struct2json.cpp
View File

@ -3,10 +3,10 @@
* *
* @brief Implementation file for converting structs to JSON objects. * @brief Implementation file for converting structs to JSON objects.
* *
* @note This file is auto-generated by a script on 2024-05-30 22:54:25. * @note This file is auto-generated by a script on 2024-06-06 18:52:33.
* *
* @author Marcel Peterkau * @author Marcel Peterkau
* @date 30.05.2024 * @date 06.06.2024
*/ */
@ -20,8 +20,6 @@ void generateJsonObject_ConfigData(JsonObject data)
data["Faction_1_Name"] = ConfigData.Faction_1_Name; data["Faction_1_Name"] = ConfigData.Faction_1_Name;
data["Faction_2_Name"] = ConfigData.Faction_2_Name; data["Faction_2_Name"] = ConfigData.Faction_2_Name;
data["Faction_3_Name"] = ConfigData.Faction_3_Name; data["Faction_3_Name"] = ConfigData.Faction_3_Name;
data["wifi_ap_ssid"] = ConfigData.wifi_ap_ssid;
data["wifi_ap_password"] = ConfigData.wifi_ap_password;
data["wifi_client_ssid"] = ConfigData.wifi_client_ssid; data["wifi_client_ssid"] = ConfigData.wifi_client_ssid;
data["wifi_client_password"] = ConfigData.wifi_client_password; data["wifi_client_password"] = ConfigData.wifi_client_password;
data["wifi_autoconnect"] = ConfigData.wifi_autoconnect; data["wifi_autoconnect"] = ConfigData.wifi_autoconnect;
@ -40,4 +38,4 @@ void generateJsonObject_PersistenceData(JsonObject data)
// CODEGENERATOR_CHECKSUM: 735cd4daf9a46bd773bdf5e6cd5a58d61b0d877196399bc2784a0d0ea7af717d // CODEGENERATOR_CHECKSUM: 3a3fd3024dd9dd769ff5d62f61b3ba1b781b7d06e7568a1ddac56d193dba9ee5

3
Software/src/utilities.cpp
View File

@ -121,5 +121,6 @@ void GenerateDeviceSpecificPassword(const char* seed, char* passwordBuffer, size
hash = ((hash << 5) + hash) + c; // hash * 33 + c hash = ((hash << 5) + hash) + c; // hash * 33 + c
} }
snprintf(passwordBuffer, bufferLength, "%08X", hash); snprintf(passwordBuffer, bufferLength, "%08X%08X", hash, hash);
passwordBuffer[bufferLength - 1] = '\0'; // Ensure null termination
} }

2
Software/src/webui.cpp
View File

@ -295,8 +295,6 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f
strncpy(ConfigData.Faction_1_Name, json["config"]["Faction_1_Name"].as<const char *>(), sizeof(ConfigData.Faction_1_Name)); strncpy(ConfigData.Faction_1_Name, json["config"]["Faction_1_Name"].as<const char *>(), sizeof(ConfigData.Faction_1_Name));
strncpy(ConfigData.Faction_2_Name, json["config"]["Faction_2_Name"].as<const char *>(), sizeof(ConfigData.Faction_2_Name)); strncpy(ConfigData.Faction_2_Name, json["config"]["Faction_2_Name"].as<const char *>(), sizeof(ConfigData.Faction_2_Name));
strncpy(ConfigData.Faction_3_Name, json["config"]["Faction_3_Name"].as<const char *>(), sizeof(ConfigData.Faction_3_Name)); strncpy(ConfigData.Faction_3_Name, json["config"]["Faction_3_Name"].as<const char *>(), sizeof(ConfigData.Faction_3_Name));
strncpy(ConfigData.wifi_ap_ssid, json["config"]["wifi_ap_ssid"].as<const char *>(), sizeof(ConfigData.wifi_ap_ssid));
strncpy(ConfigData.wifi_ap_password, json["config"]["wifi_ap_password"].as<const char *>(), sizeof(ConfigData.wifi_ap_password));
strncpy(ConfigData.wifi_client_ssid, json["config"]["wifi_client_ssid"].as<const char *>(), sizeof(ConfigData.wifi_client_ssid)); strncpy(ConfigData.wifi_client_ssid, json["config"]["wifi_client_ssid"].as<const char *>(), sizeof(ConfigData.wifi_client_ssid));
strncpy(ConfigData.wifi_client_password, json["config"]["wifi_client_password"].as<const char *>(), sizeof(ConfigData.wifi_client_password)); strncpy(ConfigData.wifi_client_password, json["config"]["wifi_client_password"].as<const char *>(), sizeof(ConfigData.wifi_client_password));