pw form fields

Author: martin-ger

components/http_server/http_server.c

@@ -3263,15 +3263,17 @@ static esp_err_t vpn_get_handler(httpd_req_t *req)
 
                     if (httpd_query_key_value(buf, "vpn_privkey", param, sizeof(param)) == ESP_OK) {
                         preprocess_string(param);
-                        nvs_set_str(nvs, "vpn_privkey", param);
+                        if (param[0] != '\0')
+                            nvs_set_str(nvs, "vpn_privkey", param);
                     }
                     if (httpd_query_key_value(buf, "vpn_pubkey", param, sizeof(param)) == ESP_OK) {
                         preprocess_string(param);
                         nvs_set_str(nvs, "vpn_pubkey", param);
                     }
                     if (httpd_query_key_value(buf, "vpn_psk", param, sizeof(param)) == ESP_OK) {
                         preprocess_string(param);
-                        nvs_set_str(nvs, "vpn_psk", param);
+                        if (param[0] != '\0')
+                            nvs_set_str(nvs, "vpn_psk", param);
                     }
                     if (httpd_query_key_value(buf, "vpn_endpoint", param, sizeof(param)) == ESP_OK) {
                         preprocess_string(param);
@@ -3381,8 +3383,8 @@ static esp_err_t vpn_get_handler(httpd_req_t *req)
     httpd_resp_send_chunk(req, row, HTTPD_RESP_USE_STRLEN);
 
     snprintf(row, VPN_BUF_SIZE,
-        "<tr><td>Private Key</td><td><input type='password' name='vpn_privkey' value='%s' placeholder='Base64 private key'/></td></tr>",
-        vpn_private_key ? vpn_private_key : "");
+        "<tr><td>Private Key</td><td><input type='password' name='vpn_privkey' placeholder='%s'/></td></tr>",
+        (vpn_private_key && vpn_private_key[0]) ? "unchanged" : "Base64 private key");
     httpd_resp_send_chunk(req, row, HTTPD_RESP_USE_STRLEN);
 
     snprintf(row, VPN_BUF_SIZE,
@@ -3391,8 +3393,8 @@ static esp_err_t vpn_get_handler(httpd_req_t *req)
     httpd_resp_send_chunk(req, row, HTTPD_RESP_USE_STRLEN);
 
     snprintf(row, VPN_BUF_SIZE,
-        "<tr><td>Preshared Key</td><td><input type='password' name='vpn_psk' value='%s' placeholder='Optional'/></td></tr>",
-        vpn_preshared_key ? vpn_preshared_key : "");
+        "<tr><td>Preshared Key</td><td><input type='password' name='vpn_psk' placeholder='%s'/></td></tr>",
+        (vpn_preshared_key && vpn_preshared_key[0]) ? "unchanged" : "Optional");
     httpd_resp_send_chunk(req, row, HTTPD_RESP_USE_STRLEN);
 
     snprintf(row, VPN_BUF_SIZE,

components/http_server/pages/page_config.h

@@ -72,7 +72,7 @@ setTimeout(\"location.href = '/'\", 10000);\
 <form action='' method='GET'>\
 <table>\
 <tr><td>SSID</td><td><input type='text' name='ap_ssid' value='%s' placeholder='Network name'/></td></tr>\
-<tr><td>Password</td><td><input type='text' id='ap_pw' name='ap_password' placeholder='unchanged' oninput=\"document.getElementById('ap_op').checked=false;\"/></td></tr>\
+<tr><td>Password</td><td><input type='password' id='ap_pw' name='ap_password' placeholder='unchanged' oninput=\"document.getElementById('ap_op').checked=false;\"/></td></tr>\
 <tr><td>AP IP Address</td><td><input type='text' name='ap_ip_addr' value='%s' placeholder='192.168.4.1'/></td></tr>\
 <tr><td>DNS Server</td><td><input type='text' name='ap_dns' value='%s' placeholder='empty = use upstream DNS'/></td></tr>\
 <tr><td>MAC Address</td><td><input type='text' name='ap_mac' value='%s' placeholder='AA:BB:CC:DD:EE:FF'/></td></tr>\
@@ -108,7 +108,7 @@ setTimeout(\"location.href = '/'\", 10000);\
 <form action='' method='GET'>\
 <table>\
 <tr><td>SSID</td><td><input type='text' name='ssid' value='%s' placeholder='Uplink network'/></td></tr>\
-<tr><td>Password</td><td><input type='text' name='password' placeholder='unchanged'/></td></tr>\
+<tr><td>Password</td><td><input type='password' name='password' placeholder='unchanged'/></td></tr>\
 " CONFIG_CHUNK_STA_BAND_ROW "\
 <tr><td colspan='2' style='padding-top: 1rem; color: #888; font-size: 0.85rem;'>WPA2 Enterprise (optional)</td></tr>\
 <tr><td>Username</td><td><input type='text' name='ent_username' value='%s' placeholder='Enterprise username'/></td></tr>\