Compare commits

..

4 commits

Author SHA1 Message Date
Boro Vukovic
315f638a72 upgrade http/https/socks proxy agents 2025-01-19 13:56:33 -05:00
Louis Lam
5bb329fa0e Update to 1.23.16
Some checks failed
Auto Test / check-linters (push) Has been cancelled
Auto Test / auto-test (16, ARM64) (push) Has been cancelled
Auto Test / auto-test (16, macos-latest) (push) Has been cancelled
Auto Test / auto-test (16, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (16, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20.5, ARM64) (push) Has been cancelled
Auto Test / auto-test (20.5, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20.5, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20.5, windows-latest) (push) Has been cancelled
Auto Test / armv7-simple-test (16, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20.5, ARMv7) (push) Has been cancelled
Auto Test / e2e-tests (push) Has been cancelled
Auto Test / frontend-unit-tests (push) Has been cancelled
2024-12-20 15:15:52 +08:00
Louis Lam
09dedc07fb
[1.23.X] Update dependencies (#5455) 2024-12-20 15:11:24 +08:00
Louis Lam
6cfae01a0d
Merge commit from fork
* [V1 Only] Change dev server's data path to ./data/v1

* Fix GHSA-2qgm-m29m-cj2h
2024-12-20 15:02:22 +08:00
3 changed files with 2260 additions and 4077 deletions

6323
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{
"name": "uptime-kuma",
"version": "1.23.15",
"version": "1.23.16",
"license": "MIT",
"repository": {
"type": "git",
@ -24,7 +24,7 @@
"start-frontend-devcontainer": "cross-env NODE_ENV=development DEVCONTAINER=1 vite --host --config ./config/vite.config.js",
"start": "npm run start-server",
"start-server": "node server/server.js",
"start-server-dev": "cross-env NODE_ENV=development node server/server.js",
"start-server-dev": "cross-env NODE_ENV=development node server/server.js --data-dir=./data/v1/",
"build": "vite build --config ./config/vite.config.js",
"test": "node test/prepare-test-server.js && npm run jest-backend",
"test-with-build": "npm run build && npm test",
@ -42,7 +42,7 @@
"build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
"build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push",
"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.23.15 && npm ci --production && npm run download-dist",
"setup": "git checkout 1.23.16 && npm ci --production && npm run download-dist",
"download-dist": "node extra/download-dist.js",
"mark-as-nightly": "node extra/mark-as-nightly.js",
"reset-password": "node extra/reset-password.js",

View file

@ -193,6 +193,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,