yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 09:49:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1587 from dalathegreat/bugfix/passwords-dashes

Browse source 
Bugfix: Allow dash as special character in usernames/passwords
This commit is contained in:
Daniel Öster 2025-10-01 20:08:27 +03:00 • committed by GitHub
commit f9109d0348
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Software/src/devboard/webserver/settings_html.cpp
View file

@ -1249,14 +1249,14 @@ const char* getCANInterfaceName(CAN_Interface interface) {
<label>Access point name: </label> <label>Access point name: </label>
<input type='text' name='APNAME' value="%APNAME%" <input type='text' name='APNAME' value="%APNAME%"
pattern="[A-Za-z0-9!#*]{8,63}" pattern="[A-Za-z0-9!#*-]{8,63}"
title="Name must be 8-63 characters long and may only contain letters, numbers and some special characters: !#*" title="Name must be 8-63 characters long and may only contain letters, numbers and some special characters: !#*-"
required /> required />
<label>Access point password: </label> <label>Access point password: </label>
<input type='text' name='APPASSWORD' value="%APPASSWORD%" <input type='text' name='APPASSWORD' value="%APPASSWORD%"
pattern="[A-Za-z0-9!#*]{8,63}" pattern="[A-Za-z0-9!#*-]{8,63}"
title="Password must be 8-63 characters long and may only contain letters, numbers and some special characters: !#*" title="Password must be 8-63 characters long and may only contain letters, numbers and some special characters: !#*-"
required /> required />
<label>Wifi channel 0-14: </label> <label>Wifi channel 0-14: </label>
@ -1266,8 +1266,8 @@ const char* getCANInterfaceName(CAN_Interface interface) {
<label>Custom Wifi hostname: </label> <label>Custom Wifi hostname: </label>
<input type='text' name='HOSTNAME' value="%HOSTNAME%" <input type='text' name='HOSTNAME' value="%HOSTNAME%"
pattern="[A-Za-z0-9!*]+" pattern="[A-Za-z0-9!#*-]+"
title="Optional: Hostname may only contain only letters, numbers, ! and *" /> title="Optional: Hostname may only contain letters, numbers and some special characters: !#*-" />
<label>Use static IP address: </label> <label>Use static IP address: </label>
<input type='checkbox' name='STATICIP' value='on' %STATICIP% /> <input type='checkbox' name='STATICIP' value='on' %STATICIP% />
@ -1312,11 +1312,11 @@ const char* getCANInterfaceName(CAN_Interface interface) {
min="1" max="65535" step="1" min="1" max="65535" step="1"
title="Port number (1-65535)" /> title="Port number (1-65535)" />
<label>MQTT user: </label><input type='text' name='MQTTUSER' value="%MQTTUSER%" <label>MQTT user: </label><input type='text' name='MQTTUSER' value="%MQTTUSER%"
pattern="[A-Za-z0-9!#*]+" pattern="[A-Za-z0-9!#*-]+"
title="MQTT username can only contain letters, numbers and some special characters: !#*" /> title="MQTT username can only contain letters, numbers and some special characters: !#*-" />
<label>MQTT password: </label><input type='password' name='MQTTPASSWORD' value="%MQTTPASSWORD%" <label>MQTT password: </label><input type='password' name='MQTTPASSWORD' value="%MQTTPASSWORD%"
pattern="[A-Za-z0-9!#*]+" pattern="[A-Za-z0-9!#*-]+"
title="MQTT password can only contain letters, numbers and some special characters: !#*" /> title="MQTT password can only contain letters, numbers and some special characters: !#*-" />
<label>MQTT timeout ms: </label> <label>MQTT timeout ms: </label>
<input name='MQTTTIMEOUT' type='number' value="%MQTTTIMEOUT%" <input name='MQTTTIMEOUT' type='number' value="%MQTTTIMEOUT%"
min="1" max="60000" step="1" min="1" max="60000" step="1"

1
Software/src/devboard/wifi/wifi.cpp
View file

@ -240,7 +240,6 @@ void init_mDNS() {
} }
void init_WiFi_AP() { void init_WiFi_AP() {
ssidAP = std::string("BatteryEmulator") + WiFi.macAddress().c_str();
DEBUG_PRINTF("Creating Access Point: %s\n", ssidAP.c_str()); DEBUG_PRINTF("Creating Access Point: %s\n", ssidAP.c_str());
DEBUG_PRINTF("With password: %s\n", passwordAP.c_str()); DEBUG_PRINTF("With password: %s\n", passwordAP.c_str());