7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-09 09:42:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.23.X-merge-to-2.X.X

Browse Source 
# Conflicts:
#	server/model/monitor.js
#	server/util-server.js
This commit is contained in:
Louis Lam
2023-11-13 21:25:49 +08:00
parent 0f980e97b1 5b6522a54e
commit 188fdcb6ad
23 changed files with 9 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/monitor-types/real-browser-monitor-type.js
View File

@@ -24,6 +24,9 @@ if (process.platform === "win32") {
allowedList.push(process.env.PROGRAMFILES + "\\Chromium\\Application\\chrome.exe");
allowedList.push(process.env["ProgramFiles(x86)"] + "\\Chromium\\Application\\chrome.exe");
// Allow MS Edge
allowedList.push(process.env["ProgramFiles(x86)"] + "\\Microsoft\\Edge\\Application\\msedge.exe");
// For Loop A to Z
for (let i = 65; i <= 90; i++) {
let drive = String.fromCharCode(i);
@@ -42,7 +45,6 @@ if (process.platform === "win32") {
"/usr/bin/google-chrome",
];
} else if (process.platform === "darwin") {
// TODO: Generated by GitHub Copilot, but not sure if it's correct
allowedList = [
"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
"/Applications/Chromium.app/Contents/MacOS/Chromium",