Bug fixes

Author: gnmyt

client/src/common/components/StorageDialog/tabs/Configuration.jsx

@@ -38,6 +38,7 @@ export default () => {
                         close();
                     } else {
                         updateToast(t("storage.import_config_error"), "red");
+                        close();
                     }
                 });
             }

server/controller/config.js

@@ -83,10 +83,10 @@ module.exports.getUsedStorage = async () => {
 module.exports.validateInput = async (key, value) => {
     if (!value?.toString()) return "You need to provide the new value";
 
-    if ((key === "ping" || key === "download" || key === "upload") && isNaN(value))
+    if ((key === "ping" || key === "download" || key === "upload") && /[^0-9]/.test(value))
         return "You need to provide a number in order to change this";
 
-    if ((key === "ooklaId" || key === "libreId") && (isNaN(value) && value !== "none"))
+    if ((key === "ooklaId" || key === "libreId") && (/[^0-9]/.test(value) && value !== "none"))
         return "You need to provide a number in order to change this";
 
     if (key === "passwordLevel" && !["none", "read"].includes(value))

server/controller/pause.js

@@ -6,7 +6,8 @@ module.exports.updateState = (newState) => {
 }
 
 module.exports.resumeIn = (hours) => {
-    if (isNaN(hours)) return;
+    if (/[^0-9]/.test(hours)) return false;
+
 
     if (updateTimer !== null) 
         clearTimeout(updateTimer);

server/routes/prometheus.js

@@ -40,7 +40,9 @@ app.get('/metrics', async (req, res) => {
     downloadGauge.set(latest.download);
     uploadGauge.set(latest.upload);
     currentServerGauge.set(latest.serverId);
-    timeGauge.set(latest.time);
+
+    if (latest.time)
+        timeGauge.set(latest.time);
 
     res.set('Content-Type', promClient.register.contentType);
     res.end(await promClient.register.metrics());

server/routes/speedtests.js

@@ -6,7 +6,7 @@ const testTask = require("../tasks/speedtest");
 const password = require('../middlewares/password');
 
 app.get("/", password(true), async (req, res) => {
-    if (req.query.limit && isNaN(req.query.limit))
+    if (req.query.limit && /[^0-9]/.test(req.query.limit))
         return res.status(400).json({message: "You need to provide a correct number in the limit parameter"});
 
     res.json(await tests.listTests(req.query.hours || 24, req.query.start, req.query.limit));

server/routes/storage.js

@@ -34,6 +34,9 @@ app.delete("/tests/history", password(false), async (req, res) => {
 });
 
 app.put("/tests/history", password(false), async (req, res) => {
+    if (process.env.PREVIEW_MODE === "true")
+        return res.status(403).json({message: "You can't import the tests in preview mode"});
+
     let result = await tests.importTests(req.body);
     res.status(result ? 200 : 500).json({message: result ? "Tests imported" : "Error importing tests"});
 });
@@ -44,6 +47,8 @@ app.get("/config", password(false), async (req, res) => {
 });
 
 app.put("/config", password(false), async (req, res) => {
+    if (process.env.PREVIEW_MODE === "true")
+        return res.status(403).json({message: "You can't import the config in preview mode"});
     let result = await config.importConfig(req.body);
     res.status(result ? 200 : 500).json({message: result ? "Config imported" : "Error importing config"});
 });

server/tasks/speedtest.js

@@ -88,8 +88,8 @@ module.exports.create = async (type = "auto", retried = false) => {
             await new Promise(resolve => setTimeout(resolve, 5000));
             test = {
                 ping: {latency: Math.floor(Math.random() * 25) + 5},
-                download: {bytes: Math.floor(Math.random() * 1000000000) + 1000000, elapsed: 10000},
-                upload: {bytes: Math.floor(Math.random() * 1000000000) + 1000000, elapsed: 10000}
+                download: {bandwidth: 125 * 100000 * (Math.random() + 0.5), elapsed: 10000},
+                upload: {bandwidth: 125 * 100000 * (Math.random() + 0.5), elapsed: 10000},
             }
         } else {
             test = await this.run(retried);
@@ -104,6 +104,7 @@ module.exports.create = async (type = "auto", retried = false) => {
         setRunning(false);
         sendFinished({ping, download, upload, time}).then(() => "");
     } catch (e) {
+        console.log(e)
         if (!retried) return this.create(type, true);
         let testResult = await tests.create(-1, -1, -1, null, 0, type, null, e.message);
         await sendError(e.message);

server/util/providers/parseData.js

@@ -8,7 +8,7 @@ module.exports.parseOokla = (test) => {
     let upload = roundSpeed(test.upload.bandwidth);
     let time = Math.round((test.download.elapsed + test.upload.elapsed) / 1000);
 
-    return {ping, download, upload, time, resultId: test.result.id};
+    return {ping, download, upload, time, resultId: test.result?.id};
 }
 
 module.exports.parseLibre = (test) => ({...test, ping: Math.round(test.ping), time: Math.round(test.elapsed / 1000),