jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

block/bridge: correct handling of hashed fingerprints

Browse source
This commit is contained in:
Iain Learmonth 2022-09-01 16:26:19 +01:00
parent 434460dfc0
commit 268445e0f0
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/terraform/block/bridge.py
View file

@ -52,7 +52,7 @@ class BlockBridgeAutomation(BaseAutomation):
logging.debug("Blocked by IP") logging.debug("Blocked by IP")
rotated.extend(self.perform_deprecations(self.fingerprints, get_bridge_by_fingerprint)) rotated.extend(self.perform_deprecations(self.fingerprints, get_bridge_by_fingerprint))
logging.debug("Blocked by fingerprint") logging.debug("Blocked by fingerprint")
rotated.extend(self.perform_deprecations(self.fingerprints, get_bridge_by_hashed_fingerprint)) rotated.extend(self.perform_deprecations(self.hashed_fingerprints, get_bridge_by_hashed_fingerprint))
logging.debug("Blocked by hashed fingerprint") logging.debug("Blocked by hashed fingerprint")
if rotated: if rotated:
activity = Activity( activity = Activity(

3
app/terraform/block/bridge_gitlab.py
View file

@ -14,6 +14,7 @@ class BlockBridgeGitlabAutomation(BlockBridgeReachabilityAutomation):
frequency = 30 frequency = 30
def fetch(self) -> None: def fetch(self) -> None:
self._lines = list()
credentials = {"private_token": current_app.config['GITLAB_TOKEN']} credentials = {"private_token": current_app.config['GITLAB_TOKEN']}
if "GITLAB_URL" in current_app.config: if "GITLAB_URL" in current_app.config:
credentials['url'] = current_app.config['GITLAB_URL'] credentials['url'] = current_app.config['GITLAB_URL']
@ -25,4 +26,4 @@ class BlockBridgeGitlabAutomation(BlockBridgeReachabilityAutomation):
ref=current_app.config["GITLAB_BRIDGE_BRANCH"] ref=current_app.config["GITLAB_BRIDGE_BRANCH"]
) )
# Decode the base64 first, then decode the UTF-8 string # Decode the base64 first, then decode the UTF-8 string
self._lines = contents.decode().decode('utf-8').splitlines() self._lines.extend(contents.decode().decode('utf-8').splitlines())