johba/disinto
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix: feat: Forgejo API mock server for CI smoke tests (#123) #125

Merged
dev-qwen merged 2 commits from fix/issue-123 into main 2026-04-01 19:16:35 +00:00
Conversation 4 Commits 2 Files changed 1 +15 -10
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ac85f86cd9 - Show all commits

25
tests/mock-forgejo.py
View file

@ -11,7 +11,9 @@ import json
import os import os
import re import re
import signal import signal
import socket
import sys import sys
import threading
import uuid import uuid
from http.server import HTTPServer, BaseHTTPRequestHandler from http.server import HTTPServer, BaseHTTPRequestHandler
from socketserver import ThreadingMixIn from socketserver import ThreadingMixIn
@ -103,10 +105,12 @@ class ForgejoHandler(BaseHTTPRequestHandler):
log_request(self, method, self.path, "PENDING") log_request(self, method, self.path, "PENDING")
# Strip /api/v1/ prefix for routing # Strip /api/v1/ prefix for routing (or leading slash for other routes)
route_path = path route_path = path
if route_path.startswith("/api/v1/"): if route_path.startswith("/api/v1/"):
route_path = route_path[8:] route_path = route_path[8:]
elif route_path.startswith("/"):
route_path = route_path.lstrip("/")
# Route to handler # Route to handler
try: try:
@ -146,8 +150,6 @@ class ForgejoHandler(BaseHTTPRequestHandler):
(r"^admin/users/([^/]+)$", f"handle_{method}_admin_users_username"), (r"^admin/users/([^/]+)$", f"handle_{method}_admin_users_username"),
# Org patterns # Org patterns
(r"^orgs$", f"handle_{method}_orgs"), (r"^orgs$", f"handle_{method}_orgs"),
# OAuth2 patterns
(r"^user/applications/oauth2$", f"handle_{method}_user_applications_oauth2"),
] ]
for pattern, handler_name in patterns: for pattern, handler_name in patterns:
@ -297,6 +299,7 @@ class ForgejoHandler(BaseHTTPRequestHandler):
"scopes": data.get("scopes", ["all"]), "scopes": data.get("scopes", ["all"]),
"created_at": "2026-04-01T00:00:00Z", "created_at": "2026-04-01T00:00:00Z",
"expires_at": None, "expires_at": None,
"username": username, # Store username for lookup
} }
state["tokens"][token_str] = token state["tokens"][token_str] = token
@ -388,11 +391,11 @@ class ForgejoHandler(BaseHTTPRequestHandler):
auth_header = self.headers.get("Authorization", "") auth_header = self.headers.get("Authorization", "")
token = auth_header.split(" ", 1)[1] if " " in auth_header else "" token = auth_header.split(" ", 1)[1] if " " in auth_header else ""
# Find user by token # Find user by token (use stored username field)
owner = None owner = None
for uname, tok in state["tokens"].items(): for tok_sha1, tok in state["tokens"].items():
if tok.get("sha1") == token: if tok_sha1 == token:
owner = uname owner = tok.get("username")
break break
if not owner: if not owner:
@ -567,10 +570,10 @@ class ForgejoHandler(BaseHTTPRequestHandler):
require_token(self) require_token(self)
parts = self.path.split("/") parts = self.path.split("/")
if len(parts) >= 7: if len(parts) >= 8:
owner = parts[4] owner = parts[4]
repo = parts[5] repo = parts[5]
collaborator = parts[6] collaborator = parts[7]
else: else:
json_response(self, 404, {"message": "repository not found"}) json_response(self, 404, {"message": "repository not found"})
return return
@ -605,7 +608,7 @@ def main():
port = int(os.environ.get("MOCK_FORGE_PORT", 3000)) port = int(os.environ.get("MOCK_FORGE_PORT", 3000))
server = ThreadingHTTPServer(("0.0.0.0", port), ForgejoHandler) server = ThreadingHTTPServer(("0.0.0.0", port), ForgejoHandler)
try: try:
server.socket.setsockopt(2, 4, 1) # SO_REUSEADDR server.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
except OSError: except OSError:
pass # Not all platforms support this pass # Not all platforms support this
@ -614,6 +617,8 @@ def main():
def shutdown_handler(signum, frame): def shutdown_handler(signum, frame):
global SHUTDOWN_REQUESTED global SHUTDOWN_REQUESTED
SHUTDOWN_REQUESTED = True SHUTDOWN_REQUESTED = True
# Can't call server.shutdown() directly from signal handler in threaded server
threading.Thread(target=server.shutdown, daemon=True).start()
signal.signal(signal.SIGTERM, shutdown_handler) signal.signal(signal.SIGTERM, shutdown_handler)
signal.signal(signal.SIGINT, shutdown_handler) signal.signal(signal.SIGINT, shutdown_handler)