mirror of
https://git.pleroma.social/pleroma/relay.git
synced 2024-11-10 02:17:59 +00:00
Merge branch 'master' into 'dev'
Draft: Fix 'relay inbox follow/unfollow' See merge request pleroma/relay!49
This commit is contained in:
commit
e3bfbbf19e
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -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
|
|
@ -3,7 +3,7 @@ import traceback
|
||||||
|
|
||||||
from aiohttp import ClientSession, ClientTimeout, TCPConnector
|
from aiohttp import ClientSession, ClientTimeout, TCPConnector
|
||||||
from aiohttp.client_exceptions import ClientConnectorError, ServerTimeoutError
|
from aiohttp.client_exceptions import ClientConnectorError, ServerTimeoutError
|
||||||
from aputils import Nodeinfo, WellKnownNodeinfo
|
from aputils import Nodeinfo, WellKnownNodeinfo, AlgorithmType
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from cachetools import LRUCache
|
from cachetools import LRUCache
|
||||||
from json.decoder import JSONDecodeError
|
from json.decoder import JSONDecodeError
|
||||||
|
@ -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,25 @@ 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'))
|
||||||
|
|
||||||
|
async with ClientSession(
|
||||||
|
connector=TCPConnector(
|
||||||
|
limit=self.limit, ttl_dns_cache=300),
|
||||||
|
headers=HEADERS,
|
||||||
|
connector_owner=True,
|
||||||
|
timeout=ClientTimeout(total=self.timeout)) as session:
|
||||||
try:
|
try:
|
||||||
logging.verbose(f'Fetching resource: {url}')
|
logging.verbose(f'Fetching resource: {url}')
|
||||||
|
async with 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 +117,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,51 +136,61 @@ class HttpClient:
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
|
async def post(self, url, message, software=None):
|
||||||
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'}) or (software and software in {'mastodon'}):
|
||||||
algorithm = 'hs2019'
|
algorithm = AlgorithmType.HS2019
|
||||||
|
|
||||||
else:
|
else:
|
||||||
algorithm = 'original'
|
algorithm = AlgorithmType.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))
|
||||||
|
|
||||||
|
async with ClientSession(
|
||||||
|
connector=TCPConnector(
|
||||||
|
limit=self.limit, ttl_dns_cache=300),
|
||||||
|
headers=HEADERS,
|
||||||
|
connector_owner=True,
|
||||||
|
timeout=ClientTimeout(total=self.timeout)) as session:
|
||||||
|
|
||||||
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:
|
async with session.post(url, headers=headers, data=message.to_json()) as resp:
|
||||||
## Not expecting a response, so just return
|
# 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 +201,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
|
||||||
|
|
|
@ -160,7 +160,11 @@ def cli_inbox_follow(actor):
|
||||||
actor = actor
|
actor = actor
|
||||||
)
|
)
|
||||||
|
|
||||||
asyncio.run(app.client.post(inbox, message))
|
# Fetch software to decide on algorithm
|
||||||
|
nodeinfo = asyncio.run(app.client.fetch_nodeinfo(domain))
|
||||||
|
software = nodeinfo.sw_name if nodeinfo else None
|
||||||
|
|
||||||
|
asyncio.run(app.client.post(inbox, message, software))
|
||||||
click.echo(f'Sent follow message to actor: {actor}')
|
click.echo(f'Sent follow message to actor: {actor}')
|
||||||
|
|
||||||
|
|
||||||
|
@ -198,7 +202,11 @@ def cli_inbox_unfollow(actor):
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
asyncio.run(app.client.post(inbox, message))
|
# Fetch software to decide on algorithm
|
||||||
|
nodeinfo = asyncio.run(app.client.fetch_nodeinfo(domain))
|
||||||
|
software = nodeinfo.sw_name if nodeinfo else None
|
||||||
|
|
||||||
|
asyncio.run(app.client.post(inbox, message, software))
|
||||||
click.echo(f'Sent unfollow message to: {actor}')
|
click.echo(f'Sent unfollow message to: {actor}')
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue