pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-11-09 18:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

use proper accept header for nodeinfo fetching

Browse source
This commit is contained in:
Izalia Mae 2022-08-12 02:36:08 -04:00
parent a2b0b2f548
commit fc7de1a3bc
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
relay/misc.py
View file

@ -136,7 +136,7 @@ async def fetch_actor_key(actor):
async def fetch_nodeinfo(domain): async def fetch_nodeinfo(domain):
nodeinfo_url = None nodeinfo_url = None
wk_nodeinfo = await request(f'https://{domain}/.well-known/nodeinfo', sign_headers=False) wk_nodeinfo = await request(f'https://{domain}/.well-known/nodeinfo', sign_headers=False, activity=False)
if not wk_nodeinfo: if not wk_nodeinfo:
return return
@ -149,7 +149,7 @@ async def fetch_nodeinfo(domain):
if not nodeinfo_url: if not nodeinfo_url:
return return
nodeinfo_data = await request(nodeinfo_url, sign_headers=False) nodeinfo_data = await request(nodeinfo_url, sign_headers=False, activity=False)
try: try:
return nodeinfo_data['software']['name'] return nodeinfo_data['software']['name']
@ -211,7 +211,7 @@ async def unfollow_remote_actor(actor_uri):
await request(inbox, message) await request(inbox, message)
async def request(uri, data=None, force=False, sign_headers=True): async def request(uri, data=None, force=False, sign_headers=True, activity=True):
## If a get request and not force, try to use the cache first ## If a get request and not force, try to use the cache first
if not data and not force: if not data and not force:
try: try:
@ -223,14 +223,15 @@ async def request(uri, data=None, force=False, sign_headers=True):
url = urlparse(uri) url = urlparse(uri)
method = 'POST' if data else 'GET' method = 'POST' if data else 'GET'
headers = {'User-Agent': 'ActivityRelay'} headers = {'User-Agent': 'ActivityRelay'}
mimetype = 'application/activity+json' if activity else 'application/json'
## Set the content type for a POST ## Set the content type for a POST
if data and 'Content-Type' not in headers: if data and 'Content-Type' not in headers:
headers['Content-Type'] = 'application/activity+json' headers['Content-Type'] = mimetype
## Set the accepted content type for a GET ## Set the accepted content type for a GET
elif not data and 'Accept' not in headers: elif not data and 'Accept' not in headers:
headers['Accept'] = 'application/activity+json' headers['Accept'] = mimetype
if sign_headers: if sign_headers:
signing_headers = { signing_headers = {

3
relay/processors.py
View file

@ -118,5 +118,8 @@ processors = {
async def run_processor(request, data, actor): async def run_processor(request, data, actor):
if data['type'] not in processors:
return
logging.verbose(f'New activity from actor: {actor["id"]} {data["type"]}') logging.verbose(f'New activity from actor: {actor["id"]} {data["type"]}')
return await processors[data['type']](actor, data, request) return await processors[data['type']](actor, data, request)