docs/installation.md

@@ -15,7 +15,7 @@ the [official pipx docs](https://pypa.github.io/pipx/installation/) for more in-
 
 Now simply install ActivityRelay directly from git
 
-	pipx install git+https://git.pleroma.social/pleroma/relay@0.3.0
+	pipx install git+https://git.pleroma.social/pleroma/relay@0.2.5
 
 Or from a cloned git repo.
 
@@ -39,7 +39,7 @@ be installed via [pyenv](https://github.com/pyenv/pyenv).
 The instructions for installation via pip are very similar to pipx. Installation can be done from
 git
 
-	python3 -m pip install git+https://git.pleroma.social/pleroma/relay@0.3.0
+	python3 -m pip install git+https://git.pleroma.social/pleroma/relay@0.2.5
 
 or a cloned git repo.
 

relay/__init__.py

@@ -1 +1 @@
-__version__ = '0.3.0'
+__version__ = '0.2.6'

relay/manage.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
 import Crypto
-import aputils
 import asyncio
 import click
 import os
 import platform
 import typing
 
+from aputils.signer import Signer
 from pathlib import Path
 from shutil import copyfile
 from urllib.parse import urlparse
@@ -193,7 +193,7 @@ def cli_setup(ctx: click.Context) -> None:
 	ctx.obj.config.save()
 
 	config = {
-		'private-key': aputils.Signer.new('n/a').export()
+		'private-key': Signer.new('n/a').export()
 	}
 
 	with ctx.obj.database.session() as conn:

relay/misc.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-import aputils
 import json
 import os
 import socket
 import typing
 
 from aiohttp.web import Response as AiohttpResponse
+from aputils.message import Message as ApMessage
 from datetime import datetime
 from uuid import uuid4
 
@@ -95,7 +95,7 @@ class JsonEncoder(json.JSONEncoder):
 		return json.JSONEncoder.default(self, o)
 
 
-class Message(aputils.Message):
+class Message(ApMessage):
 	@classmethod
 	def new_actor(cls: type[Message],  # pylint: disable=arguments-differ
 				host: str,
@@ -182,6 +182,16 @@ class Message(aputils.Message):
 		})
 
 
+	# todo: remove when fixed in aputils
+	@property
+	def object_id(self) -> str:
+		try:
+			return self["object"]["id"]
+
+		except (KeyError, TypeError):
+			return self["object"]
+
+
 class Response(AiohttpResponse):
 	# AiohttpResponse.__len__ method returns 0, so bool(response) always returns False
 	def __bool__(self) -> bool:

relay/views/activitypub.py

@@ -1,9 +1,12 @@
 from __future__ import annotations
 
-import aputils
 import traceback
 import typing
 
+from aputils.errors import SignatureFailureError
+from aputils.misc import Digest, HttpDate, Signature
+from aputils.objects import Webfinger
+
 from .base import View, register_route
 
 from .. import logger as logging
@@ -12,6 +15,7 @@ from ..processors import run_processor
 
 if typing.TYPE_CHECKING:
 	from aiohttp.web import Request
+	from aputils.signer import Signer
 	from tinysql import Row
 
 
@@ -22,11 +26,11 @@ class ActorView(View):
 	def __init__(self, request: Request):
 		View.__init__(self, request)
 
-		self.signature: aputils.Signature = None
+		self.signature: Signature = None
 		self.message: Message = None
 		self.actor: Message = None
 		self.instance: Row = None
-		self.signer: aputils.Signer = None
+		self.signer: Signer = None
 
 
 	async def get(self, request: Request) -> Response:
@@ -73,7 +77,7 @@ class ActorView(View):
 
 	async def get_post_data(self) -> Response | None:
 		try:
-			self.signature = aputils.Signature.new_from_signature(self.request.headers['signature'])
+			self.signature = Signature.new_from_signature(self.request.headers['signature'])
 
 		except KeyError:
 			logging.verbose('Missing signature header')
@@ -120,7 +124,7 @@ class ActorView(View):
 		try:
 			self.validate_signature(await self.request.read())
 
-		except aputils.SignatureFailureError as e:
+		except SignatureFailureError as e:
 			logging.verbose('signature validation failed for "%s": %s', self.actor.id, e)
 			return Response.new_error(401, str(e), 'json')
 
@@ -129,31 +133,31 @@ class ActorView(View):
 		headers = {key.lower(): value for key, value in self.request.headers.items()}
 		headers["(request-target)"] = " ".join([self.request.method.lower(), self.request.path])
 
-		if (digest := aputils.Digest.new_from_digest(headers.get("digest"))):
+		if (digest := Digest.new_from_digest(headers.get("digest"))):
 			if not body:
-				raise aputils.SignatureFailureError("Missing body for digest verification")
+				raise SignatureFailureError("Missing body for digest verification")
 
 			if not digest.validate(body):
-				raise aputils.SignatureFailureError("Body digest does not match")
+				raise SignatureFailureError("Body digest does not match")
 
 		if self.signature.algorithm_type == "hs2019":
 			if "(created)" not in self.signature.headers:
-				raise aputils.SignatureFailureError("'(created)' header not used")
+				raise SignatureFailureError("'(created)' header not used")
 
-			current_timestamp = aputils.HttpDate.new_utc().timestamp()
+			current_timestamp = HttpDate.new_utc().timestamp()
 
 			if self.signature.created > current_timestamp:
-				raise aputils.SignatureFailureError("Creation date after current date")
+				raise SignatureFailureError("Creation date after current date")
 
 			if current_timestamp > self.signature.expires:
-				raise aputils.SignatureFailureError("Expiration date before current date")
+				raise SignatureFailureError("Expiration date before current date")
 
 			headers["(created)"] = self.signature.created
 			headers["(expires)"] = self.signature.expires
 
 		# pylint: disable=protected-access
 		if not self.signer._validate_signature(headers, self.signature):
-			raise aputils.SignatureFailureError("Signature does not match")
+			raise SignatureFailureError("Signature does not match")
 
 
 @register_route('/.well-known/webfinger')
@@ -168,7 +172,7 @@ class WebfingerView(View):
 		if subject != f'acct:relay@{self.config.domain}':
 			return Response.new_error(404, 'user not found', 'json')
 
-		data = aputils.Webfinger.new(
+		data = Webfinger.new(
 			handle = 'relay',
 			domain = self.config.domain,
 			actor = self.config.actor

relay/views/misc.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-import aputils
 import subprocess
 import typing
 
+from aputils.objects import Nodeinfo, WellKnownNodeinfo
 from pathlib import Path
 
 from .base import View, register_route
@@ -48,12 +48,12 @@ class NodeinfoView(View):
 		if niversion == '2.1':
 			data['repo'] = 'https://git.pleroma.social/pleroma/relay'
 
-		return Response.new(aputils.Nodeinfo.new(**data), ctype = 'json')
+		return Response.new(Nodeinfo.new(**data), ctype = 'json')
 
 
 @register_route('/.well-known/nodeinfo')
 class WellknownNodeinfoView(View):
 	async def get(self, request: Request) -> Response:
-		data = aputils.WellKnownNodeinfo.new_template(self.config.domain)
+		data = WellKnownNodeinfo.new_template(self.config.domain)
 
 		return Response.new(data, ctype = 'json')

requirements.txt

@@ -1,6 +1,6 @@
 aiohttp>=3.9.1
 aiohttp-swagger[performance]==1.0.16
-aputils@https://git.barkshark.xyz/barkshark/aputils/archive/0.1.7.tar.gz
+aputils@https://git.barkshark.xyz/barkshark/aputils/archive/0.1.6a.tar.gz
 argon2-cffi==23.1.0
 barkshark-sql@https://git.barkshark.xyz/barkshark/bsql/archive/0.1.1.tar.gz
 click>=8.1.2