Fix URL encoding

maakbaas · Nov 15, 2022 · 813418e · 813418e
1 parent 3efb0d7
commit 813418e
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 131 deletions.
diff --git a/gui/js/comp/FileListing.js b/gui/js/comp/FileListing.js
@@ -106,7 +106,7 @@ export function FileListing(props) {
                                 <a href={`${props.API}/download/${state.files[i]}`} rel="noreferrer" target="_blank" onClick={(e) => { e.stopPropagation();}}>
                                     <Button title={loc.filesDl}><Download /></Button>
                                 </a>                
-                                <Fetch href={`${props.API}/api/files/remove?filename=${state.files[i]}`} POST onFinished={fetchData}>
+                                <Fetch href={`${props.API}/api/files/remove?filename=${encodeURIComponent(state.files[i])}`} POST onFinished={fetchData}>
                                     <RedButton title={loc.filesRm} ><Trash2 /></RedButton>
                                 </Fetch>   
                             </div>

diff --git a/gui/js/comp/FirmwarePage.js b/gui/js/comp/FirmwarePage.js
@@ -105,7 +105,7 @@ export function FirmwarePage(props) {
     </>;  
 
     function startFlashing() {        
-        fetch(`${props.API}/api/update?filename=${filename}`, { method: "POST" })
+        fetch(`${props.API}/api/update?filename=${encodeURIComponent(filename)}`, { method: "POST" })
             .then((response) => { return response.status; })
             .then((status) => {
                 if (status == 200) {

diff --git a/gui/js/comp/WifiPage.js b/gui/js/comp/WifiPage.js
@@ -30,9 +30,9 @@ export function WifiPage(props) {
 
     function changeWifi() {
         if (dhcpForm) {
-            fetch(`${props.API}/api/wifi/set?ssid=${escape(document.getElementById("ssid").value.trim())}&pass=${escape(document.getElementById("pass").value.trim())}`, { method: "POST" });
+            fetch(`${props.API}/api/wifi/set?ssid=${encodeURIComponent(document.getElementById("ssid").value.trim())}&pass=${encodeURIComponent(document.getElementById("pass").value.trim())}`, { method: "POST" });
         } else {
-            fetch(`${props.API}/api/wifi/setStatic?ssid=${escape(document.getElementById("ssid").value.trim())}&pass=${escape(document.getElementById("pass").value.trim())}&ip=${escape(document.getElementById("ip").value.trim())}&sub=${escape(document.getElementById("sub").value.trim())}&gw=${escape(document.getElementById("gw").value.trim())}&dns=${escape(document.getElementById("dns").value.trim())}`, { method: "POST" });
+            fetch(`${props.API}/api/wifi/setStatic?ssid=${encodeURIComponent(document.getElementById("ssid").value.trim())}&pass=${encodeURIComponent(document.getElementById("pass").value.trim())}&ip=${encodeURIComponent(document.getElementById("ip").value.trim())}&sub=${encodeURIComponent(document.getElementById("sub").value.trim())}&gw=${encodeURIComponent(document.getElementById("gw").value.trim())}&dns=${encodeURIComponent(document.getElementById("dns").value.trim())}`, { method: "POST" });
             document.getElementById("ip").value = "";
             document.getElementById("gw").value = "";
             document.getElementById("sub").value = "";