altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

ci: remove unnecessary helper

Browse source 
b64decode defaults to validate=false, which discards chars
outside the base64 alphabet. That includes whitespace.
This commit is contained in:
Jennifer Richards 2024-05-13 11:44:30 -03:00 committed by Nicolas Giard
parent c1a7a60eb9
commit 5486345ab0
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
k8s/settings_local.py
View file

@ -9,11 +9,6 @@ from ietf import __release_hash__
from ietf.settings import * # pyflakes:ignore from ietf.settings import * # pyflakes:ignore
def _remove_whitespace_and_b64decode(s):
"""Helper to strip out whitespace and base64 decode"""
return b64decode("".join(s.split()))
def _multiline_to_list(s): def _multiline_to_list(s):
"""Helper to split at newlines and conver to list""" """Helper to split at newlines and conver to list"""
return [item.strip() for item in s.split("\n")] return [item.strip() for item in s.split("\n")]
@ -31,7 +26,7 @@ else:
_NOMCOM_APP_SECRET_B64 = os.environ.get("DATATRACKER_NOMCOM_APP_SECRET_B64", None) _NOMCOM_APP_SECRET_B64 = os.environ.get("DATATRACKER_NOMCOM_APP_SECRET_B64", None)
if _NOMCOM_APP_SECRET_B64 is not None: if _NOMCOM_APP_SECRET_B64 is not None:
NOMCOM_APP_SECRET = _remove_whitespace_and_b64decode(_NOMCOM_APP_SECRET_B64) NOMCOM_APP_SECRET = b64decode(_NOMCOM_APP_SECRET_B64)
else: else:
raise RuntimeError("DATATRACKER_NOMCOM_APP_SECRET_B64 must be set") raise RuntimeError("DATATRACKER_NOMCOM_APP_SECRET_B64 must be set")
@ -67,13 +62,13 @@ else:
_API_PUBLIC_KEY_PEM_B64 = os.environ.get("DATATRACKER_API_PUBLIC_KEY_PEM_B64", None) _API_PUBLIC_KEY_PEM_B64 = os.environ.get("DATATRACKER_API_PUBLIC_KEY_PEM_B64", None)
if _API_PUBLIC_KEY_PEM_B64 is not None: if _API_PUBLIC_KEY_PEM_B64 is not None:
API_PUBLIC_KEY_PEM = _remove_whitespace_and_b64decode(_API_PUBLIC_KEY_PEM_B64) API_PUBLIC_KEY_PEM = b64decode(_API_PUBLIC_KEY_PEM_B64)
else: else:
raise RuntimeError("DATATRACKER_API_PUBLIC_KEY_PEM_B64 must be set") raise RuntimeError("DATATRACKER_API_PUBLIC_KEY_PEM_B64 must be set")
_API_PRIVATE_KEY_PEM_B64 = os.environ.get("DATATRACKER_API_PRIVATE_KEY_PEM_B64", None) _API_PRIVATE_KEY_PEM_B64 = os.environ.get("DATATRACKER_API_PRIVATE_KEY_PEM_B64", None)
if _API_PRIVATE_KEY_PEM_B64 is not None: if _API_PRIVATE_KEY_PEM_B64 is not None:
API_PRIVATE_KEY_PEM = _remove_whitespace_and_b64decode(_API_PRIVATE_KEY_PEM_B64) API_PRIVATE_KEY_PEM = b64decode(_API_PRIVATE_KEY_PEM_B64)
else: else:
raise RuntimeError("DATATRACKER_API_PRIVATE_KEY_PEM_B64 must be set") raise RuntimeError("DATATRACKER_API_PRIVATE_KEY_PEM_B64 must be set")