pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-11-21 22:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

always fetch nodeinfo software name

Browse source
This commit is contained in:
Izalia Mae 2022-11-16 10:31:21 -05:00
parent c88e4e748a
commit 8fd712c849
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
relay/views.py
View file

@ -71,7 +71,6 @@ async def actor(request):
async def inbox(request): async def inbox(request):
config = request.app.config config = request.app.config
database = request.app.database database = request.app.database
software = None
## reject if missing signature header ## reject if missing signature header
if 'signature' not in request.headers: if 'signature' not in request.headers:
@ -92,6 +91,7 @@ async def inbox(request):
logging.verbose('Failed to parse inbox message') logging.verbose('Failed to parse inbox message')
return Response.new_error(400, 'failed to parse message', 'json') return Response.new_error(400, 'failed to parse message', 'json')
software = await misc.fetch_nodeinfo(data.domain)
actor = await misc.request(data.actorid) actor = await misc.request(data.actorid)
## reject if actor is empty ## reject if actor is empty
@ -110,12 +110,9 @@ async def inbox(request):
return Response.new_error(403, 'access denied', 'json') return Response.new_error(403, 'access denied', 'json')
## reject if software used by actor is banned ## reject if software used by actor is banned
if len(config.blocked_software): if config.is_banned_software(software):
software = await misc.fetch_nodeinfo(data.domain) logging.verbose(f'Rejected actor for using specific software: {software}')
return Response.new_error(403, 'access denied', 'json')
if config.is_banned_software(software):
logging.verbose(f'Rejected actor for using specific software: {software}')
return Response.new_error(403, 'access denied', 'json')
## reject if the signature is invalid ## reject if the signature is invalid
if not (await misc.validate_signature(data.actorid, request)): if not (await misc.validate_signature(data.actorid, request)):