*: remove string.format()
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
parent
942170f902
commit
ba6849f29c
|
@ -81,7 +81,7 @@ COPY --from=builder /work/authentik /authentik-proxy
|
||||||
|
|
||||||
USER authentik
|
USER authentik
|
||||||
ENV TMPDIR /dev/shm/
|
ENV TMPDIR /dev/shm/
|
||||||
ENV PYTHONUBUFFERED 1
|
ENV PYTHONUNBUFFERED 1
|
||||||
ENV prometheus_multiproc_dir /dev/shm/
|
ENV prometheus_multiproc_dir /dev/shm/
|
||||||
ENV PATH "/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/lifecycle"
|
ENV PATH "/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/lifecycle"
|
||||||
ENTRYPOINT [ "/lifecycle/ak" ]
|
ENTRYPOINT [ "/lifecycle/ak" ]
|
||||||
|
|
|
@ -78,9 +78,7 @@ class CertificateKeyPair(CreatedUpdatedModel):
|
||||||
@property
|
@property
|
||||||
def kid(self):
|
def kid(self):
|
||||||
"""Get Key ID used for JWKS"""
|
"""Get Key ID used for JWKS"""
|
||||||
return "{0}".format(
|
return md5(self.key_data.encode("utf-8")).hexdigest() if self.key_data else "" # nosec
|
||||||
md5(self.key_data.encode("utf-8")).hexdigest() if self.key_data else "" # nosec
|
|
||||||
)
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
def __str__(self) -> str:
|
||||||
return f"Certificate-Key Pair {self.name}"
|
return f"Certificate-Key Pair {self.name}"
|
||||||
|
|
|
@ -151,12 +151,13 @@ class AuthorizeError(OAuth2Error):
|
||||||
# http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthError
|
# http://openid.net/specs/openid-connect-core-1_0.html#ImplicitAuthError
|
||||||
hash_or_question = "#" if self.grant_type == GrantTypes.IMPLICIT else "?"
|
hash_or_question = "#" if self.grant_type == GrantTypes.IMPLICIT else "?"
|
||||||
|
|
||||||
uri = "{0}{1}error={2}&error_description={3}".format(
|
uri = (
|
||||||
self.redirect_uri, hash_or_question, self.error, description
|
f"{self.redirect_uri}{hash_or_question}error="
|
||||||
|
f"{self.error}&error_description={description}"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Add state if present.
|
# Add state if present.
|
||||||
uri = uri + ("&state={0}".format(self.state) if self.state else "")
|
uri = uri + (f"&state={self.state}" if self.state else "")
|
||||||
|
|
||||||
return uri
|
return uri
|
||||||
|
|
||||||
|
|
|
@ -113,4 +113,4 @@ class OAuth2Client(BaseOAuthClient):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def session_key(self):
|
def session_key(self):
|
||||||
return "oauth-client-{0}-request-state".format(self.source.name)
|
return f"oauth-client-{self.source.name}-request-state"
|
||||||
|
|
|
@ -68,7 +68,7 @@ class AuthenticatorWebAuthnChallengeResponse(ChallengeResponse):
|
||||||
webauthn_credential = webauthn_registration_response.verify()
|
webauthn_credential = webauthn_registration_response.verify()
|
||||||
except RegistrationRejectedException as exc:
|
except RegistrationRejectedException as exc:
|
||||||
LOGGER.warning("registration failed", exc=exc)
|
LOGGER.warning("registration failed", exc=exc)
|
||||||
raise ValidationError("Registration failed. Error: {}".format(exc))
|
raise ValidationError(f"Registration failed. Error: {exc}")
|
||||||
|
|
||||||
# Step 17.
|
# Step 17.
|
||||||
#
|
#
|
||||||
|
|
Reference in a new issue