Merge 7c67daf7cc into 7dc6191b0a

server/notification-providers/pushdeer.js

@@ -11,8 +11,7 @@ class PushDeer extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         const okMsg = "Sent Successfully.";
         const serverUrl = notification.pushdeerServer || "https://api2.pushdeer.com";
-        // capture group below is nessesary to prevent an ReDOS-attack
-        const url = `${serverUrl.trim().replace(/([^/])\/+$/, "$1")}/message/push`;
+        const url = `${serverUrl.trim().replace(/\/*$/, "")}/message/push`;
 
         let valid = msg != null && monitorJSON != null && heartbeatJSON != null;
 

server/notification-providers/whapi.js

@@ -24,7 +24,7 @@ class Whapi extends NotificationProvider {
                 "body": msg,
             };
 
-            let url = (notification.whapiApiUrl || "https://gate.whapi.cloud/").replace(/([^/])\/+$/, "$1") + "/messages/text";
+            let url = (notification.whapiApiUrl || "https://gate.whapi.cloud/").replace(/\/+$/, "") + "/messages/text";
 
             await axios.post(url, data, config);