erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

component AP gateway: fix AP media type in GET and POST requests headers

Browse source
This commit is contained in:
Goffi 2023-07-06 11:34:52 +02:00
commit 68c47bc78b
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py
View file

@ -377,7 +377,6 @@ class APGateway:
url,
headers = {
"Accept": [MEDIA_TYPE_AP],
"Content-Type": [MEDIA_TYPE_AP],
}
)
if resp.code >= 300:
@ -1345,7 +1344,7 @@ class APGateway:
"Digest": digest
}
headers["Content-Type"] = (
'application/activity+json'
MEDIA_TYPE_AP
)
headers, __ = self.get_signature_data(self.get_key_id(actor_id), headers)

3
libervia/backend/plugins/plugin_comp_ap_gateway/constants.py
View file

@ -35,7 +35,8 @@ TYPE_REACTION = "EmojiReact"
TYPE_EVENT = "Event"
TYPE_JOIN = "Join"
TYPE_LEAVE = "Leave"
MEDIA_TYPE_AP = "application/activity+json"
MEDIA_TYPE_AP = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
MEDIA_TYPE_AP_ALT = "application/activity+json"
NS_AP = "https://www.w3.org/ns/activitystreams"
NS_AP_PUBLIC = f"{NS_AP}#Public"
# 3 values can be used, see https://www.w3.org/TR/activitypub/#public-addressing

13
libervia/backend/plugins/plugin_comp_ap_gateway/http_server.py
View file

@ -41,10 +41,11 @@ from libervia.backend.tools.common import date_utils, uri
from libervia.backend.memory.sqla_mapping import SubscriptionState
from .constants import (
NS_AP, MEDIA_TYPE_AP, CONTENT_TYPE_WEBFINGER, CONTENT_TYPE_AP, TYPE_ACTOR, TYPE_INBOX,
TYPE_SHARED_INBOX, TYPE_OUTBOX, TYPE_EVENT, AP_REQUEST_TYPES, PAGE_SIZE,
ACTIVITY_TYPES_LOWER, ACTIVIY_NO_ACCOUNT_ALLOWED, SIGN_HEADERS, HS2019, SIGN_EXP,
TYPE_FOLLOWERS, TYPE_FOLLOWING, TYPE_ITEM, TYPE_LIKE, TYPE_REACTION, ST_AP_CACHE
NS_AP, MEDIA_TYPE_AP, MEDIA_TYPE_AP_ALT, CONTENT_TYPE_WEBFINGER, CONTENT_TYPE_AP,
TYPE_ACTOR, TYPE_INBOX, TYPE_SHARED_INBOX, TYPE_OUTBOX, TYPE_EVENT, AP_REQUEST_TYPES,
PAGE_SIZE, ACTIVITY_TYPES_LOWER, ACTIVIY_NO_ACCOUNT_ALLOWED, SIGN_HEADERS, HS2019,
SIGN_EXP, TYPE_FOLLOWERS, TYPE_FOLLOWING, TYPE_ITEM, TYPE_LIKE, TYPE_REACTION,
ST_AP_CACHE
)
from .regex import RE_SIG_PARAM
@ -968,7 +969,9 @@ class HTTPAPGServer(web_resource.Resource):
path
)
request_type, extra_args = self.apg.parse_apurl(ap_url)
if ((MEDIA_TYPE_AP not in (request.getHeader("accept") or "")
header_accept = request.getHeader("accept") or ""
if ((MEDIA_TYPE_AP not in header_accept
and MEDIA_TYPE_AP_ALT not in header_accept
and request_type in self.apg.html_redirect)):
# this is not a AP request, and we have a redirections for it
kw = {}