Merge branch 'master' into security/improved-security

.github/workflows/auto-test.yml

@@ -16,7 +16,6 @@ permissions: {}
 
 jobs:
   auto-test:
-    needs: [ e2e-test ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
     permissions:
@@ -24,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-22.04, windows-latest, ARM64]
+        os: [macos-latest, ubuntu-22.04, windows-latest, ubuntu-22.04-arm]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
         node: [ 20, 24 ]
         # Also test non-LTS, but only on Ubuntu.
@@ -49,6 +48,11 @@ jobs:
       with:
         node-version: ${{ matrix.node }}
     - run: npm install
+    
+    - name: Rebuild native modules for ARM64
+      if: matrix.os == 'ubuntu-22.04-arm'
+      run: npm rebuild @louislam/sqlite3
+    
     - run: npm run build
     - run: npm run test-backend
       env:
@@ -57,35 +61,33 @@ jobs:
 
   # As a lot of dev dependencies are not supported on ARMv7, we have to test it separately and just test if `npm ci --production` works
   armv7-simple-test:
-    needs: [ e2e-test ]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
+    runs-on: ubuntu-latest
     permissions:
       contents: read
-    if: ${{ github.repository == 'louislam/uptime-kuma' }}
     strategy:
       matrix:
-        os: [ ARMv7 ]
         node: [ 20, 22 ]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-      - run: git config --global core.autocrlf false  # Mainly for Windows
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with: { persist-credentials: false }
 
-      - name: Cache/Restore node_modules
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
-        id: node-modules-cache
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
         with:
-          path: node_modules
-          key: node-modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          platforms: linux/arm/v7
 
-      - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
-        with:
-          node-version: ${{ matrix.node }}
-      - run: npm install --production
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
+
+      - name: Test on ARMv7 using Docker with QEMU
+        run: |
+          docker run --rm --platform linux/arm/v7 \
+            -v $PWD:/workspace \
+            -w /workspace \
+            arm32v7/node:${{ matrix.node }}-slim \
+            bash -c "npm install --production"
 
   check-linters:
     runs-on: ubuntu-latest
@@ -112,8 +114,7 @@ jobs:
     - run: npm run lint:prod
 
   e2e-test:
-    needs: [ check-linters ]
-    runs-on: ARM64
+    runs-on: ubuntu-22.04-arm
     permissions:
       contents: read
     env:
@@ -135,6 +136,9 @@ jobs:
       with:
         node-version: 22
     - run: npm install
+    
+    - name: Rebuild native modules for ARM64
+      run: npm rebuild @louislam/sqlite3
 
     - name: Install Playwright ${{ env.PLAYWRIGHT_VERSION }}
       run: npx playwright@${{ env.PLAYWRIGHT_VERSION }} install

db/knex_migrations/2026-01-02-0551-dns-last-result-to-text.js

@@ -0,0 +1,14 @@
+// Change dns_last_result column from VARCHAR(255) to TEXT to handle longer DNS TXT records
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("monitor", function (table) {
+            table.text("dns_last_result").alter();
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema
+        .alterTable("monitor", function (table) {
+            table.string("dns_last_result", 255).alter();
+        });
+};

server/model/status_page.js

@@ -132,6 +132,9 @@ class StatusPage extends BeanModel {
         let ogDescription = $("<meta property=\"og:description\" content=\"\" />").attr("content", description155);
         head.append(ogDescription);
 
+        let ogType = $("<meta property=\"og:type\" content=\"website\" />");
+        head.append(ogType);
+
         // Preload data
         // Add jsesc, fix https://github.com/louislam/uptime-kuma/issues/2186
         const escapedJSONObject = jsesc(await StatusPage.getStatusPageData(statusPage), {

server/notification-providers/discord.js

@@ -46,6 +46,7 @@ class Discord extends NotificationProvider {
             }
 
             // If heartbeatJSON is not null, we go into the normal alerting loop.
+            let addess = this.extractAddress(monitorJSON);
             if (heartbeatJSON["status"] === DOWN) {
                 let discorddowndata = {
                     username: discordDisplayName,
@@ -58,9 +59,9 @@ class Discord extends NotificationProvider {
                                 name: "Service Name",
                                 value: monitorJSON["name"],
                             },
-                            ...(!notification.disableUrl ? [{
+                            ...((!notification.disableUrl && addess) ? [{
                                 name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL",
-                                value: this.extractAddress(monitorJSON),
+                                value: addess,
                             }] : []),
                             {
                                 name: `Time (${heartbeatJSON["timezone"]})`,
@@ -98,18 +99,18 @@ class Discord extends NotificationProvider {
                                 name: "Service Name",
                                 value: monitorJSON["name"],
                             },
-                            ...(!notification.disableUrl ? [{
+                            ...((!notification.disableUrl && addess) ? [{
                                 name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL",
-                                value: this.extractAddress(monitorJSON),
+                                value: addess,
                             }] : []),
                             {
                                 name: `Time (${heartbeatJSON["timezone"]})`,
                                 value: heartbeatJSON["localDateTime"],
                             },
-                            {
+                            ...(heartbeatJSON["ping"] != null ? [{
                                 name: "Ping",
-                                value: heartbeatJSON["ping"] == null ? "N/A" : heartbeatJSON["ping"] + " ms",
-                            },
+                                value: heartbeatJSON["ping"] + " ms",
+                            }] : []),
                         ],
                     }],
                 };