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

use old signing algorithm by default

Browse source
This commit is contained in:
Izalia Mae 2024-06-12 12:40:32 -04:00
parent d55cf4d1d0
commit 62555b3591
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
relay/http_client.py
View file

@ -90,7 +90,12 @@ class HttpClient:
self._session = None self._session = None
async def _get(self, url: str, sign_headers: bool, force: bool) -> dict[str, Any] | None: async def _get(self,
url: str,
sign_headers: bool,
force: bool,
old_algo: bool) -> dict[str, Any] | None:
if not self._session: if not self._session:
raise RuntimeError('Client not open') raise RuntimeError('Client not open')
@ -111,7 +116,8 @@ class HttpClient:
headers = {} headers = {}
if sign_headers: if sign_headers:
headers = self.signer.sign_headers('GET', url, algorithm = AlgorithmType.HS2019) algo = AlgorithmType.RSASHA256 if old_algo else AlgorithmType.HS2019
headers = self.signer.sign_headers('GET', url, algorithm = algo)
try: try:
logging.debug('Fetching resource: %s', url) logging.debug('Fetching resource: %s', url)
@ -135,6 +141,7 @@ class HttpClient:
except JSONDecodeError: except JSONDecodeError:
logging.verbose('Failed to parse JSON') logging.verbose('Failed to parse JSON')
logging.debug(data)
return None return None
except ClientSSLError as e: except ClientSSLError as e:
@ -155,12 +162,13 @@ class HttpClient:
url: str, url: str,
sign_headers: bool, sign_headers: bool,
cls: type[T], cls: type[T],
force: bool = False) -> T | None: force: bool = False,
old_algo: bool = True) -> T | None:
if not issubclass(cls, JsonBase): if not issubclass(cls, JsonBase):
raise TypeError('cls must be a sub-class of "aputils.JsonBase"') raise TypeError('cls must be a sub-class of "aputils.JsonBase"')
if (data := (await self._get(url, sign_headers, force))) is None: if (data := (await self._get(url, sign_headers, force, old_algo))) is None:
return None return None
return cls.parse(data) return cls.parse(data)