Merge branch 'master' into master

Author: edman80

README.md

@@ -62,6 +62,7 @@ Requirements:
 - Platform
   - ✅ Major Linux distros such as Debian, Ubuntu, CentOS, Fedora and ArchLinux etc.
   - ✅ Windows 10 (x64), Windows Server 2012 R2 (x64) or higher
+  - ❌ FreeBSD / OpenBSD / NetBSD
   - ❌ Replit / Heroku
 - [Node.js](https://nodejs.org/en/download/) 18 / 20.4
 - [npm](https://docs.npmjs.com/cli/) 9

extra/release/lib.mjs

@@ -101,12 +101,30 @@ export function buildImage(repoNames, tags, target, buildArgs = "", dockerfile =
 /**
  * Check if the version already exists on Docker Hub
  * TODO: use semver to compare versions if it is greater than the previous?
- * @param {string} repoName Docker Hub repository name
+ * @param {string[]} repoNames repository name (Only check the name with single slash)
  * @param {string} version Version to check
  * @returns {void}
  */
-export async function checkTagExists(repoName, version) {
-    console.log(`Checking if version ${version} exists on Docker Hub`);
+export async function checkTagExists(repoNames, version) {
+    // Skip if the tag is not on Docker Hub
+    // louislam/uptime-kuma
+    let dockerHubRepoNames = repoNames.filter((name) => {
+        return name.split("/").length === 2;
+    });
+
+    for (let repoName of dockerHubRepoNames) {
+        await checkTagExistsSingle(repoName, version);
+    }
+}
+
+/**
+ * Check if the version already exists on Docker Hub
+ * @param {string} repoName repository name
+ * @param {string} version Version to check
+ * @returns {Promise<void>}
+ */
+export async function checkTagExistsSingle(repoName, version) {
+    console.log(`Checking if version ${version} exists on Docker Hub:`, repoName);
 
     // Get a list of tags from the Docker Hub repository
     let tags = [];

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "uptime-kuma",
-    "version": "2.0.0-beta.0",
+    "version": "2.0.0-beta.1",
     "license": "MIT",
     "repository": {
         "type": "git",

package.json

@@ -892,11 +892,13 @@ class Database {
                 AND important = 0
                 AND time < ${sqlHourOffset}
                 AND id NOT IN (
-                    SELECT id
-                    FROM heartbeat
-                    WHERE monitor_id = ?
-                    ORDER BY time DESC
-                    LIMIT ?
+                    SELECT id FROM ( -- written this way for Maria's support
+                        SELECT id
+                        FROM heartbeat
+                        WHERE monitor_id = ?
+                        ORDER BY time DESC
+                        LIMIT ?
+                    )  AS limited_ids
                 )
             `, [
                 monitor.id,

server/database.js

@@ -240,6 +240,14 @@ class RealBrowserMonitorType extends MonitorType {
         const context = await browser.newContext();
         const page = await context.newPage();
 
+        // Prevent Local File Inclusion
+        // Accept only http:// and https://
+        // https://github.com/louislam/uptime-kuma/security/advisories/GHSA-2qgm-m29m-cj2h
+        let url = new URL(monitor.url);
+        if (url.protocol !== "http:" && url.protocol !== "https:") {
+            throw new Error("Invalid url protocol, only http and https are allowed.");
+        }
+
         const res = await page.goto(monitor.url, {
             waitUntil: "networkidle",
             timeout: monitor.interval * 1000 * 0.8,

server/monitor-types/real-browser-monitor-type.js

@@ -73,12 +73,6 @@ export default {
         }
     },
 
-    created() {
-        if (this.model.length === 0) {
-            this.addCondition();
-        }
-    },
-
     methods: {
         getNewGroup() {
             return {

src/components/EditMonitorConditions.vue

@@ -197,7 +197,7 @@ export default {
             return tagOptions;
         },
         selectedTags() {
-            return this.preSelectedTags.concat(this.newTags).filter(tag => !this.deleteTags.find(monitorTag => monitorTag.id === tag.id));
+            return this.preSelectedTags.concat(this.newTags).filter(tag => !this.deleteTags.find(monitorTag => monitorTag.tag_id === tag.tag_id));
         },
         colorOptions() {
             return colorOptions(this);

src/components/TagsManager.vue

@@ -733,5 +733,11 @@
     "Remove the expiry notification": "إزالة تنبيه يوم تاريخ الإنتهاء",
     "tailscalePingWarning": "من أجل استخدام مراقبة Tailscale Ping، تحتاج إلى تثبيت Uptime Kuma بدون Docker وكذلك تثبيت عميل Tailscale على الخادم الخاص بك.",
     "Clone Monitor": "نسخ المراقبة",
-    "telegramMessageThreadIDDescription": "معرف فريد اختياري لسلسلة الرسائل المستهدفة (الموضوع) في المنتدى؛ لمجموعات المنتدى الكبرى فقط"
+    "telegramMessageThreadIDDescription": "معرف فريد اختياري لسلسلة الرسائل المستهدفة (الموضوع) في المنتدى؛ لمجموعات المنتدى الكبرى فقط",
+    "emailCustomBody": "نص مخصص",
+    "emailTemplateStatus": "الحالة",
+    "leave blank for default subject": "اترك فارغاً ليتم تعيين الموضوع تلقائياً",
+    "leave blank for default body": "اترك فارغاً ليتم تعيين النص تلقائياً",
+    "emailTemplateServiceName": "اسم الخدمة",
+    "emailTemplateHostnameOrURL": "اسم المضيف أو عنوان URL"
 }

src/lang/ar.json

@@ -1097,5 +1097,6 @@
     "Separate multiple email addresses with commas": "Разделяйте отделните имейл адреси със запетаи",
     "RabbitMQ Nodes": "Възли за управление на RabbitMQ",
     "rabbitmqNodesDescription": "Въведете URL адреса на възлите за управление на RabbitMQ, включително протокол и порт. Пример: {0}",
-    "rabbitmqHelpText": "За да използвате монитора, ще трябва да активирате добавката за управление във вашата настройка на RabbitMQ. За повече информация моля, вижте {rabitmq_documentation}."
+    "rabbitmqHelpText": "За да използвате монитора, ще трябва да активирате добавката за управление във вашата настройка на RabbitMQ. За повече информация моля, вижте {rabitmq_documentation}.",
+    "aboutSlackUsername": "Променя показваното име на подателя на съобщението. Ако желаете да споменете някого, вместо това го включете в приятелското име."
 }