Update to 1.14.0-beta.0

Merge pull request #1427 from louislam/cloudflared
Built-in ease-to-use reverse proxy with Cloudflare Tunnel
2025-09-11 05:16:55 +08:00 · 2022-03-30 23:37:23 +08:00 · 2022-03-30 20:15:48 +08:00 · 2022-03-30 20:08:26 +08:00 · 2022-03-30 18:52:10 +08:00 · 2022-03-30 11:59:49 +08:00
35 changed files with 895 additions and 201 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -196,14 +196,13 @@ https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc
 ### Release Procedures

 1. Draft a release note
-1. Make sure the repo is cleared
-1. `npm run update-version 1.X.X`
-1. `npm run build`
-1. `npm run build-docker`
-1. `git push`
-1. Publish the release note as 1.X.X 
-1. `npm run upload-artifacts` with env vars VERSION=1.X.X;GITHUB_TOKEN=XXXX
-1. SSH to demo site server and update to 1.X.X
+2. Make sure the repo is cleared
+3. `npm run release-final with env vars: `VERSION` and `GITHUB_TOKEN`
+4. Wait until the `Press any key to continue`
+5. `git push`
+6. Publish the release note as 1.X.X 
+7. Press any key to continue
+8. SSH to demo site server and update to 1.X.X

 Checking:

@@ -216,6 +215,7 @@ Checking:
 1. Draft a release note, check "This is a pre-release"
 2. Make sure the repo is cleared
 3. `npm run release-beta` with env vars: `VERSION` and `GITHUB_TOKEN`
+4. Wait until the `Press any key to continue`
 5. Publish the release note as 1.X.X-beta.X
 6. Press any key to continue

--- a/README.md
+++ b/README.md
@@ -61,8 +61,14 @@ npm run setup
 node server/server.js

 # (Recommended) Option 2. Run in background using PM2
-# Install PM2 if you don't have it: npm install pm2 -g
+# Install PM2 if you don't have it: 
+npm install pm2 -g && pm2 install pm2-logrotate
+
+# Start Server
 pm2 start server/server.js --name uptime-kuma
+
+# If you want to see the current console output
+pm2 monit
 ```

 Browse to http://localhost:3001 after starting.
--- a/docker/debian-base.dockerfile
+++ b/docker/debian-base.dockerfile
@@ -1,8 +1,11 @@
 # DON'T UPDATE TO node:14-bullseye-slim, see #372.
 # If the image changed, the second stage image should be changed too
 FROM node:16-buster-slim
+ARG TARGETPLATFORM
+
 WORKDIR /app

+# Install Curl
 # Install Apprise, add sqlite3 cli for debugging in the future, iputils-ping for ping, util-linux for setpriv
 # Stupid python3 and python3-pip actually install a lot of useless things into Debian, specify --no-install-recommends to skip them, make the base even smaller than alpine!
 RUN apt update && \
@@ -10,3 +13,14 @@ RUN apt update && \
        sqlite3 iputils-ping util-linux dumb-init && \
    pip3 --no-cache-dir install apprise==0.9.7 && \
    rm -rf /var/lib/apt/lists/*
+
+# Install cloudflared
+# dpkg --add-architecture arm: cloudflared do not provide armhf, this is workaround. Read more: https://github.com/cloudflare/cloudflared/issues/583
+COPY extra/download-cloudflared.js ./extra/download-cloudflared.js
+RUN node ./extra/download-cloudflared.js $TARGETPLATFORM && \
+    dpkg --add-architecture arm && \
+    apt update && \
+    apt --yes --no-install-recommends install ./cloudflared.deb && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -f cloudflared.deb
+
--- a/extra/beta/update-version.js
+++ b/extra/beta/update-version.js
@@ -44,6 +44,9 @@ function commit(version) {
    if (stdout.includes("no changes added to commit")) {
        throw new Error("commit error");
    }
+
+    res = child_process.spawnSync("git", ["push", "origin", "master"]);
+    console.log(res.stdout.toString().trim());
 }

 function tag(version) {
--- a/extra/download-cloudflared.js
+++ b/extra/download-cloudflared.js
@@ -0,0 +1,44 @@
+//
+
+const http = require("https"); // or 'https' for https:// URLs
+const fs = require("fs");
+
+const platform = process.argv[2];
+
+if (!platform) {
+    console.error("No platform??");
+    process.exit(1);
+}
+
+let arch = null;
+
+if (platform === "linux/amd64") {
+    arch = "amd64";
+} else if (platform === "linux/arm64") {
+    arch = "arm64";
+} else if (platform === "linux/arm/v7") {
+    arch = "arm";
+} else {
+    console.error("Invalid platform?? " + platform);
+}
+
+const file = fs.createWriteStream("cloudflared.deb");
+get("https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-" + arch + ".deb");
+
+function get(url) {
+    http.get(url, function (res) {
+        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+            console.log("Redirect to " + res.headers.location);
+            get(res.headers.location);
+        } else if (res.statusCode >= 200 && res.statusCode < 300) {
+            res.pipe(file);
+
+            res.on("end", function () {
+                console.log("Downloaded");
+            });
+        } else {
+            console.error(res.statusCode);
+            process.exit(1);
+        }
+    });
+}
--- a/extra/install.batsh
+++ b/extra/install.batsh
@@ -189,7 +189,7 @@ if (type == "local") {
   bash("check=$(pm2 --version)");
   if (check == "") {
       println("Installing PM2");
-       bash("npm install pm2 -g");
+       bash("npm install pm2 -g && pm2 install pm2-logrotate");
       bash("pm2 startup");
   }

--- a/extra/press-any-key.js
+++ b/extra/press-any-key.js
@@ -1,4 +1,4 @@
-console.log("Publish the release note on github, then press any key to continue");
+console.log("Git Push and Publish the release note on github, then press any key to continue");

 process.stdin.setRawMode(true);
 process.stdin.resume();
--- a/extra/update-version.js
+++ b/extra/update-version.js
@@ -5,10 +5,8 @@ const util = require("../src/util");

 util.polyfill();

-const oldVersion = pkg.version;
-const newVersion = process.argv[2];
+const newVersion = process.env.VERSION;

-console.log("Old Version: " + oldVersion);
 console.log("New Version: " + newVersion);

 if (! newVersion) {
@@ -22,17 +20,14 @@ if (! exists) {

    // Process package.json
    pkg.version = newVersion;
-    pkg.scripts.setup = pkg.scripts.setup.replaceAll(oldVersion, newVersion);
-    pkg.scripts["build-docker"] = pkg.scripts["build-docker"].replaceAll(oldVersion, newVersion);
-    pkg.scripts["build-docker-alpine"] = pkg.scripts["build-docker-alpine"].replaceAll(oldVersion, newVersion);
-    pkg.scripts["build-docker-debian"] = pkg.scripts["build-docker-debian"].replaceAll(oldVersion, newVersion);
+
+    // Replace the version: https://regex101.com/r/hmj2Bc/1
+    pkg.scripts.setup = pkg.scripts.setup.replace(/(git checkout )([^\s]+)/, `$1${newVersion}`);
    fs.writeFileSync("package.json", JSON.stringify(pkg, null, 4) + "\n");

    commit(newVersion);
    tag(newVersion);

-    updateWiki(oldVersion, newVersion);
-
 } else {
    console.log("version exists");
 }
@@ -64,37 +59,3 @@ function tagExists(version) {
    return res.stdout.toString().trim() === version;
 }

-function updateWiki(oldVersion, newVersion) {
-    const wikiDir = "./tmp/wiki";
-    const howToUpdateFilename = "./tmp/wiki/🆙-How-to-Update.md";
-
-    safeDelete(wikiDir);
-
-    child_process.spawnSync("git", ["clone", "https://github.com/louislam/uptime-kuma.wiki.git", wikiDir]);
-    let content = fs.readFileSync(howToUpdateFilename).toString();
-    content = content.replaceAll(`git checkout ${oldVersion}`, `git checkout ${newVersion}`);
-    fs.writeFileSync(howToUpdateFilename, content);
-
-    child_process.spawnSync("git", ["add", "-A"], {
-        cwd: wikiDir,
-    });
-
-    child_process.spawnSync("git", ["commit", "-m", `Update to ${newVersion} from ${oldVersion}`], {
-        cwd: wikiDir,
-    });
-
-    console.log("Pushing to Github");
-    child_process.spawnSync("git", ["push"], {
-        cwd: wikiDir,
-    });
-
-    safeDelete(wikiDir);
-}
-
-function safeDelete(dir) {
-    if (fs.existsSync(dir)) {
-        fs.rmdirSync(dir, {
-            recursive: true,
-        });
-    }
-}
--- a/extra/update-wiki-version.js
+++ b/extra/update-wiki-version.js
@@ -0,0 +1,48 @@
+const child_process = require("child_process");
+const fs = require("fs");
+
+const newVersion = process.env.VERSION;
+
+if (!newVersion) {
+    console.log("Missing version");
+    process.exit(1);
+}
+
+updateWiki(newVersion);
+
+function updateWiki(newVersion) {
+    const wikiDir = "./tmp/wiki";
+    const howToUpdateFilename = "./tmp/wiki/🆙-How-to-Update.md";
+
+    safeDelete(wikiDir);
+
+    child_process.spawnSync("git", ["clone", "https://github.com/louislam/uptime-kuma.wiki.git", wikiDir]);
+    let content = fs.readFileSync(howToUpdateFilename).toString();
+
+    // Replace the version: https://regex101.com/r/hmj2Bc/1
+    content = content.replace(/(git checkout )([^\s]+)/, `$1${newVersion}`);
+    fs.writeFileSync(howToUpdateFilename, content);
+
+    child_process.spawnSync("git", ["add", "-A"], {
+        cwd: wikiDir,
+    });
+
+    child_process.spawnSync("git", ["commit", "-m", `Update to ${newVersion}`], {
+        cwd: wikiDir,
+    });
+
+    console.log("Pushing to Github");
+    child_process.spawnSync("git", ["push"], {
+        cwd: wikiDir,
+    });
+
+    safeDelete(wikiDir);
+}
+
+function safeDelete(dir) {
+    if (fs.existsSync(dir)) {
+        fs.rmdirSync(dir, {
+            recursive: true,
+        });
+    }
+}
--- a/install.sh
+++ b/install.sh
@@ -159,7 +159,7 @@ fi
  check=$(pm2 --version)
  if [ "$check" == "" ]; then
    "echo" "-e" "Installing PM2"
-    npm install pm2 -g
+    npm install pm2 -g && pm2 install pm2-logrotate
    pm2 startup  
 fi
  mkdir -p $installPath
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "uptime-kuma",
-    "version": "1.12.1",
+    "version": "1.13.1",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
        "": {
            "name": "uptime-kuma",
-            "version": "1.12.1",
+            "version": "1.13.1",
            "license": "MIT",
            "dependencies": {
                "@fortawesome/fontawesome-svg-core": "~1.2.36",
@@ -36,6 +36,7 @@
                "jsonwebtoken": "~8.5.1",
                "jwt-decode": "^3.1.2",
                "limiter": "^2.1.0",
+                "node-cloudflared-tunnel": "~1.0.9",
                "nodemailer": "~6.6.5",
                "notp": "~2.0.3",
                "password-hash": "~1.2.2",
@@ -11160,6 +11161,14 @@
            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
            "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
        },
+        "node_modules/node-cloudflared-tunnel": {
+            "version": "1.0.9",
+            "resolved": "https://registry.npmjs.org/node-cloudflared-tunnel/-/node-cloudflared-tunnel-1.0.9.tgz",
+            "integrity": "sha512-d0mhIM5P2ldE2yHChehC6EvnpFCkifWRzWrW81gVWdcCWqNcyISXuDdOYzRW5mwmjWuT6WNtLJoGQ84uqS4EmA==",
+            "dependencies": {
+                "command-exists": "^1.2.9"
+            }
+        },
        "node_modules/node-fetch": {
            "version": "2.6.7",
            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
@@ -24071,6 +24080,14 @@
            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
            "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
        },
+        "node-cloudflared-tunnel": {
+            "version": "1.0.9",
+            "resolved": "https://registry.npmjs.org/node-cloudflared-tunnel/-/node-cloudflared-tunnel-1.0.9.tgz",
+            "integrity": "sha512-d0mhIM5P2ldE2yHChehC6EvnpFCkifWRzWrW81gVWdcCWqNcyISXuDdOYzRW5mwmjWuT6WNtLJoGQ84uqS4EmA==",
+            "requires": {
+                "command-exists": "^1.2.9"
+            }
+        },
        "node-fetch": {
            "version": "2.6.7",
            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "uptime-kuma",
-    "version": "1.13.0-beta.2",
+    "version": "1.14.0-beta.0",
    "license": "MIT",
    "repository": {
        "type": "git",
@@ -30,15 +30,14 @@
        "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine",
        "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push",
        "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push",
-        "build-docker-alpine": "cross-env-shell docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$npm_package_version-alpine --target release . --push",
-        "build-docker-debian": "cross-env-shell docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$npm_package_version -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$npm_package_version-debian --target release . --push",
+        "build-docker-alpine": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$VERSION-alpine --target release . --push",
+        "build-docker-debian": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$VERSION-debian --target release . --push",
        "build-docker-nightly": "npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
        "build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
        "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
        "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.12.1 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.13.1 && npm ci --production && npm run download-dist",
        "download-dist": "node extra/download-dist.js",
-        "update-version": "node extra/update-version.js",
        "mark-as-nightly": "node extra/mark-as-nightly.js",
        "reset-password": "node extra/reset-password.js",
        "remove-2fa": "node extra/remove-2fa.js",
@@ -52,6 +51,7 @@
        "update-language-files-with-base-lang": "cd extra/update-language-files && node index.js %npm_config_base_lang% && eslint ../../src/languages/**.js --fix",
        "update-language-files": "cd extra/update-language-files && node index.js && eslint ../../src/languages/**.js --fix",
        "ncu-patch": "npm-check-updates -u -t patch",
+        "release-final": "node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js",
        "release-beta": "node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta .  --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts",
        "git-remove-tag": "git tag -d"
    },
@@ -83,6 +83,7 @@
        "jsonwebtoken": "~8.5.1",
        "jwt-decode": "^3.1.2",
        "limiter": "^2.1.0",
+        "node-cloudflared-tunnel": "~1.0.9",
        "nodemailer": "~6.6.5",
        "notp": "~2.0.3",
        "password-hash": "~1.2.2",
--- a/server/auth.js
+++ b/server/auth.js
@@ -12,6 +12,10 @@ const { loginRateLimiter } = require("./rate-limiter");
 * @returns {Promise<Bean|null>}
 */
 exports.login = async function (username, password) {
+    if (typeof username !== "string" || typeof password !== "string") {
+        return null;
+    }
+
    let user = await R.findOne("user", " username = ? AND active = 1 ", [
        username,
    ]);
@@ -31,31 +35,34 @@ exports.login = async function (username, password) {
 };

 function myAuthorizer(username, password, callback) {
-    setting("disableAuth").then((result) => {
-        if (result) {
-            callback(null, true);
-        } else {
-            // Login Rate Limit
-            loginRateLimiter.pass(null, 0).then((pass) => {
-                if (pass) {
-                    exports.login(username, password).then((user) => {
-                        callback(null, user != null);
+    // Login Rate Limit
+    loginRateLimiter.pass(null, 0).then((pass) => {
+        if (pass) {
+            exports.login(username, password).then((user) => {
+                callback(null, user != null);

-                        if (user == null) {
-                            loginRateLimiter.removeTokens(1);
-                        }
-                    });
-                } else {
-                    callback(null, false);
+                if (user == null) {
+                    loginRateLimiter.removeTokens(1);
                }
            });
-
+        } else {
+            callback(null, false);
        }
    });
 }

-exports.basicAuth = basicAuth({
-    authorizer: myAuthorizer,
-    authorizeAsync: true,
-    challenge: true,
-});
+exports.basicAuth = async function (req, res, next) {
+    const middleware = basicAuth({
+        authorizer: myAuthorizer,
+        authorizeAsync: true,
+        challenge: true,
+    });
+
+    const disabledAuth = await setting("disableAuth");
+
+    if (!disabledAuth) {
+        middleware(req, res, next);
+    } else {
+        next();
+    }
+};
--- a/server/database.js
+++ b/server/database.js
@@ -218,6 +218,10 @@ class Database {
     * @returns {Promise<void>}
     */
    static async migrateNewStatusPage() {
+
+        // Fix 1.13.0 empty slug bug
+        await R.exec("UPDATE status_page SET slug = 'empty-slug-recover' WHERE TRIM(slug) = ''");
+
        let title = await setting("title");

        if (title) {
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -477,6 +477,12 @@ class Monitor extends BeanModel {
    stop() {
        clearTimeout(this.heartbeatInterval);
        this.isStop = true;
+
+        this.prometheus().remove();
+    }
+
+    prometheus() {
+        return new Prometheus(this);
    }

    /**
--- a/server/notification-providers/pushover.js
+++ b/server/notification-providers/pushover.js
@@ -9,36 +9,31 @@ class Pushover extends NotificationProvider {
        let okMsg = "Sent Successfully.";
        let pushoverlink = "https://api.pushover.net/1/messages.json";

+        let data = {
+            "message": "<b>Uptime Kuma Alert</b>\n\n<b>Message</b>:" + msg,
+            "user": notification.pushoveruserkey,
+            "token": notification.pushoverapptoken,
+            "sound": notification.pushoversounds,
+            "priority": notification.pushoverpriority,
+            "title": notification.pushovertitle,
+            "retry": "30",
+            "expire": "3600",
+            "html": 1,
+        };
+
+        if (notification.pushoverdevice) {
+            data.device = notification.pushoverdevice;
+        }
+
        try {
            if (heartbeatJSON == null) {
-                let data = {
-                    "message": msg,
-                    "user": notification.pushoveruserkey,
-                    "token": notification.pushoverapptoken,
-                    "sound": notification.pushoversounds,
-                    "priority": notification.pushoverpriority,
-                    "title": notification.pushovertitle,
-                    "retry": "30",
-                    "expire": "3600",
-                    "html": 1,
-                };
+                await axios.post(pushoverlink, data);
+                return okMsg;
+            } else {
+                data.message += "\n<b>Time (UTC)</b>:" + heartbeatJSON["time"];
                await axios.post(pushoverlink, data);
                return okMsg;
            }
-
-            let data = {
-                "message": "<b>Uptime Kuma Alert</b>\n\n<b>Message</b>:" + msg + "\n<b>Time (UTC)</b>:" + heartbeatJSON["time"],
-                "user": notification.pushoveruserkey,
-                "token": notification.pushoverapptoken,
-                "sound": notification.pushoversounds,
-                "priority": notification.pushoverpriority,
-                "title": notification.pushovertitle,
-                "retry": "30",
-                "expire": "3600",
-                "html": 1,
-            };
-            await axios.post(pushoverlink, data);
-            return okMsg;
        } catch (error) {
            this.throwGeneralAxiosError(error);
        }
--- a/server/prometheus.js
+++ b/server/prometheus.js
@@ -86,6 +86,16 @@ class Prometheus {
        }
    }

+    remove() {
+        try {
+            monitor_cert_days_remaining.remove(this.monitorLabelValues);
+            monitor_cert_is_valid.remove(this.monitorLabelValues);
+            monitor_response_time.remove(this.monitorLabelValues);
+            monitor_status.remove(this.monitorLabelValues);
+        } catch (e) {
+            console.error(e);
+        }
+    }
 }

 module.exports = {
--- a/server/rate-limiter.js
+++ b/server/rate-limiter.js
@@ -34,6 +34,14 @@ const loginRateLimiter = new KumaRateLimiter({
    errorMessage: "Too frequently, try again later."
 });

+const twoFaRateLimiter = new KumaRateLimiter({
+    tokensPerInterval: 30,
+    interval: "minute",
+    fireImmediately: true,
+    errorMessage: "Too frequently, try again later."
+});
+
 module.exports = {
-    loginRateLimiter
+    loginRateLimiter,
+    twoFaRateLimiter,
 };
--- a/server/server.js
+++ b/server/server.js
@@ -52,7 +52,7 @@ console.log("Importing this project modules");
 debug("Importing Monitor");
 const Monitor = require("./model/monitor");
 debug("Importing Settings");
-const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, FBSD, errorLog } = require("./util-server");
+const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, FBSD, errorLog, doubleCheckPassword } = require("./util-server");

 debug("Importing Notification");
 const { Notification } = require("./notification");
@@ -63,7 +63,7 @@ const Database = require("./database");

 debug("Importing Background Jobs");
 const { initBackgroundJobs } = require("./jobs");
-const { loginRateLimiter } = require("./rate-limiter");
+const { loginRateLimiter, twoFaRateLimiter } = require("./rate-limiter");

 const { basicAuth } = require("./auth");
 const { login } = require("./auth");
@@ -91,6 +91,7 @@ const port = parseInt(process.env.UPTIME_KUMA_PORT || process.env.PORT || args.p
 const sslKey = process.env.UPTIME_KUMA_SSL_KEY || process.env.SSL_KEY || args["ssl-key"] || undefined;
 const sslCert = process.env.UPTIME_KUMA_SSL_CERT || process.env.SSL_CERT || args["ssl-cert"] || undefined;
 const disableFrameSameOrigin = !!process.env.UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN || args["disable-frame-sameorigin"] || false;
+const cloudflaredToken = args["cloudflared-token"] || process.env.UPTIME_KUMA_CLOUDFLARED_TOKEN || undefined;

 // 2FA / notp verification defaults
 const twofa_verification_opts = {
@@ -133,6 +134,7 @@ const { statusPageSocketHandler } = require("./socket-handlers/status-page-socke
 const databaseSocketHandler = require("./socket-handlers/database-socket-handler");
 const TwoFA = require("./2fa");
 const StatusPage = require("./model/status_page");
+const { cloudflaredSocketHandler, autoStart: cloudflaredAutoStart } = require("./socket-handlers/cloudflared-socket-handler");

 app.use(express.json());

@@ -305,6 +307,15 @@ exports.entryPage = "dashboard";
        socket.on("login", async (data, callback) => {
            console.log("Login");

+            // Checking
+            if (typeof callback !== "function") {
+                return;
+            }
+
+            if (!data) {
+                return;
+            }
+
            // Login Rate Limit
            if (! await loginRateLimiter.pass(callback)) {
                return;
@@ -363,14 +374,27 @@ exports.entryPage = "dashboard";
        });

        socket.on("logout", async (callback) => {
+            // Rate Limit
+            if (! await loginRateLimiter.pass(callback)) {
+                return;
+            }
+
            socket.leave(socket.userID);
            socket.userID = null;
-            callback();
+
+            if (typeof callback === "function") {
+                callback();
+            }
        });

-        socket.on("prepare2FA", async (callback) => {
+        socket.on("prepare2FA", async (currentPassword, callback) => {
            try {
+                if (! await twoFaRateLimiter.pass(callback)) {
+                    return;
+                }
+
                checkLogin(socket);
+                await doubleCheckPassword(socket, currentPassword);

                let user = await R.findOne("user", " id = ? AND active = 1 ", [
                    socket.userID,
@@ -405,14 +429,19 @@ exports.entryPage = "dashboard";
            } catch (error) {
                callback({
                    ok: false,
-                    msg: "Error while trying to prepare 2FA.",
+                    msg: error.message,
                });
            }
        });

-        socket.on("save2FA", async (callback) => {
+        socket.on("save2FA", async (currentPassword, callback) => {
            try {
+                if (! await twoFaRateLimiter.pass(callback)) {
+                    return;
+                }
+
                checkLogin(socket);
+                await doubleCheckPassword(socket, currentPassword);

                await R.exec("UPDATE `user` SET twofa_status = 1 WHERE id = ? ", [
                    socket.userID,
@@ -425,14 +454,19 @@ exports.entryPage = "dashboard";
            } catch (error) {
                callback({
                    ok: false,
-                    msg: "Error while trying to change 2FA.",
+                    msg: error.message,
                });
            }
        });

-        socket.on("disable2FA", async (callback) => {
+        socket.on("disable2FA", async (currentPassword, callback) => {
            try {
+                if (! await twoFaRateLimiter.pass(callback)) {
+                    return;
+                }
+
                checkLogin(socket);
+                await doubleCheckPassword(socket, currentPassword);
                await TwoFA.disable2FA(socket.userID);

                callback({
@@ -442,36 +476,47 @@ exports.entryPage = "dashboard";
            } catch (error) {
                callback({
                    ok: false,
-                    msg: "Error while trying to change 2FA.",
+                    msg: error.message,
                });
            }
        });

-        socket.on("verifyToken", async (token, callback) => {
-            let user = await R.findOne("user", " id = ? AND active = 1 ", [
-                socket.userID,
-            ]);
+        socket.on("verifyToken", async (token, currentPassword, callback) => {
+            try {
+                checkLogin(socket);
+                await doubleCheckPassword(socket, currentPassword);

-            let verify = notp.totp.verify(token, user.twofa_secret, twofa_verification_opts);
+                let user = await R.findOne("user", " id = ? AND active = 1 ", [
+                    socket.userID,
+                ]);

-            if (user.twofa_last_token !== token && verify) {
-                callback({
-                    ok: true,
-                    valid: true,
-                });
-            } else {
+                let verify = notp.totp.verify(token, user.twofa_secret, twofa_verification_opts);
+
+                if (user.twofa_last_token !== token && verify) {
+                    callback({
+                        ok: true,
+                        valid: true,
+                    });
+                } else {
+                    callback({
+                        ok: false,
+                        msg: "Invalid Token.",
+                        valid: false,
+                    });
+                }
+
+            } catch (error) {
                callback({
                    ok: false,
-                    msg: "Invalid Token.",
-                    valid: false,
+                    msg: error.message,
                });
            }
        });

        socket.on("twoFAStatus", async (callback) => {
-            checkLogin(socket);
-
            try {
+                checkLogin(socket);
+
                let user = await R.findOne("user", " id = ? AND active = 1 ", [
                    socket.userID,
                ]);
@@ -488,9 +533,10 @@ exports.entryPage = "dashboard";
                    });
                }
            } catch (error) {
+                console.log(error);
                callback({
                    ok: false,
-                    msg: "Error while trying to get 2FA status.",
+                    msg: error.message,
                });
            }
        });
@@ -579,6 +625,9 @@ exports.entryPage = "dashboard";
                    throw new Error("Permission denied.");
                }

+                // Reset Prometheus labels
+                monitorList[monitor.id]?.prometheus()?.remove();
+
                bean.name = monitor.name;
                bean.type = monitor.type;
                bean.url = monitor.url;
@@ -936,21 +985,13 @@ exports.entryPage = "dashboard";
                    throw new Error("Password is too weak. It should contain alphabetic and numeric characters. It must be at least 6 characters in length.");
                }

-                let user = await R.findOne("user", " id = ? AND active = 1 ", [
-                    socket.userID,
-                ]);
+                let user = await doubleCheckPassword(socket, password.currentPassword);
+                await user.resetPassword(password.newPassword);

-                if (user && passwordHash.verify(password.currentPassword, user.password)) {
-
-                    user.resetPassword(password.newPassword);
-
-                    callback({
-                        ok: true,
-                        msg: "Password has been updated successfully.",
-                    });
-                } else {
-                    throw new Error("Incorrect current password");
-                }
+                callback({
+                    ok: true,
+                    msg: "Password has been updated successfully.",
+                });

            } catch (e) {
                callback({
@@ -977,10 +1018,14 @@ exports.entryPage = "dashboard";
            }
        });

-        socket.on("setSettings", async (data, callback) => {
+        socket.on("setSettings", async (data, currentPassword, callback) => {
            try {
                checkLogin(socket);

+                if (data.disableAuth) {
+                    await doubleCheckPassword(socket, currentPassword);
+                }
+
                await setSettings("general", data);
                exports.entryPage = data.entryPage;

@@ -1319,6 +1364,7 @@ exports.entryPage = "dashboard";

        // Status Page Socket Handler for admin only
        statusPageSocketHandler(socket);
+        cloudflaredSocketHandler(socket);
        databaseSocketHandler(socket);

        debug("added all socket handlers");
@@ -1361,6 +1407,9 @@ exports.entryPage = "dashboard";

    initBackgroundJobs(args);

+    // Start cloudflared at the end if configured
+    await cloudflaredAutoStart(cloudflaredToken);
+
 })();

 async function updateMonitorNotification(monitorID, notificationIDList) {
--- a/server/socket-handlers/cloudflared-socket-handler.js
+++ b/server/socket-handlers/cloudflared-socket-handler.js
@@ -0,0 +1,84 @@
+const { checkLogin, setSetting, setting, doubleCheckPassword } = require("../util-server");
+const { CloudflaredTunnel } = require("node-cloudflared-tunnel");
+const { io } = require("../server");
+
+const prefix = "cloudflared_";
+const cloudflared = new CloudflaredTunnel();
+
+cloudflared.change = (running, message) => {
+    io.to("cloudflared").emit(prefix + "running", running);
+    io.to("cloudflared").emit(prefix + "message", message);
+};
+
+cloudflared.error = (errorMessage) => {
+    io.to("cloudflared").emit(prefix + "errorMessage", errorMessage);
+};
+
+module.exports.cloudflaredSocketHandler = (socket) => {
+
+    socket.on(prefix + "join", async () => {
+        try {
+            checkLogin(socket);
+            socket.join("cloudflared");
+            io.to(socket.userID).emit(prefix + "installed", cloudflared.checkInstalled());
+            io.to(socket.userID).emit(prefix + "running", cloudflared.running);
+            io.to(socket.userID).emit(prefix + "token", await setting("cloudflaredTunnelToken"));
+        } catch (error) { }
+    });
+
+    socket.on(prefix + "leave", async () => {
+        try {
+            checkLogin(socket);
+            socket.leave("cloudflared");
+        } catch (error) { }
+    });
+
+    socket.on(prefix + "start", async (token) => {
+        try {
+            checkLogin(socket);
+            if (token && typeof token === "string") {
+                cloudflared.token = token;
+            } else {
+                cloudflared.token = null;
+            }
+            cloudflared.start();
+        } catch (error) { }
+    });
+
+    socket.on(prefix + "stop", async (currentPassword, callback) => {
+        try {
+            checkLogin(socket);
+            await doubleCheckPassword(socket, currentPassword);
+            cloudflared.stop();
+        } catch (error) {
+            callback({
+                ok: false,
+                msg: error.message,
+            });
+        }
+    });
+
+    socket.on(prefix + "removeToken", async () => {
+        try {
+            checkLogin(socket);
+            await setSetting("cloudflaredTunnelToken", "");
+        } catch (error) { }
+    });
+
+};
+
+module.exports.autoStart = async (token) => {
+    if (!token) {
+        token = await setting("cloudflaredTunnelToken");
+    } else {
+        // Override the current token via args or env var
+        await setSetting("cloudflaredTunnelToken", token);
+        console.log("Use cloudflared token from args or env var");
+    }
+
+    if (token) {
+        console.log("Start cloudflared");
+        cloudflared.token = token;
+        cloudflared.start();
+    }
+};
--- a/server/socket-handlers/status-page-socket-handler.js
+++ b/server/socket-handlers/status-page-socket-handler.js
@@ -90,6 +90,8 @@ module.exports.statusPageSocketHandler = (socket) => {
    socket.on("saveStatusPage", async (slug, config, imgDataUrl, publicGroupList, callback) => {

        try {
+            checkSlug(config.slug);
+
            checkLogin(socket);
            apicache.clear();

@@ -227,11 +229,7 @@ module.exports.statusPageSocketHandler = (socket) => {
            // lower case only
            slug = slug.toLowerCase();

-            // Check slug a-z, 0-9, - only
-            // Regex from: https://stackoverflow.com/questions/22454258/js-regex-string-validation-for-slug
-            if (!slug.match(/^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$/)) {
-                throw new Error("Invalid Slug");
-            }
+            checkSlug(slug);

            let statusPage = R.dispense("status_page");
            statusPage.slug = slug;
@@ -302,3 +300,23 @@ module.exports.statusPageSocketHandler = (socket) => {
        }
    });
 };
+
+/**
+ * Check slug a-z, 0-9, - only
+ * Regex from: https://stackoverflow.com/questions/22454258/js-regex-string-validation-for-slug
+ */
+function checkSlug(slug) {
+    if (typeof slug !== "string") {
+        throw new Error("Slug must be string");
+    }
+
+    slug = slug.trim();
+
+    if (!slug) {
+        throw new Error("Slug cannot be empty");
+    }
+
+    if (!slug.match(/^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$/)) {
+        throw new Error("Invalid Slug");
+    }
+}
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -1,9 +1,8 @@
 const tcpp = require("tcp-ping");
 const Ping = require("./ping-lite");
 const { R } = require("redbean-node");
-const { debug } = require("../src/util");
+const { debug, genSecret } = require("../src/util");
 const passwordHash = require("./password-hash");
-const dayjs = require("dayjs");
 const { Resolver } = require("dns");
 const child_process = require("child_process");
 const iconv = require("iconv-lite");
@@ -32,7 +31,7 @@ exports.initJWTSecret = async () => {
        jwtSecretBean.key = "jwtSecret";
    }

-    jwtSecretBean.value = passwordHash.generate(dayjs() + "");
+    jwtSecretBean.value = passwordHash.generate(genSecret());
    await R.store(jwtSecretBean);
    return jwtSecretBean;
 };
@@ -321,6 +320,28 @@ exports.checkLogin = (socket) => {
    }
 };

+/**
+ * For logged-in users, double-check the password
+ * @param socket
+ * @param currentPassword
+ * @returns {Promise<Bean>}
+ */
+exports.doubleCheckPassword = async (socket, currentPassword) => {
+    if (typeof currentPassword !== "string") {
+        throw new Error("Wrong data type?");
+    }
+
+    let user = await R.findOne("user", " id = ? AND active = 1 ", [
+        socket.userID,
+    ]);
+
+    if (!user || !passwordHash.verify(currentPassword, user.password)) {
+        throw new Error("Incorrect current password");
+    }
+
+    return user;
+};
+
 exports.startUnitTest = async () => {
    console.log("Starting unit test...");
    const npm = /^win/.test(process.platform) ? "npm.cmd" : "npm";
--- a/src/assets/app.scss
+++ b/src/assets/app.scss
@@ -349,7 +349,7 @@ textarea.form-control {
 .monitor-list {
    &.scrollbar {
        overflow-y: auto;
-        height: calc(100% - 55px);
+        height: calc(100% - 65px);
    }

    .item {
--- a/src/components/MonitorList.vue
+++ b/src/components/MonitorList.vue
@@ -9,7 +9,9 @@
                <a v-if="searchText != ''" class="search-icon" @click="clearSearchText">
                    <font-awesome-icon icon="times" />
                </a>
-                <input v-model="searchText" class="form-control search-input" :placeholder="$t('Search...')" />
+                <form>
+                    <input v-model="searchText" class="form-control search-input" :placeholder="$t('Search...')" autocomplete="off" />
+                </form>
            </div>
        </div>
        <div class="monitor-list" :class="{ scrollbar: scrollbar }">
--- a/src/components/TwoFADialog.vue
+++ b/src/components/TwoFADialog.vue
@@ -19,6 +19,19 @@
                            </div>
                            <p v-if="showURI && twoFAStatus == false" class="text-break mt-2">{{ uri }}</p>

+                            <div v-if="!(uri && twoFAStatus == false)" class="mb-3">
+                                <label for="current-password" class="form-label">
+                                    {{ $t("Current Password") }}
+                                </label>
+                                <input
+                                    id="current-password"
+                                    v-model="currentPassword"
+                                    type="password"
+                                    class="form-control"
+                                    required
+                                />
+                            </div>
+
                            <button v-if="uri == null && twoFAStatus == false" class="btn btn-primary" type="button" @click="prepare2FA()">
                                {{ $t("Enable 2FA") }}
                            </button>
@@ -59,11 +72,11 @@
 </template>

 <script lang="ts">
-import { Modal } from "bootstrap"
+import { Modal } from "bootstrap";
 import Confirm from "./Confirm.vue";
-import VueQrcode from "vue-qrcode"
-import { useToast } from "vue-toastification"
-const toast = useToast()
+import VueQrcode from "vue-qrcode";
+import { useToast } from "vue-toastification";
+const toast = useToast();

 export default {
    components: {
@@ -73,35 +86,36 @@ export default {
    props: {},
    data() {
        return {
+            currentPassword: "",
            processing: false,
            uri: null,
            tokenValid: false,
            twoFAStatus: null,
            token: null,
            showURI: false,
-        }
+        };
    },
    mounted() {
-        this.modal = new Modal(this.$refs.modal)
+        this.modal = new Modal(this.$refs.modal);
        this.getStatus();
    },
    methods: {
        show() {
-            this.modal.show()
+            this.modal.show();
        },

        confirmEnableTwoFA() {
-            this.$refs.confirmEnableTwoFA.show()
+            this.$refs.confirmEnableTwoFA.show();
        },

        confirmDisableTwoFA() {
-            this.$refs.confirmDisableTwoFA.show()
+            this.$refs.confirmDisableTwoFA.show();
        },

        prepare2FA() {
            this.processing = true;

-            this.$root.getSocket().emit("prepare2FA", (res) => {
+            this.$root.getSocket().emit("prepare2FA", this.currentPassword, (res) => {
                this.processing = false;

                if (res.ok) {
@@ -109,49 +123,51 @@ export default {
                } else {
                    toast.error(res.msg);
                }
-            })
+            });
        },

        save2FA() {
            this.processing = true;

-            this.$root.getSocket().emit("save2FA", (res) => {
+            this.$root.getSocket().emit("save2FA", this.currentPassword, (res) => {
                this.processing = false;

                if (res.ok) {
-                    this.$root.toastRes(res)
+                    this.$root.toastRes(res);
                    this.getStatus();
+                    this.currentPassword = "";
                    this.modal.hide();
                } else {
                    toast.error(res.msg);
                }
-            })
+            });
        },

        disable2FA() {
            this.processing = true;

-            this.$root.getSocket().emit("disable2FA", (res) => {
+            this.$root.getSocket().emit("disable2FA", this.currentPassword, (res) => {
                this.processing = false;

                if (res.ok) {
-                    this.$root.toastRes(res)
+                    this.$root.toastRes(res);
                    this.getStatus();
+                    this.currentPassword = "";
                    this.modal.hide();
                } else {
                    toast.error(res.msg);
                }
-            })
+            });
        },

        verifyToken() {
-            this.$root.getSocket().emit("verifyToken", this.token, (res) => {
+            this.$root.getSocket().emit("verifyToken", this.token, this.currentPassword, (res) => {
                if (res.ok) {
                    this.tokenValid = res.valid;
                } else {
                    toast.error(res.msg);
                }
-            })
+            });
        },

        getStatus() {
@@ -161,10 +177,10 @@ export default {
                } else {
                    toast.error(res.msg);
                }
-            })
+            });
        },
    },
-}
+};
 </script>

 <style lang="scss" scoped>
--- a/src/components/settings/ReverseProxy.vue
+++ b/src/components/settings/ReverseProxy.vue
@@ -0,0 +1,139 @@
+<template>
+    <div>
+        <h4 class="mt-4">Cloudflare Tunnel</h4>
+
+        <div class="my-3">
+            <div>
+                cloudflared:
+                <span v-if="installed === true" class="text-primary">{{ $t("Installed") }}</span>
+                <span v-else-if="installed === false" class="text-danger">{{ $t("Not installed") }}</span>
+            </div>
+
+            <div>
+                {{ $t("Status") }}:
+                <span v-if="running" class="text-primary">{{ $t("Running") }}</span>
+                <span v-else-if="!running" class="text-danger">{{ $t("Not running") }}</span>
+            </div>
+
+            <div v-if="false">
+                {{ message }}
+            </div>
+
+            <div v-if="errorMessage" class="mt-3">
+                Message:
+                <textarea v-model="errorMessage" class="form-control" readonly></textarea>
+            </div>
+
+            <p v-if="installed === false">(Download cloudflared from <a href="https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation/">Cloudflare Website</a>)</p>
+        </div>
+
+        <!-- If installed show token input -->
+        <div v-if="installed" class="mb-2">
+            <div class="mb-4">
+                <label class="form-label" for="cloudflareTunnelToken">
+                    Cloudflare Tunnel {{ $t("Token") }}
+                </label>
+                <HiddenInput
+                    id="cloudflareTunnelToken"
+                    v-model="cloudflareTunnelToken"
+                    autocomplete="one-time-code"
+                    :readonly="running"
+                />
+                <div class="form-text">
+                    <div v-if="cloudflareTunnelToken" class="mb-3">
+                        <span v-if="!running" class="remove-token" @click="removeToken">{{ $t("Remove Token") }}</span>
+                    </div>
+
+                    Don't know how to get the token? Please read the guide:<br />
+                    <a href="https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy-with-Cloudflare-Tunnel" target="_blank">
+                        https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy-with-Cloudflare-Tunnel
+                    </a>
+                </div>
+            </div>
+
+            <div>
+                <button v-if="!running" class="btn btn-primary" type="submit" @click="start">
+                    {{ $t("Start") }} cloudflared
+                </button>
+
+                <button v-if="running" class="btn btn-danger" type="submit" @click="$refs.confirmStop.show();">
+                    {{ $t("Stop") }} cloudflared
+                </button>
+
+                <Confirm ref="confirmStop" btn-style="btn-danger" :yes-text="$t('Stop') + ' cloudflared'" :no-text="$t('Cancel')" @yes="stop">
+                    The current connection may be lost if you are currently connecting via Cloudflare Tunnel. Are you sure want to stop it? Type your current password to confirm it.
+
+                    <div class="mt-3">
+                        <label for="current-password2" class="form-label">
+                            {{ $t("Current Password") }}
+                        </label>
+                        <input
+                            id="current-password2"
+                            v-model="currentPassword"
+                            type="password"
+                            class="form-control"
+                            required
+                        />
+                    </div>
+                </Confirm>
+            </div>
+        </div>
+
+        <h4 class="mt-4">Other Software</h4>
+        <div>
+            For example: nginx, Apache and Traefik. <br />
+            Please read <a href="https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy" target="_blank">https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy</a>.
+        </div>
+    </div>
+</template>
+
+<script>
+import HiddenInput from "../../components/HiddenInput.vue";
+import Confirm from "../Confirm.vue";
+
+const prefix = "cloudflared_";
+
+export default {
+    components: {
+        HiddenInput,
+        Confirm
+    },
+    data() {
+        // See /src/mixins/socket.js
+        return this.$root.cloudflared;
+    },
+    computed: {
+
+    },
+    watch: {
+
+    },
+    created() {
+        this.$root.getSocket().emit(prefix + "join");
+    },
+    unmounted() {
+        this.$root.getSocket().emit(prefix + "leave");
+    },
+    methods: {
+        start() {
+            this.$root.getSocket().emit(prefix + "start", this.cloudflareTunnelToken);
+        },
+        stop() {
+            this.$root.getSocket().emit(prefix + "stop", this.currentPassword, (res) => {
+                this.$root.toastRes(res);
+            });
+        },
+        removeToken() {
+            this.$root.getSocket().emit(prefix + "removeToken");
+            this.cloudflareTunnelToken = "";
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.remove-token {
+    text-decoration: underline;
+    cursor: pointer;
+}
+</style>
--- a/src/components/settings/Security.vue
+++ b/src/components/settings/Security.vue
@@ -215,14 +215,14 @@
                <p>Dette er for <strong>de som har tredjepartsautorisering</strong> foran Uptime Kuma, for eksempel Cloudflare Access.</p>
                <p>Vennligst vær forsiktig.</p>
            </template>
-            
+
            <template v-else-if="$i18n.locale === 'cs-CZ' ">
                <p>Opravdu chcete <strong>deaktivovat autentifikaci</strong>?</p>
                <p>Tato možnost je určena pro případy, kdy <strong>máte autentifikaci zajištěnou třetí stranou</strong> ještě před přístupem do Uptime Kuma, například prostřednictvím Cloudflare Access.</p>
                <p>Používejte ji prosím s rozmyslem.</p>
            </template>

-			<template v-else-if="$i18n.locale === 'vi-VN' ">
+            <template v-else-if="$i18n.locale === 'vi-VN' ">
                <p>Bạn có muốn <strong>TẮT XÁC THỰC</strong> không?</p>
                <p>Điều này rất nguy hiểm<strong>BẤT KỲ AI</strong> cũng có thể truy cập và cướp quyền điều khiển.</p>
                <p>Vui lòng <strong>cẩn thận</strong>.</p>
@@ -234,6 +234,19 @@
                <p>It is designed for scenarios <strong>where you intend to implement third-party authentication</strong> in front of Uptime Kuma such as Cloudflare Access, Authelia or other authentication mechanisms.</p>
                <p>Please use this option carefully!</p>
            </template>
+
+            <div class="mb-3">
+                <label for="current-password2" class="form-label">
+                    {{ $t("Current Password") }}
+                </label>
+                <input
+                    id="current-password2"
+                    v-model="password.currentPassword"
+                    type="password"
+                    class="form-control"
+                    required
+                />
+            </div>
        </Confirm>
    </div>
 </template>
@@ -310,7 +323,12 @@ export default {

        disableAuth() {
            this.settings.disableAuth = true;
-            this.saveSettings();
+
+            // Need current password to disable auth
+            // Set it to empty if done
+            this.saveSettings(() => {
+                this.password.currentPassword = "";
+            }, this.password.currentPassword);
        },

        enableAuth() {
--- a/src/languages/hr-HR.js
+++ b/src/languages/hr-HR.js
@@ -183,7 +183,7 @@ export default {
    "Edit Status Page": "Uredi Statusnu stranicu",
    "Go to Dashboard": "Na Kontrolnu ploču",
    "Status Page": "Statusna stranica",
-    "Status Pages": "Statusna stranica",
+    "Status Pages": "Statusne stranice",
    defaultNotificationName: "Moja {number}. {notification} obavijest",
    here: "ovdje",
    Required: "Potrebno",
@@ -347,4 +347,30 @@ export default {
    Cancel: "Otkaži",
    "Powered by": "Pokreće",
    Saved: "Spremljeno",
+    PushByTechulus: "Push by Techulus",
+    GoogleChat: "Google Chat (preko platforme Google Workspace)",
+    shrinkDatabaseDescription: "Pokreni VACUUM operaciju za SQLite. Ako je baza podataka kreirana nakon inačice 1.10.0, AUTO_VACUUM opcija već je uključena te ova akcija nije nužna.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API korisničko ime (uključujući webapi_ prefiks)",
+    serwersmsAPIPassword: "API lozinka",
+    serwersmsPhoneNumber: "Broj telefona",
+    serwersmsSenderName: "Ime SMS pošiljatelja (registrirano preko korisničkog portala)",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "DKIM postavke",
+    smtpDkimDesc: "Za više informacija, postoji Nodemailer DKIM {0}.",
+    documentation: "dokumentacija",
+    smtpDkimDomain: "Domena",
+    smtpDkimKeySelector: "Odabir ključa",
+    smtpDkimPrivateKey: "Privatni ključ",
+    smtpDkimHashAlgo: "Hash algoritam (neobavezno)",
+    smtpDkimheaderFieldNames: "Ključevi zaglavlja za potpis (neobavezno)",
+    smtpDkimskipFields: "Ključevi zaglavlja koji se neće potpisati (neobavezno)",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "Krajnja točka API-ja (Endpoint)",
+    alertaEnvironment: "Okruženje (Environment)",
+    alertaApiKey: "API ključ",
+    alertaAlertState: "Stanje upozorenja",
+    alertaRecoverState: "Stanje oporavka",
+    deleteStatusPageMsg: "Sigurno želite obrisati ovu statusnu stranicu?",
 };
--- a/src/languages/ru-RU.js
+++ b/src/languages/ru-RU.js
@@ -180,8 +180,8 @@ export default {
    "Add a monitor": "Добавить монитор",
    "Edit Status Page": "Редактировать",
    "Go to Dashboard": "Панель управления",
-    "Status Page": "Мониторинг",
-    "Status Pages": "Página de Status",
+    "Status Page": "Страница статуса",
+    "Status Pages": "Страницы статуса",
    Discard: "Отмена",
    "Create Incident": "Создать инцидент",
    "Switch to Dark Theme": "Тёмная тема",
@@ -311,28 +311,82 @@ export default {
    "One record": "Одна запись",
    steamApiKeyDescription: "Для мониторинга игрового сервера Steam вам необходим Web-API ключ Steam. Зарегистрировать его можно здесь: ",
    "Certificate Chain": "Цепочка сертификатов",
-    "Valid": "Действительный",
+    Valid: "Действительный",
    "Hide Tags": "Скрыть тэги",
-    "Title": "Название инцидента:",
-    "Content": "Содержание инцидента:",
-    "Post": "Опубликовать",
-    "Cancel": "Отмена",
-    "Created": "Создано",
-    "Unpin": "Открепить",
+    Title: "Название инцидента:",
+    Content: "Содержание инцидента:",
+    Post: "Опубликовать",
+    Cancel: "Отмена",
+    Created: "Создано",
+    Unpin: "Открепить",
    "Show Tags": "Показать тэги",
-    "recent": "Сейчас",
+    recent: "Сейчас",
    "3h": "3 часа",
    "6h": "6 часов",
    "24h": "24 часа",
    "1w": "1 неделя",
    "No monitors available.": "Нет доступных мониторов",
    "Add one": "Добавить новый",
-    "Backup": "Резервная копия",
-    "Security": "Безопасность",
+    Backup: "Резервная копия",
+    Security: "Безопасность",
    "Shrink Database": "Сжать Базу Данных",
    "Current User": "Текущий пользователь",
-    "About": "О программе",
-    "Description": "Описание",
+    About: "О программе",
+    Description: "Описание",
    "Powered by": "Работает на основе скрипта от",
    shrinkDatabaseDescription: "Включает VACUUM для базы данных SQLite. Если ваша база данных была создана на версии 1.10.0 и более, AUTO_VACUUM уже включен и это действие не требуется.",
+    deleteStatusPageMsg: "Вы действительно хотите удалить эту страницу статуса сервисов?",
+    Style: "Стиль",
+    info: "ИНФО",
+    warning: "ВНИМАНИЕ",
+    danger: "ОШИБКА",
+    primary: "ОСНОВНОЙ",
+    light: "СВЕТЛЫЙ",
+    dark: "ТЕМНЫЙ",
+    "New Status Page": "Новая страница статуса",
+    "Show update if available": "Показывать доступные обновления",
+    "Also check beta release": "Проверять обновления для бета версий",
+    "Add New Status Page": "Добавить страницу статуса",
+    Next: "Далее",
+    "Accept characters: a-z 0-9 -": "Разрешены символы: a-z 0-9 -",
+    "Start or end with a-z 0-9 only": "Начало и окончание имени только на символы: a-z 0-9",
+    "No consecutive dashes --": "Запрещено использовать тире --",
+    "HTTP Options": "HTTP Опции",
+    "Basic Auth": "HTTP Авторизация",
+    PushByTechulus: "Push by Techulus",
+    clicksendsms: "ClickSend SMS",
+    GoogleChat: "Google Chat (только Google Workspace)",
+    apiCredentials: "API реквизиты",
+    Done: "Готово",
+    Info: "Инфо",
+    "Steam API Key": "Steam API-Ключ",
+    "Pick a RR-Type...": "Выберите RR-Тип...",
+    "Pick Accepted Status Codes...": "Выберите принятые коды состояния...",
+    Default: "По умолчанию",
+    "Please input title and content": "Пожалуйста, введите название и содержание",
+    "Last Updated": "Последнее Обновление",
+    "Untitled Group": "Группа без названия",
+    Services: "Сервисы",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Пользователь (включая префикс webapi_)",
+    serwersmsAPIPassword: "API Пароль",
+    serwersmsPhoneNumber: "Номер телефона",
+    serwersmsSenderName: "SMS Имя Отправителя (регистрированный через пользовательский портал)",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "DKIM Настройки",
+    smtpDkimDesc: "Please refer to the Nodemailer DKIM {0} for usage.",
+    documentation: "документация",
+    smtpDkimDomain: "Имя Домена",
+    smtpDkimKeySelector: "Ключ",
+    smtpDkimPrivateKey: "Приватный ключ",
+    smtpDkimHashAlgo: "Алгоритм хэша (опционально)",
+    smtpDkimheaderFieldNames: "Заголовок ключей для подписи (опционально)",
+    smtpDkimskipFields: "Заколовок ключей не для подписи (опционально)",
+    gorush: "Gorush",
+    alerta: "Alerta",
+    alertaApiEndpoint: "Конечная точка API",
+    alertaEnvironment: "Среда",
+    alertaApiKey: "Ключ API",
+    alertaAlertState: "Состояние алерта",
+    alertaRecoverState: "Состояние восстановления",
 };
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -3,6 +3,9 @@
        <div v-if="! $root.socket.connected && ! $root.socket.firstConnect" class="lost-connection">
            <div class="container-fluid">
                {{ $root.connectionErrorMsg }}
+                <div v-if="$root.showReverseProxyGuide">
+                    Using a Reverse Proxy? <a href="https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy" target="_blank">Check how to config it for WebSocket</a>
+                </div>
            </div>
        </div>

@@ -45,7 +48,7 @@
        </header>

        <main>
-            <router-view v-if="$root.loggedIn" />
+            <router-view v-if="$root.loggedIn || forceShowContent" />
            <Login v-if="! $root.loggedIn && $root.allowLoginDialog" />
        </main>

@@ -184,6 +187,8 @@ main {
    padding: 5px;
    background-color: crimson;
    color: white;
+    position: fixed;
+    width: 100%;
 }

 .dark {
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -41,6 +41,15 @@ export default {
            statusPageListLoaded: false,
            statusPageList: [],
            connectionErrorMsg: "Cannot connect to the socket server. Reconnecting...",
+            showReverseProxyGuide: true,
+            cloudflared: {
+                cloudflareTunnelToken: "",
+                installed: null,
+                running: false,
+                message: "",
+                errorMessage: "",
+                currentPassword: "",
+            }
        };
    },

@@ -185,6 +194,7 @@ export default {
            socket.on("connect_error", (err) => {
                console.error(`Failed to connect to the backend. Socket.io connect_error: ${err.message}`);
                this.connectionErrorMsg = `Cannot connect to the socket server. [${err}] Reconnecting...`;
+                this.showReverseProxyGuide = true;
                this.socket.connected = false;
                this.socket.firstConnect = false;
            });
@@ -199,6 +209,7 @@ export default {
                console.log("Connected to the socket server");
                this.socket.connectCount++;
                this.socket.connected = true;
+                this.showReverseProxyGuide = false;

                // Reset Heartbeat list if it is re-connect
                if (this.socket.connectCount >= 2) {
@@ -228,6 +239,12 @@ export default {
                this.socket.firstConnect = false;
            });

+            // cloudflared
+            socket.on("cloudflared_installed", (res) => this.cloudflared.installed = res);
+            socket.on("cloudflared_running", (res) => this.cloudflared.running = res);
+            socket.on("cloudflared_message", (res) => this.cloudflared.message = res);
+            socket.on("cloudflared_errorMessage", (res) => this.cloudflared.errorMessage = res);
+            socket.on("cloudflared_token", (res) => this.cloudflared.cloudflareTunnelToken = res);
        },

        storage() {
--- a/src/pages/NotFound.vue
+++ b/src/pages/NotFound.vue
@@ -0,0 +1,99 @@
+<template>
+    <div>
+        <!-- Desktop header -->
+        <header v-if="! $root.isMobile" class="d-flex flex-wrap justify-content-center py-3 mb-3 border-bottom">
+            <router-link to="/" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-dark text-decoration-none">
+                <object class="bi me-2 ms-4" width="40" height="40" data="/icon.svg" />
+                <span class="fs-4 title">Uptime Kuma</span>
+            </router-link>
+        </header>
+
+        <!-- Mobile header -->
+        <header v-else class="d-flex flex-wrap justify-content-center pt-2 pb-2 mb-3">
+            <router-link to="/dashboard" class="d-flex align-items-center text-dark text-decoration-none">
+                <object class="bi" width="40" height="40" data="/icon.svg" />
+                <span class="fs-4 title ms-2">Uptime Kuma</span>
+            </router-link>
+        </header>
+
+        <div class="content">
+            <div>
+                <strong>🐻 {{ $t("Page Not Found") }}</strong>
+            </div>
+
+            <div class="guide">
+                Most likely causes:
+                <ul>
+                    <li>The resource is no longer available.</li>
+                    <li>There might be a typing error in the address.</li>
+                </ul>
+
+                What you can try:<br />
+                <ul>
+                    <li>Retype the address.</li>
+                    <li><a href="#" class="go-back" @click="goBack()">Go back to the previous page.</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    async mounted() {
+
+    },
+    methods: {
+        goBack() {
+            history.back();
+        }
+    }
+};
+</script>
+
+<style scoped lang="scss">
+@import "../assets/vars.scss";
+
+.go-back {
+    text-decoration: none;
+    color: $primary !important;
+}
+
+.content {
+    display: flex;
+    justify-content: center;
+    align-content: center;
+    align-items: center;
+    flex-direction: column;
+    gap: 50px;
+    padding-top: 30px;
+
+    strong {
+        font-size: 24px;
+    }
+}
+
+.guide {
+    max-width: 800px;
+    font-size: 14px;
+}
+
+.title {
+    font-weight: bold;
+}
+
+.dark {
+    header {
+        background-color: $dark-header-bg;
+        border-bottom-color: $dark-header-bg !important;
+
+        span {
+            color: #f0f6fc;
+        }
+    }
+
+    .bottom-nav {
+        background-color: $dark-bg;
+    }
+}
+</style>
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -75,6 +75,9 @@ export default {
                notifications: {
                    title: this.$t("Notifications"),
                },
+                "reverse-proxy": {
+                    title: this.$t("Reverse Proxy"),
+                },
                "monitor-history": {
                    title: this.$t("Monitor History"),
                },
@@ -131,10 +134,18 @@ export default {
            });
        },

-        saveSettings() {
-            this.$root.getSocket().emit("setSettings", this.settings, (res) => {
+        /**
+         * Save Settings
+         * @param currentPassword (Optional) Only need for disableAuth to true
+         */
+        saveSettings(callback, currentPassword) {
+            this.$root.getSocket().emit("setSettings", this.settings, currentPassword, (res) => {
                this.$root.toastRes(res);
                this.loadSettings();
+
+                if (callback) {
+                    callback();
+                }
            });
        },
    }
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -518,6 +518,7 @@ export default {

        save() {
            let startTime = new Date();
+            this.config.slug = this.config.slug.trim().toLowerCase();

            this.$root.getSocket().emit("saveStatusPage", this.slug, this.config, this.imgDataUrl, this.$root.publicGroupList, (res) => {
                if (res.ok) {
--- a/src/router.js
+++ b/src/router.js
@@ -14,12 +14,14 @@ import Entry from "./pages/Entry.vue";
 import Appearance from "./components/settings/Appearance.vue";
 import General from "./components/settings/General.vue";
 import Notifications from "./components/settings/Notifications.vue";
+import ReverseProxy from "./components/settings/ReverseProxy.vue";
 import MonitorHistory from "./components/settings/MonitorHistory.vue";
 import Security from "./components/settings/Security.vue";
 import Backup from "./components/settings/Backup.vue";
 import About from "./components/settings/About.vue";
 import ManageStatusPage from "./pages/ManageStatusPage.vue";
 import AddStatusPage from "./pages/AddStatusPage.vue";
+import NotFound from "./pages/NotFound.vue";

 const routes = [
    {
@@ -82,6 +84,10 @@ const routes = [
                                path: "notifications",
                                component: Notifications,
                            },
+                            {
+                                path: "reverse-proxy",
+                                component: ReverseProxy,
+                            },
                            {
                                path: "monitor-history",
                                component: MonitorHistory,
@@ -128,6 +134,10 @@ const routes = [
        path: "/status/:slug",
        component: StatusPage,
    },
+    {
+        path: "/:pathMatch(.*)*",
+        component: NotFound,
+    },
 ];

 export const router = createRouter({
Author	SHA1	Message	Date
Louis Lam	f02e9c44ec	Update to 1.14.0-beta.0	2022-03-30 23:37:23 +08:00
Louis Lam	bb2b5cd6ac	Merge pull request #1427 from louislam/cloudflared Built-in ease-to-use reverse proxy with Cloudflare Tunnel	2022-03-30 20:15:48 +08:00
Louis Lam	b72a2d350f	Set cloudflared token from env var or arg	2022-03-30 20:08:26 +08:00
Louis Lam	71be030733	Add package-lock.json and minor words	2022-03-30 18:52:10 +08:00
Louis Lam	82ea896bbc	Improve the workflow of cloudflared	2022-03-30 11:59:49 +08:00
Louis Lam	f1f4b3b377	Add reverse proxy setting page for controlling cloudflared	2022-03-30 01:49:45 +08:00
Louis Lam	a6b52b7ba6	Merge branch 'master' into cloudflared	2022-03-29 17:42:55 +08:00
Louis Lam	b8dea3a823	Merge remote-tracking branch 'origin/master'	2022-03-29 17:39:12 +08:00
Louis Lam	0da6e6b1fb	Some improvements	2022-03-29 17:38:48 +08:00
Louis Lam	44fb2a88f2	Add cloudflared socket handler	2022-03-29 14:48:02 +08:00
Louis Lam	623b06e33c	Merge pull request #1426 from DX37/translation-ru update russian translation	2022-03-29 14:14:21 +08:00
Louis Lam	7d3cbff794	[Cloudflared] Install into base docker	2022-03-29 02:24:10 +08:00
DX37	61d0a0abce	update russian translation	2022-03-28 21:16:13 +07:00
Louis Lam	be88351eb3	Merge pull request #1136 from chakflying/fix/prometheus-on-delete Fix: Remove prometheus metrics on delete [Test needed]	2022-03-27 11:05:50 +08:00
Louis Lam	34a0b54b93	Merge pull request #1418 from sovushik/patch-11 Update ru-RU.js	2022-03-26 14:11:32 +08:00
sovushik	e11ea7b061	Update ru-RU.js Add new string for 1.13.1	2022-03-26 10:46:07 +05:00
Louis Lam	12237dec6e	Merge remote-tracking branch 'origin/master'	2022-03-26 02:09:25 +08:00
Louis Lam	f6272155af	Show page not found for invalid routes	2022-03-26 02:09:12 +08:00
Louis Lam	630b441a2d	Merge pull request #1414 from ivanbratovic/croatian-language Update croatian (hr-HR) translation file	2022-03-25 19:00:06 +08:00
Ivan Bratović	5922771909	Update croatian (hr-HR) translation file Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>	2022-03-25 11:05:51 +01:00
Louis Lam	623d03dc6f	Fix release process	2022-03-25 00:03:25 +08:00
Louis Lam	f52e527850	Update to 1.13.1	2022-03-24 23:47:03 +08:00
Louis Lam	28d72fcd08	Fix #1409 , slug cannot be empty	2022-03-24 23:43:07 +08:00
Louis Lam	6c7a0ff7d3	Fix release script	2022-03-24 22:44:22 +08:00
Louis Lam	2abdf2efad	Update to 1.13.0	2022-03-24 22:21:19 +08:00
Louis Lam	71af08189e	Clear useless code	2022-03-24 18:03:31 +08:00
Louis Lam	d32ba7cadd	Fix #1318 , basic auth is completely disabled if the auth is disabled	2022-03-24 18:02:34 +08:00
Louis Lam	775d1696fa	Fix pushover device not working #1114	2022-03-24 12:14:17 +08:00
Louis Lam	7fb16d2f9a	Limit the pm2 log size	2022-03-23 11:17:23 +08:00
Louis Lam	40991fbc28	Show reverse proxy guide along with websocket error	2022-03-22 23:46:13 +08:00
Louis Lam	bf20f9d290	Merge remote-tracking branch 'origin/master'	2022-03-22 21:37:18 +08:00
Louis Lam	5fa14161c4	Minor css	2022-03-22 21:37:04 +08:00
Louis Lam	5a2a59250d	Merge pull request #1405 from sovushik/patch-9 Update ru-RU.js	2022-03-22 17:17:37 +08:00
Louis Lam	fcee93cbea	Merge pull request #1404 from sovushik/patch-8 Update ru-RU.js	2022-03-22 17:16:55 +08:00
Louis Lam	668dffc2c5	Simplify final release	2022-03-22 16:45:07 +08:00
sovushik	210eebe144	Update ru-RU.js Add some fix for 1.13	2022-03-22 13:00:16 +05:00
sovushik	4b04a9c214	Update ru-RU.js Add new string for version 1.13	2022-03-22 12:58:38 +05:00
Nelson Chan	1bbd744d02	Chore: Improve syntax	2022-01-07 14:29:42 +08:00
Nelson Chan	2e0e35a1ee	Fix: Fix typo	2022-01-07 12:34:01 +08:00
Nelson Chan	1e92487f30	Chore: Remove onDelete as unused	2022-01-07 12:28:08 +08:00
Nelson Chan	edd2534a1b	Fix: Clear metrics also on stop and edit	2022-01-07 12:26:26 +08:00
Nelson Chan	f6ef390c76	Fix: Remove Prom. metrics on delete monitor	2022-01-07 12:04:57 +08:00