Refactor hook handling.

Have one route for all hooks that delegates to the appropriate
service. Services yield events that are then actioned somehow
(for now in a big ugly method).

lineandsinker/services/docker.py

@@ -4,3 +4,18 @@ from .service import Service
 class Docker(Service):
     def __init__(self):
         super().__init__("docker")
+
+    def accept_hook(self, identifier, request):
+        for event in request.get_json()["events"]:
+            if (
+                event["action"] == "push"
+                and "vnd.docker.distribution.manifest" in event["target"]["mediaType"]
+                and "tag" in event["target"]
+            ):
+                yield {
+                    "type": "docker.push",
+                    "repo": event["target"]["repository"],
+                    "tag": event["target"]["tag"],
+                    "host": event["request"]["host"],
+                    "user": event["actor"]["name"],
+                }

lineandsinker/services/gitea.py

@@ -1,4 +1,4 @@
-from jsonref import requests
+import requests
 
 from ..common import get_hook_url
 from .service import Service
@@ -10,8 +10,37 @@ class Gitea(Service):
         self._url = url
         self._token = token
         self._install_hooks = install_hooks
+        self._repos = {}
 
-    def get_repos(self):
+    def refresh(self):
+        self._repos = dict(
+            (name, [ssh, clone]) for name, ssh, clone in self._get_repos()
+        )
+
+    def accept_hook(self, identifier, request):
+        if identifier not in self._repos:
+            return
+
+        if request.headers.get("X-Gitea-Event") == "push":
+            urls = self._repos[identifier]
+            data = request.get_json()
+
+            yield {
+                "type": "git.push",
+                "repo": {
+                    "name": data["repository"]["full_name"],
+                    "public": data["repository"]["private"],
+                    "urls": urls,
+                },
+                "commits": [
+                    {"id": c["id"][:10], "message": c["message"]}
+                    for c in data["commits"]
+                ],
+                "compare_url": data["compare_url"],
+                "user": data["pusher"]["login"],
+            }
+
+    def _get_repos(self):
         repos = self._request("get", f"user/repos").json()
         for repo in repos:
             if self._install_hooks:

lineandsinker/services/jenkins.py

@@ -11,8 +11,12 @@ class Jenkins(Service):
     def __init__(self, url, username, password):
         super().__init__("jenkins")
         self._server = jenkins.Jenkins(url, username=username, password=password)
+        self._jobs = []
 
-    def get_jobs(self):
+    def refresh(self):
+        self._jobs = list(self._get_jobs())
+
+    def _get_jobs(self):
         for job in self._server.get_all_jobs():
             name = job["fullname"]
             config = BeautifulSoup(self._server.get_job_config(name), features="xml")
@@ -20,5 +24,7 @@ class Jenkins(Service):
                 branch_spec = git_config.find("branches").find("name").text
                 yield name, branch_spec, git_config.find("url").text
 
-    def build_job(self, name):
-        self._server.build_job(name)
+    def build_job_by_scm_url(self, urls):
+        for job, branch, url in self._jobs:
+            if url in urls:
+                self._server.build_job(job)

lineandsinker/services/service.py

@@ -2,5 +2,8 @@ class Service:
     def __init__(self, type):
         self.type = type
 
+    def refresh(self):
+        pass
+
     def accept_hook(self, identifier, request):
         pass

main.py

@@ -1,38 +1,31 @@
-import re
-from functools import wraps
-
-from flask import Flask, abort, request, Response
+from flask import Flask, abort, request
 
 from lineandsinker.common import get_hook_key
 from lineandsinker.services import services
 
-url_pattern = re.compile(
-    "^/hooks/(?P<service>[^/]+)/(?P<identifier>.*)/(?P<key>[^/]+)$"
-)
-
-
-def authenticate(f):
-    @wraps(f)
-    def wrapper(*args, **kwargs):
-        path = request.path
-        match = url_pattern.match(path)
+for service in services.values():
+    service.refresh()
 
-        if not match:
-            return Response("Bad request", 400)
-
-        expected_key = get_hook_key(match.group("service"), match.group("identifier"))
-        if expected_key != match.group("key"):
-            app.logger.info(f"Bad request to {path}: expected key {expected_key}")
-            return Response("Invalid key", 403)
-
-        return f(*args, **kwargs)
+app = Flask(__name__)
 
-    return wrapper
 
+def handle_events(events):
+    for event in events:
+        if event["type"] == "git.push":
+            services["jenkins"].build_job_by_scm_url(event["repo"]["urls"])
+            if event["repo"]["public"]:
+                services["reportbot"].announce(
+                    f"\002[git]\002 {event['user']} pushed {len(event['commits'])} commit{'s' if len(event['commits']) != 1 else ''} to {event['repo']['name']}: {event['compare_url']}"
+                )
 
-repos = dict((name, [ssh, clone]) for name, ssh, clone in services["gitea"].get_repos())
-jobs = list(services["jenkins"].get_jobs())
-app = Flask(__name__)
+                for commit in event["commits"][:3]:
+                    services["reportbot"].announce(
+                        f"\002[git]\002 {commit['id']}: {commit['message'][:100]}"
+                    )
+        elif event["type"] == "docker.push":
+            services["reportbot"].announce(
+                f"\002[registry]\002 New manifest pushed to {event['host']}/{event['repo']}:{event['tag']} by {event['user']}"
+            )
 
 
 @app.route("/")
@@ -40,57 +33,20 @@ def handle_index():
     return app.send_static_file("index.html")
 
 
-@app.route("/hooks/gitea/<path:repo>/<hash>", methods=["POST"])
-@authenticate
-def handle_hook_gitea(repo):
-    app.logger.info(f"Received hook for repo {repo}")
+@app.route("/hooks/<service>/<path:identifier>/<hash>", methods=["GET", "POST"])
+def handle_hook(service, identifier, hash):
+    app.logger.info(f"Received hook for {service} with identifier {hash}")
 
-    if repo not in repos:
-        app.logger.info(f"Repository not found. Known repos: {repos.keys()}")
-        abort(404)
-
-    if request.headers.get("X-Gitea-Event") == "push":
-        urls = repos[repo]
-        for name, spec, url in jobs:
-            if url in urls:
-                # TODO: Check branches
-                app.logger.info(f"Found matching job: {name} with URL {url}")
-                services["jenkins"].build_job(name)
-
-        data = request.get_json()
-        if not data["repository"]["private"]:
-            repo = data["repository"]["full_name"]
-            commits = len(data["commits"])
-            compare = data["compare_url"]
-            pusher = data["pusher"]["login"]
-
-            services["reportbot"].announce(
-                f"\002[git]\002 {pusher} pushed {commits} commit{'s' if commits != 1 else ''} to {repo}: {compare}"
-            )
-            for commit in data["commits"][:3]:
-                services["reportbot"].announce(
-                    f"\002[git]\002 {commit['id'][:10]}: {commit['message'][:100]}"
-                )
-
-    return "", 204
+    expected_hash = get_hook_key(service, identifier)
+    if hash != expected_hash:
+        app.logger.info(f"Hash not valid. Expected: {expected_hash}, got {hash}")
+        abort(403)
 
+    if service not in services:
+        app.logger.info(f"Unknown service {service}, known: {services.keys()}")
+        abort(404)
 
-@app.route("/hooks/docker/registry/<hash>", methods=["GET", "POST"])
-@authenticate
-def handle_docker_registry():
-    for event in request.get_json()["events"]:
-        if (
-            event["action"] == "push"
-            and "vnd.docker.distribution.manifest" in event["target"]["mediaType"]
-            and "tag" in event["target"]
-        ):
-            repo = event["target"]["repository"]
-            tag = event["target"]["tag"]
-            host = event["request"]["host"]
-            user = event["actor"]["name"]
-            services["reportbot"].announce(
-                f"\002[registry]\002 New manifest pushed to {host}/{repo}:{tag} by {user}"
-            )
+    handle_events(services[service].accept_hook(identifier, request))
 
     return "", 204