Start teasing things into separate modules.

lineandsinker/common.py

@@ -0,0 +1,14 @@
+import hashlib
+import os
+
+BASE_URL = os.environ["LAS_BASE_URL"]
+SECRET = os.environ["LAS_SECRET"]
+
+
+def get_hook_key(service, identifier):
+    nonce = (service + SECRET + identifier).encode("ascii")
+    return hashlib.sha256(nonce).hexdigest()
+
+
+def get_hook_url(service, identifier):
+    return f"{BASE_URL}hooks/{service}/{identifier}/{get_hook_key(service, identifier)}"

lineandsinker/services/gitea.py

@@ -0,0 +1,57 @@
+import os
+
+from jsonref import requests
+
+from ..common import get_hook_url
+from .service import Service
+
+
+class Gitea(Service):
+    def __init__(self, url, token, install_hooks=False):
+        self._url = url
+        self._token = token
+        self._install_hooks = install_hooks
+
+    def get_repos(self):
+        repos = self._request("get", f"user/repos").json()
+        for repo in repos:
+            if self._install_hooks:
+                self._maybe_install_gitea_hook(repo["full_name"])
+            yield repo["full_name"], repo["ssh_url"], repo["clone_url"]
+
+    def _maybe_install_gitea_hook(self, project):
+        hook_url = get_hook_url("gitea", project)
+        path = f"repos/{project}/hooks"
+        hooks = self._request("get", path).json()
+
+        if hook_url not in [hook["config"]["url"] for hook in hooks]:
+            body = {
+                "active": True,
+                "config": {"content_type": "json", "url": hook_url},
+                "events": [
+                    "create",
+                    "delete",
+                    "fork",
+                    "push",
+                    "issues",
+                    "issue_comment",
+                    "pull_request",
+                    "repository",
+                    "release",
+                ],
+                "type": "gitea",
+            }
+            self._request("post", path, json=body).json()
+
+    def _request(self, method, api_path, **kwargs):
+        if "params" not in kwargs:
+            kwargs["params"] = {}
+        kwargs["params"]["access_token"] = self._token
+        return requests.request(method, f"{self._url}api/v1/{api_path}", **kwargs)
+
+
+def gitea_factory():
+    return Gitea(os.environ["LAS_GITEA_URL"], os.environ["LAS_GITEA_TOKEN"])
+
+
+Service.add_factory(gitea_factory)

lineandsinker/services/jenkins.py

@@ -0,0 +1,35 @@
+import os
+import jenkins
+from bs4 import BeautifulSoup
+
+from .service import Service
+
+
+class Jenkins(Service):
+
+    SCM_CLASS = "hudson.plugins.git.GitSCM"
+
+    def __init__(self, url, username, password):
+        self._server = jenkins.Jenkins(url, username=username, password=password)
+
+    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")
+            for git_config in config.find_all("scm", class_=self.SCM_CLASS):
+                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 jenkins_factory():
+    return Jenkins(
+        os.environ["LAS_JENKINS_URL"],
+        os.environ["LAS_JENKINS_USER"],
+        os.environ["LAS_JENKINS_PASSWORD"],
+    )
+
+
+Service.add_factory(jenkins_factory)

lineandsinker/services/service.py

@@ -0,0 +1,10 @@
+class Service:
+
+    factories = []
+
+    def accept_hook(self, identifier, request):
+        pass
+
+    @classmethod
+    def add_factory(cls, factory):
+        cls.factories.append(factory)

main.py

@@ -1,49 +1,31 @@
-import hashlib
+import os
 import re
 import socket
 from functools import wraps
 
-import jenkins
-import requests
-import os
-from bs4 import BeautifulSoup
 from flask import Flask, abort, request, Response
 
-BASE_URL = os.environ["LAS_BASE_URL"]
-SECRET = os.environ["LAS_SECRET"]
-
-jenkins_server = jenkins.Jenkins(
-    os.environ["LAS_JENKINS_URL"],
-    username=os.environ["LAS_JENKINS_USER"],
-    password=os.environ["LAS_JENKINS_PASSWORD"],
-)
-
+from lineandsinker.common import get_hook_key
+from lineandsinker.services import gitea, jenkins
 
-def get_hook_key(service, identifier):
-    nonce = (service + SECRET + identifier).encode("ascii")
-    return hashlib.sha256(nonce).hexdigest()
 
-
-def get_hook_url(service, identifier):
-    return f"{BASE_URL}hooks/{service}/{identifier}/{get_hook_key(service, identifier)}"
+url_pattern = re.compile(
+    "^/hooks/(?P<service>[^/]+)/(?P<identifier>.*)/(?P<key>[^/]+)$"
+)
 
 
 def authenticate(f):
     @wraps(f)
     def wrapper(*args, **kwargs):
-        match = re.match(
-            "^/hooks/(?P<service>[^/]+)/(?P<identifier>.*)/(?P<key>[^/]+)$",
-            request.path,
-        )
+        path = request.path
+        match = url_pattern.match(path)
 
         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 {request.path}: expected key {expected_key}"
-            )
+            app.logger.info(f"Bad request to {path}: expected key {expected_key}")
             return Response("Invalid key", 403)
 
         return f(*args, **kwargs)
@@ -51,57 +33,6 @@ def authenticate(f):
     return wrapper
 
 
-def get_jenkins_jobs():
-    for job in jenkins_server.get_all_jobs():
-        config = BeautifulSoup(
-            jenkins_server.get_job_config(job["fullname"]), features="xml"
-        )
-        for git_config in config.find_all("scm", class_="hudson.plugins.git.GitSCM"):
-            branch_spec = git_config.find("branches").find("name").text
-            yield job["fullname"], branch_spec, git_config.find("url").text
-
-
-def gitea_request(method, api_path, **kwargs):
-    if "params" not in kwargs:
-        kwargs["params"] = {}
-    kwargs["params"]["access_token"] = os.environ["LAS_GITEA_TOKEN"]
-    return requests.request(
-        method, f"{os.environ['LAS_GITEA_URL']}api/v1/{api_path}", **kwargs
-    )
-
-
-def maybe_install_gitea_hook(project):
-    hook_url = get_hook_url("gitea", project)
-    path = f"repos/{project}/hooks"
-    hooks = gitea_request("get", path).json()
-
-    if hook_url not in [hook["config"]["url"] for hook in hooks]:
-        body = {
-            "active": True,
-            "config": {"content_type": "json", "url": hook_url},
-            "events": [
-                "create",
-                "delete",
-                "fork",
-                "push",
-                "issues",
-                "issue_comment",
-                "pull_request",
-                "repository",
-                "release",
-            ],
-            "type": "gitea",
-        }
-        gitea_request("post", path, json=body).json()
-
-
-def get_gitea_repos():
-    repos = gitea_request("get", f"user/repos").json()
-    for repo in repos:
-        maybe_install_gitea_hook(repo["full_name"])
-        yield repo["full_name"], repo["ssh_url"], repo["clone_url"]
-
-
 def reportbot_announce(message):
     try:
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
@@ -111,12 +42,14 @@ def reportbot_announce(message):
                 f"{os.environ['LAS_REPORTBOT_PREFIX']} {message}\n".encode("utf-8")
             )
             app.logger.info(f"Report bot response: {sock.recv(512)}")
-    except Exception:
+    except:
         app.logger.exception("Unable to send report bot message")
 
 
-repos = dict((name, [ssh, clone]) for name, ssh, clone in get_gitea_repos())
-jobs = list(get_jenkins_jobs())
+jenkins_service = jenkins.jenkins_factory()
+gitea_service = gitea.gitea_factory()
+repos = dict((name, [ssh, clone]) for name, ssh, clone in gitea_service.get_repos())
+jobs = list(jenkins_service.get_jobs())
 app = Flask(__name__)
 
 
@@ -140,7 +73,7 @@ def handle_hook_gitea(repo):
             if url in urls:
                 # TODO: Check branches
                 app.logger.info(f"Found matching job: {name} with URL {url}")
-                jenkins_server.build_job(name)
+                jenkins_service.build_job(name)
 
         data = request.get_json()
         if not data["repository"]["private"]: