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

Fix error on 'relay inbox follow'

Browse source
This commit is contained in:
Valentin 2022-12-24 18:38:02 +01:00
parent af7fcc66fd
commit 9842494fc6
No known key found for this signature in database
GPG key ID: AA2F52BADD7EF624
2 changed files with 166 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -99,3 +99,9 @@ viera.jsonld
# config file # config file
relay.yaml relay.yaml
# JSON-LD file
relay.jsonld
# VS Code Launch Configuration
launch.json

99
relay/http_client.py
View file

@ -36,34 +36,30 @@ class HttpClient:
self._conn = None self._conn = None
self._session = None self._session = None
@property @property
def limit(self): def limit(self):
return self.cfg['limit'] return self.cfg['limit']
@property @property
def timeout(self): def timeout(self):
return self.cfg['timeout'] return self.cfg['timeout']
async def open(self): async def open(self):
if self._session: if self._session:
return return
self._conn = TCPConnector( self._conn = TCPConnector(
limit = self.limit, limit=self.limit,
ttl_dns_cache = 300, ttl_dns_cache=300,
) )
self._session = ClientSession( self._session = ClientSession(
connector = self._conn, connector=self._conn,
headers = HEADERS, headers=HEADERS,
connector_owner = True, connector_owner=True,
timeout = ClientTimeout(total=self.timeout) timeout=ClientTimeout(total=self.timeout)
) )
async def close(self): async def close(self):
if not self._session: if not self._session:
return return
@ -74,12 +70,13 @@ class HttpClient:
self._conn = None self._conn = None
self._session = None self._session = None
async def get(self, url, sign_headers=False, loads=None, force=False): async def get(self, url, sign_headers=False, loads=None, force=False):
await self.open() await self.open()
try: url, _ = url.split('#', 1) try:
except: pass url, _ = url.split('#', 1)
except:
pass
if not force and url in self.cache: if not force and url in self.cache:
return self.cache[url] return self.cache[url]
@ -87,18 +84,20 @@ class HttpClient:
headers = {} headers = {}
if sign_headers: if sign_headers:
headers.update(self.database.signer.sign_headers('GET', url, algorithm='original')) headers.update(self.database.signer.sign_headers(
'GET', url, algorithm='original'))
try: try:
logging.verbose(f'Fetching resource: {url}') logging.verbose(f'Fetching resource: {url}')
async with self._session.get(url, headers=headers) as resp: async with self._session.get(url, headers=headers) as resp:
## Not expecting a response with 202s, so just return # Not expecting a response with 202s, so just return
if resp.status == 202: if resp.status == 202:
return return
elif resp.status != 200: elif resp.status != 200:
logging.verbose(f'Received error when requesting {url}: {resp.status}') logging.verbose(
f'Received error when requesting {url}: {resp.status}')
logging.verbose(await resp.read()) # change this to debug logging.verbose(await resp.read()) # change this to debug
return return
@ -113,7 +112,8 @@ class HttpClient:
else: else:
# todo: raise TypeError or something # todo: raise TypeError or something
logging.verbose(f'Invalid Content-Type for "{url}": {resp.content_type}') logging.verbose(
f'Invalid Content-Type for "{url}": {resp.content_type}')
return logging.debug(f'Response: {resp.read()}') return logging.debug(f'Response: {resp.read()}')
logging.debug(f'{url} >> resp {message.to_json(4)}') logging.debug(f'{url} >> resp {message.to_json(4)}')
@ -131,13 +131,10 @@ class HttpClient:
traceback.print_exc() traceback.print_exc()
raise e raise e
async def post(self, url, message): async def post(self, url, message):
await self.open()
instance = self.database.get_inbox(url) instance = self.database.get_inbox(url)
## Using the old algo by default is probably a better idea right now # Using the old algo by default is probably a better idea right now
if instance and instance.get('software') in {'mastodon'}: if instance and instance.get('software') in {'mastodon'}:
algorithm = 'hs2019' algorithm = 'hs2019'
@ -145,37 +142,74 @@ class HttpClient:
algorithm = 'original' algorithm = 'original'
headers = {'Content-Type': 'application/activity+json'} headers = {'Content-Type': 'application/activity+json'}
headers.update(self.database.signer.sign_headers('POST', url, message, algorithm=algorithm)) headers.update(self.database.signer.sign_headers(
'POST', url, message, algorithm=algorithm))
try: try:
logging.verbose(f'Sending "{message.type}" to {url}') logging.verbose(f'Sending "{message.type}" to {url}')
logging.verbose(
f'url: {url}\nheaders: {headers}\ndata: {message.to_json()}')
async with self._session.post(url, headers=headers, data=message.to_json()) as resp: # The following does not work and throws exception on 'relay inbox follow':
## Not expecting a response, so just return # Traceback (most recent call last):
# File "/home/vriess/Dokumente/Repos/relay-1/relay/http_client.py", line 153, in post
# async with self._session.post(url, headers=headers, data=message.to_json()) as resp:
# File "/home/vriess/Dokumente/Repos/relay-1/.venv/lib/python3.10/site-packages/aiohttp/client.py", line 1141, in __aenter__
# self._resp = await self._coro
# File "/home/vriess/Dokumente/Repos/relay-1/.venv/lib/python3.10/site-packages/aiohttp/client.py", line 448, in _request
# handle = tm.start()
# File "/home/vriess/Dokumente/Repos/relay-1/.venv/lib/python3.10/site-packages/aiohttp/helpers.py", line 651, in start
# return self._loop.call_at(when, self.__call__)
# File "/usr/lib/python3.10/asyncio/base_events.py", line 732, in call_at
# self._check_closed()
# File "/usr/lib/python3.10/asyncio/base_events.py", line 515, in _check_closed
# raise RuntimeError('Event loop is closed')
# RuntimeError: Event loop is closed
# ↓↓↓↓
# async with self._session.post(url, headers=headers, data=message.to_json()) as resp:
# ## Not expecting a response, so just return
# if resp.status in {200, 202}:
# return logging.info(f'Successfully sent "{message.type}" to {url}')
# logging.info(f'Received error when pushing to {url}: {resp.status}')
# return logging.info(await resp.read()) # change this to debug
# Creating a session here works for some reason and does not throw an error
async with ClientSession(
connector=TCPConnector(
limit=self.limit, ttl_dns_cache=300),
headers=HEADERS,
connector_owner=True,
timeout=ClientTimeout(total=self.timeout)) as session:
async with session.post(url, headers=headers, data=message.to_json()) as resp:
# Not expecting a response, so just return
if resp.status in {200, 202}: if resp.status in {200, 202}:
return logging.verbose(f'Successfully sent "{message.type}" to {url}') return logging.info(f'Successfully sent "{message.type}" to {url}')
logging.verbose(f'Received error when pushing to {url}: {resp.status}') logging.info(
return logging.verbose(await resp.read()) # change this to debug f'Received error when pushing to {url}: {resp.status}')
# change this to debug
return logging.info(await resp.read())
except (ClientConnectorError, ServerTimeoutError): except (ClientConnectorError, ServerTimeoutError):
logging.verbose(f'Failed to connect to {url}') logging.verbose(f'Failed to connect to {url}')
## prevent workers from being brought down # prevent workers from being brought down
except Exception as e: except Exception as e:
traceback.print_exc() traceback.print_exc()
## Additional methods ## ## Additional methods ##
async def fetch_nodeinfo(self, domain): async def fetch_nodeinfo(self, domain):
nodeinfo_url = None nodeinfo_url = None
wk_nodeinfo = await self.get( wk_nodeinfo = await self.get(
f'https://{domain}/.well-known/nodeinfo', f'https://{domain}/.well-known/nodeinfo',
loads = WellKnownNodeinfo.new_from_json loads=WellKnownNodeinfo.new_from_json
) )
if not wk_nodeinfo: if not wk_nodeinfo:
logging.verbose(f'Failed to fetch well-known nodeinfo url for domain: {domain}') logging.verbose(
f'Failed to fetch well-known nodeinfo url for domain: {domain}')
return False return False
for version in ['20', '21']: for version in ['20', '21']:
@ -186,7 +220,8 @@ class HttpClient:
pass pass
if not nodeinfo_url: if not nodeinfo_url:
logging.verbose(f'Failed to fetch nodeinfo url for domain: {domain}') logging.verbose(
f'Failed to fetch nodeinfo url for domain: {domain}')
return False return False
return await self.get(nodeinfo_url, loads=Nodeinfo.new_from_json) or False return await self.get(nodeinfo_url, loads=Nodeinfo.new_from_json) or False