api: remove legacy http basic auth
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
parent
53851efacb
commit
a1a64e25ee
|
@ -1,6 +1,4 @@
|
||||||
"""API Authentication"""
|
"""API Authentication"""
|
||||||
from base64 import b64decode
|
|
||||||
from binascii import Error
|
|
||||||
from typing import Any, Optional
|
from typing import Any, Optional
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
@ -16,38 +14,34 @@ from authentik.outposts.models import Outpost
|
||||||
LOGGER = get_logger()
|
LOGGER = get_logger()
|
||||||
|
|
||||||
|
|
||||||
# pylint: disable=too-many-return-statements
|
def validate_auth(header: bytes) -> str:
|
||||||
def bearer_auth(raw_header: bytes) -> Optional[User]:
|
"""Validate that the header is in a correct format,
|
||||||
"""raw_header in the Format of `Bearer dGVzdDp0ZXN0`"""
|
returns type and credentials"""
|
||||||
auth_credentials = raw_header.decode()
|
auth_credentials = header.decode().strip()
|
||||||
if auth_credentials == "" or " " not in auth_credentials:
|
if auth_credentials == "" or " " not in auth_credentials:
|
||||||
return None
|
return None
|
||||||
auth_type, _, auth_credentials = auth_credentials.partition(" ")
|
auth_type, _, auth_credentials = auth_credentials.partition(" ")
|
||||||
if auth_type.lower() not in ["basic", "bearer"]:
|
if auth_type.lower() != "bearer":
|
||||||
LOGGER.debug("Unsupported authentication type, denying", type=auth_type.lower())
|
LOGGER.debug("Unsupported authentication type, denying", type=auth_type.lower())
|
||||||
raise AuthenticationFailed("Unsupported authentication type")
|
raise AuthenticationFailed("Unsupported authentication type")
|
||||||
password = auth_credentials
|
if auth_credentials == "": # nosec
|
||||||
if auth_type.lower() == "basic":
|
|
||||||
try:
|
|
||||||
auth_credentials = b64decode(auth_credentials.encode()).decode()
|
|
||||||
except (UnicodeDecodeError, Error):
|
|
||||||
raise AuthenticationFailed("Malformed header")
|
raise AuthenticationFailed("Malformed header")
|
||||||
# Accept credentials with username and without
|
return auth_credentials
|
||||||
if ":" in auth_credentials:
|
|
||||||
_, _, password = auth_credentials.partition(":")
|
|
||||||
else:
|
def bearer_auth(raw_header: bytes) -> Optional[User]:
|
||||||
password = auth_credentials
|
"""raw_header in the Format of `Bearer ....`"""
|
||||||
if password == "": # nosec
|
auth_credentials = validate_auth(raw_header)
|
||||||
raise AuthenticationFailed("Malformed header")
|
# first, check traditional tokens
|
||||||
tokens = Token.filter_not_expired(key=password, intent=TokenIntents.INTENT_API)
|
token = Token.filter_not_expired(key=auth_credentials, intent=TokenIntents.INTENT_API).first()
|
||||||
if not tokens.exists():
|
|
||||||
user = token_secret_key(password)
|
|
||||||
if not user:
|
|
||||||
raise AuthenticationFailed("Token invalid/expired")
|
|
||||||
return user
|
|
||||||
if hasattr(LOCAL, "authentik"):
|
if hasattr(LOCAL, "authentik"):
|
||||||
LOCAL.authentik[KEY_AUTH_VIA] = "api_token"
|
LOCAL.authentik[KEY_AUTH_VIA] = "api_token"
|
||||||
return tokens.first().user
|
if token:
|
||||||
|
return token.user
|
||||||
|
user = token_secret_key(auth_credentials)
|
||||||
|
if user:
|
||||||
|
return user
|
||||||
|
raise AuthenticationFailed("Token invalid/expired")
|
||||||
|
|
||||||
|
|
||||||
def token_secret_key(value: str) -> Optional[User]:
|
def token_secret_key(value: str) -> Optional[User]:
|
||||||
|
|
|
@ -14,12 +14,6 @@ from authentik.outposts.managed import OutpostManager
|
||||||
class TestAPIAuth(TestCase):
|
class TestAPIAuth(TestCase):
|
||||||
"""Test API Authentication"""
|
"""Test API Authentication"""
|
||||||
|
|
||||||
def test_valid_basic(self):
|
|
||||||
"""Test valid token"""
|
|
||||||
token = Token.objects.create(intent=TokenIntents.INTENT_API, user=get_anonymous_user())
|
|
||||||
auth = b64encode(f":{token.key}".encode()).decode()
|
|
||||||
self.assertEqual(bearer_auth(f"Basic {auth}".encode()), token.user)
|
|
||||||
|
|
||||||
def test_valid_bearer(self):
|
def test_valid_bearer(self):
|
||||||
"""Test valid token"""
|
"""Test valid token"""
|
||||||
token = Token.objects.create(intent=TokenIntents.INTENT_API, user=get_anonymous_user())
|
token = Token.objects.create(intent=TokenIntents.INTENT_API, user=get_anonymous_user())
|
||||||
|
@ -30,16 +24,6 @@ class TestAPIAuth(TestCase):
|
||||||
with self.assertRaises(AuthenticationFailed):
|
with self.assertRaises(AuthenticationFailed):
|
||||||
bearer_auth("foo bar".encode())
|
bearer_auth("foo bar".encode())
|
||||||
|
|
||||||
def test_invalid_decode(self):
|
|
||||||
"""Test invalid bas64"""
|
|
||||||
with self.assertRaises(AuthenticationFailed):
|
|
||||||
bearer_auth("Basic bar".encode())
|
|
||||||
|
|
||||||
def test_invalid_empty_password(self):
|
|
||||||
"""Test invalid with empty password"""
|
|
||||||
with self.assertRaises(AuthenticationFailed):
|
|
||||||
bearer_auth("Basic :".encode())
|
|
||||||
|
|
||||||
def test_invalid_no_token(self):
|
def test_invalid_no_token(self):
|
||||||
"""Test invalid with no token"""
|
"""Test invalid with no token"""
|
||||||
with self.assertRaises(AuthenticationFailed):
|
with self.assertRaises(AuthenticationFailed):
|
||||||
|
|
Reference in New Issue