feat: support dynamic links in msg or link-field

client/dispatch-query.py

@@ -27,7 +27,7 @@ def debug_send(uuid, data, fail_it=False):
 def email_send(dispatch_uuid, email_address, message, smtp_target,
                 smtp_target_port, smtp_user, smtp_pass):
     '''Send message via email'''
-  
+
     if not email_address:
         print("Missing E-Mail Address for STMP send", file=sys.stderr)
         report_failed_dispatch(dispatch_uuid, "Missing email-field in dispatch infor")
@@ -54,15 +54,32 @@ def ntfy_api_get_topic(ntfy_api_server, ntfy_api_token, username):
         print(r.text)
         return r.json().get("topic")
 
-def ntfy_send(dispatch_uuid, user_topic, title, message, ntfy_push_target, ntfy_user, ntfy_pass):
+def ntfy_send(dispatch_uuid, user_topic, title, message, link,
+                ntfy_push_target, ntfy_user, ntfy_pass):
     '''Send message via NTFY topic'''
 
+    # check message for links #
+    if not link:
+        pattern = r"https:\/\/[^\s]+"
+        match = re.search(pattern, text)
+        if match:
+            link = match.group(0)
+
+    # limit message length and title #
+    title = title or ""
+    message = message or ""
+    message = message[:1024]
+    title = title[:512]
+
+
     if not user_topic:
         report_failed_dispatch(dispatch_uuid, "No user topic")
         return
 
     try:
 
+
+
         # build message #
         payload = {
             "topic" : user_topic,
@@ -71,13 +88,16 @@ def ntfy_send(dispatch_uuid, user_topic, title, message, ntfy_push_target, ntfy_
             #"tags" : [],
             "priority" : 4,
             #"attach" : None,
-            "click" : "https://vid.pr0gramm.com/2022/11/06/ed66c8c5a9cd1a3b.mp4",
+            "click" : link,
             #"actions" : []
         }
 
         # send #
         r = requests.post(ntfy_push_target, auth=(ntfy_user, ntfy_pass), json=payload)
         print(r.status_code, r.text, payload)
+        if r.status_code == 429: # rate-limit
+            time.sleep(60)
+
         r.raise_for_status()
 
         # talk to dispatch #
@@ -131,7 +151,7 @@ if __name__ == "__main__":
 
     parser.add_argument('--loop', default=True, action=argparse.BooleanOptionalAction)
 
-    args = parser.parse_args() 
+    args = parser.parse_args()
 
 
     dispatch_server = args.dispatch_server or os.environ.get("DISPATCH_SERVER")
@@ -157,7 +177,7 @@ if __name__ == "__main__":
     while args.loop or first_run:
 
         # request dispatches #
-        response = requests.get(dispatch_server + 
+        response = requests.get(dispatch_server +
             "/get-dispatch?method=all&timeout=0&dispatch-access-token={}".format(DISPATCH_ACCESS_TOKEN))
 
         # check status #
@@ -181,6 +201,7 @@ if __name__ == "__main__":
             method = entry["method"]
             message = entry["message"]
             title = entry.get("title")
+            link = entry.get("link")
 
             # method dependent fields #
             phone = entry.get("phone")
@@ -191,7 +212,7 @@ if __name__ == "__main__":
                 pass
             elif method == "ntfy":
                 user_topic = ntfy_api_get_topic(ntfy_api_server, ntfy_api_token, user)
-                ntfy_send(dispatch_uuid, user_topic, title, message,
+                ntfy_send(dispatch_uuid, user_topic, title, message, link,
                                 ntfy_push_target, ntfy_user, ntfy_pass)
             elif method == "email":
                 email_send(dispatch_uuid, email_address, message, smtp_target,
@@ -207,6 +228,6 @@ if __name__ == "__main__":
         # wait a moment #
         if args.loop:
             time.sleep(5)
-        
+
         # handle non-loop runs #
         first_run = False

server/interface.py

@@ -20,7 +20,7 @@ import sqlalchemy
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy.sql.expression import func
 
-
+OPENSEARCH_HEADER_SEPERATOR = ","
 HOST = "icinga.atlantishq.de"
 app = flask.Flask("Signal Notification Gateway")
 app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///sqlite.db"
@@ -84,6 +84,7 @@ class DispatchObject(db.Model):
     title = Column(String)
     message = Column(String, primary_key=True)
     method = Column(String)
+    link = Column(String)
 
     dispatch_secret = Column(String)
     dispatch_error = Column(String)
@@ -98,6 +99,7 @@ class DispatchObject(db.Model):
             "email" : self.email,
             "title" : _apply_substitution(self.title),
             "message" : _apply_substitution(self.message),
+            "link" : self.link,
             "uuid" : self.dispatch_secret,
             "method" : self.method,
             "error" : self.dispatch_error,
@@ -169,6 +171,31 @@ def webhooks():
             db.session.commit()
             return ("", 204)
 
+@app.route('/downtime', methods=["GET", "DELETE","POST"])
+def downtime():
+
+    # check static access token #
+    token = flask.request.args.get("token")
+    if token != app.config["SETTINGS_ACCESS_TOKEN"]:
+        return ("SETTINGS_ACCESS_TOKEN incorrect. Refusing to access downtime settings", 401)
+
+    if flask.request.method == "DELETE":
+        app.config["DOWNTIME"] = datetime.datetime.now()
+        return ('Downtime successfully disabled', 200)
+    elif flask.request.method == "POST":
+        minutes = int(flask.request.args.get("minutes") or 5)
+        app.config["DOWNTIME"] = datetime.datetime.now() + datetime.timedelta(minutes=minutes)
+        return ('Downtime set to {}'.format(app.config["DOWNTIME"].isoformat(), 204))
+    elif flask.request.method == "GET":
+        dt = app.config["DOWNTIME"]
+        if dt < datetime.datetime.now():
+            return flask.jsonify({"title" : "No Downtime set at the moment", "message" : ""})
+        else:
+            delta = int((dt - datetime.datetime.now()).total_seconds()/60)
+            return flask.jsonify({"title" : "Downtime set for {}m until {}".format(delta, dt.isoformat()),
+                     "message" : ""})
+
+
 @app.route('/settings', methods=["GET", "POST"])
 def settings():
 
@@ -332,16 +359,42 @@ def smart_send_to_clients(path=None):
             - supported struct of type "ICINGA|ZABBIX|GENERIC" (see docs) in field "data"
     '''
 
-    instructions = flask.request.json
+    if flask.request.headers.get("opensearch"):
 
-    users = instructions.get("users")
+        instructions = {}
-    groups = instructions.get("groups")
+        users = flask.request.headers.get("opensearch-users")
-    message = instructions.get("msg")
+        groups = flask.request.headers.get("opensearch-groups")
-    title = instructions.get("title")
+
-    method = instructions.get("method")
+        if groups and OPENSEARCH_HEADER_SEPERATOR in groups:
+            groups = groups.split(OPENSEARCH_HEADER_SEPERATOR)
+
+        if users and OPENSEARCH_HEADER_SEPERATOR in users:
+            users = users.split(OPENSEARCH_HEADER_SEPERATOR)
+
+        message = flask.request.get_data(as_text=True)
+        title = "Opensearch Alert"
+        method = None
+
+    else:
+
+        instructions = flask.request.json
+        users = instructions.get("users")
+        groups = instructions.get("groups")
+        message = instructions.get("msg") or instructions.get("message")
+        title = instructions.get("title")
+        method = instructions.get("method")
+        link = instructions.get("link")
+
+    if app.config["DOWNTIME"] > datetime.datetime.now():
+        print("Ignoring because of Downtime:", title, message, users, file=sys.stderr)
+        print("Downtime until", app.config["DOWNTIME"].isoformat(), file=sys.stderr)
+        return ("Ignored because of Downtime", 200)
 
     # authenticated by access token or webhook path #
     dispatch_acces_token = flask.request.args.get("dispatch-access-token") or ""
+    if not dispatch_acces_token:
+        dispatch_acces_token = flask.request.headers.get("Dispatcher-Token") or ""
+
     print(path)
     if path:
         webhook_path = db.session.query(WebHookPaths).filter(WebHookPaths.path==path).first()
@@ -371,7 +424,7 @@ def smart_send_to_clients(path=None):
     else:
         persons = ldaptools.select_targets(users, groups, app.config["LDAP_ARGS"])
 
-    dispatch_secrets = save_in_dispatch_queue(persons, title, message, method)
+    dispatch_secrets = save_in_dispatch_queue(persons, title, message, method, link)
     return flask.jsonify(dispatch_secrets)
 
 
@@ -395,6 +448,7 @@ def save_in_dispatch_queue(persons, title, message, method):
                         timestamp=datetime.datetime.now().timestamp(),
                         dispatch_secret=dispatch_secret,
                         title=title,
+                        link=link,
                         message=message)
 
         db.session.merge(obj)
@@ -433,6 +487,8 @@ def create_app():
 
     print("Loaded subs:", substitution_config_file, app.config["SUBSTITUTIONS"], file=sys.stderr)
 
+    # set small downtime #
+    app.config["DOWNTIME"] = datetime.datetime.now() + datetime.timedelta(minutes=1)
 
 if __name__ == "__main__":