Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
"""Alpha authentication and authorization utilities for AWS Lambda."""
"""Authentication and authorization utilities for AWS Lambda."""

from __future__ import annotations

import importlib
from typing import TYPE_CHECKING

if TYPE_CHECKING:
from aws_lambda_powertools.utilities.auth_alpha.exceptions import AuthFailureReason as AuthFailureReason
from aws_lambda_powertools.utilities.auth_alpha.jwt import AuthErrorContext as AuthErrorContext
from aws_lambda_powertools.utilities.auth_alpha.jwt import JWTVerifier as JWTVerifier
from aws_lambda_powertools.utilities.auth_alpha.oauth2 import OAuth2Client as OAuth2Client
from aws_lambda_powertools.utilities.auth.exceptions import AuthFailureReason as AuthFailureReason
from aws_lambda_powertools.utilities.auth.jwt import AuthErrorContext as AuthErrorContext
from aws_lambda_powertools.utilities.auth.jwt import JWTVerifier as JWTVerifier
from aws_lambda_powertools.utilities.auth.oauth2 import OAuth2Client as OAuth2Client

__all__ = ["AuthErrorContext", "AuthFailureReason", "JWTVerifier", "OAuth2Client"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import time

from aws_lambda_powertools.utilities.auth_alpha._internal.validation import finite_seconds
from aws_lambda_powertools.utilities.auth._internal.validation import finite_seconds


class RequestError(Exception):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from functools import wraps
from typing import TYPE_CHECKING, ParamSpec, TypeVar

from aws_lambda_powertools.utilities.auth_alpha.exceptions import AuthError
from aws_lambda_powertools.utilities.auth.exceptions import AuthError

if TYPE_CHECKING:
from collections.abc import Callable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import urllib3
from urllib3.poolmanager import pool_classes_by_scheme

from aws_lambda_powertools.utilities.auth_alpha._internal.deadline import Deadline, RequestError
from aws_lambda_powertools.utilities.auth_alpha._internal.transport import (
from aws_lambda_powertools.utilities.auth._internal.deadline import Deadline, RequestError
from aws_lambda_powertools.utilities.auth._internal.transport import (
DeadlineHTTPSConnectionPool,
response_deadline,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from aws_lambda_powertools.utilities.auth_alpha._internal.validation import string_list
from aws_lambda_powertools.utilities.auth._internal.validation import string_list


def valid_scope(value: str) -> bool:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from urllib3.exceptions import HeaderParsingError
from urllib3.util.response import assert_header_parsing

from aws_lambda_powertools.utilities.auth_alpha._internal.deadline import RequestError
from aws_lambda_powertools.utilities.auth._internal.deadline import RequestError

if TYPE_CHECKING:
from collections.abc import Iterator
Expand All @@ -20,7 +20,7 @@

from typing_extensions import Buffer

from aws_lambda_powertools.utilities.auth_alpha._internal.deadline import Deadline
from aws_lambda_powertools.utilities.auth._internal.deadline import Deadline

class _ResponseStream(Protocol):
def readinto1(self, buffer: Buffer, /) -> int: ...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
from typing import TYPE_CHECKING

if TYPE_CHECKING:
from aws_lambda_powertools.utilities.auth_alpha.jwt.exceptions import AuthFailureReason as AuthFailureReason
from aws_lambda_powertools.utilities.auth_alpha.jwt.integrations.event_handler import (
from aws_lambda_powertools.utilities.auth.jwt.exceptions import AuthFailureReason as AuthFailureReason
from aws_lambda_powertools.utilities.auth.jwt.integrations.event_handler import (
AuthErrorContext as AuthErrorContext,
)
from aws_lambda_powertools.utilities.auth_alpha.jwt.verifier import JWTVerifier as JWTVerifier
from aws_lambda_powertools.utilities.auth.jwt.verifier import JWTVerifier as JWTVerifier

__all__ = ["AuthErrorContext", "AuthFailureReason", "JWTVerifier"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from collections.abc import Mapping
from typing import Any

from aws_lambda_powertools.utilities.auth_alpha._internal.scopes import required_scopes, valid_scope
from aws_lambda_powertools.utilities.auth_alpha.jwt.exceptions import (
from aws_lambda_powertools.utilities.auth._internal.scopes import required_scopes, valid_scope
from aws_lambda_powertools.utilities.auth.jwt.exceptions import (
AuthError,
AuthFailureReason,
InvalidClaimsError,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
from abc import ABC, abstractmethod
from typing import TYPE_CHECKING, Any, Literal

from aws_lambda_powertools.utilities.auth_alpha.jwt._internal.errors import sanitize_errors
from aws_lambda_powertools.utilities.auth.jwt._internal.errors import sanitize_errors

if TYPE_CHECKING:
from collections.abc import Callable

from aws_lambda_powertools.event_handler import Response
from aws_lambda_powertools.utilities.auth_alpha.jwt.exceptions import AuthError
from aws_lambda_powertools.utilities.auth_alpha.jwt.integrations.event_handler import (
from aws_lambda_powertools.utilities.auth.jwt.exceptions import AuthError
from aws_lambda_powertools.utilities.auth.jwt.integrations.event_handler import (
AuthErrorContext,
AuthMiddleware,
)
Expand Down Expand Up @@ -55,7 +55,7 @@ def verify_authorization_header(self, value: str | None) -> dict[str, Any]:
claims = verifier.verify_authorization_header(authorization)
```
"""
from aws_lambda_powertools.utilities.auth_alpha.jwt._internal.authorization import bearer_token
from aws_lambda_powertools.utilities.auth.jwt._internal.authorization import bearer_token

return self.verify(bearer_token(value))

Expand Down Expand Up @@ -97,7 +97,7 @@ def orders():
return {"subject": app.context["claims"]["sub"]}
```
"""
from aws_lambda_powertools.utilities.auth_alpha.jwt.integrations.event_handler import AuthMiddleware
from aws_lambda_powertools.utilities.auth.jwt.integrations.event_handler import AuthMiddleware

return AuthMiddleware(self, scopes, authorize, on_error)

Expand Down Expand Up @@ -142,6 +142,6 @@ def authorize(
)
```
"""
from aws_lambda_powertools.utilities.auth_alpha.jwt.integrations.api_gateway import authorize_event
from aws_lambda_powertools.utilities.auth.jwt.integrations.api_gateway import authorize_event

return authorize_event(self, event, scopes, response_format, context_claims, on_error)
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from aws_lambda_powertools.utilities.auth._internal.errors import sanitize_errors

__all__ = ["sanitize_errors"]
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

import jwt

from aws_lambda_powertools.utilities.auth_alpha._internal.deadline import Deadline, RequestError
from aws_lambda_powertools.utilities.auth_alpha._internal.validation import https_url
from aws_lambda_powertools.utilities.auth_alpha.jwt.exceptions import InvalidTokenError, JWKSFetchError
from aws_lambda_powertools.utilities.auth._internal.deadline import Deadline, RequestError
from aws_lambda_powertools.utilities.auth._internal.validation import https_url
from aws_lambda_powertools.utilities.auth.jwt.exceptions import InvalidTokenError, JWKSFetchError


def copy_key_set(value: dict[str, Any]) -> dict[str, Any]:
Expand Down Expand Up @@ -46,7 +46,7 @@ class JWKSCache:
"""A key-set snapshot whose maximum age is independent of miss throttling."""

def __init__(self, issuer: str, uri: str | None, max_age: float, cooldown: float) -> None:
from aws_lambda_powertools.utilities.auth_alpha._internal.http import HTTPClient
from aws_lambda_powertools.utilities.auth._internal.http import HTTPClient

self._issuer = issuer
self._uri = uri
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Credential-free errors raised by JWT verification."""

from aws_lambda_powertools.utilities.auth_alpha.exceptions import AuthError, AuthFailureReason
from aws_lambda_powertools.utilities.auth.exceptions import AuthError, AuthFailureReason

__all__ = [
"AuthError",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
import re
from typing import TYPE_CHECKING, Any, Literal

from aws_lambda_powertools.utilities.auth_alpha._internal.validation import string_list
from aws_lambda_powertools.utilities.auth_alpha.jwt._internal.authorization import (
from aws_lambda_powertools.utilities.auth._internal.validation import string_list
from aws_lambda_powertools.utilities.auth.jwt._internal.authorization import (
ForbiddenError,
bearer_token,
enforce_scopes,
header_token,
required_scopes,
)
from aws_lambda_powertools.utilities.auth_alpha.jwt.exceptions import AuthError, InvalidClaimsError, InvalidTokenError
from aws_lambda_powertools.utilities.auth.jwt.exceptions import AuthError, InvalidClaimsError, InvalidTokenError
from aws_lambda_powertools.utilities.data_classes.api_gateway_authorizer_event import APIGatewayAuthorizerResponseV2
from aws_lambda_powertools.utilities.data_classes.common import DictWrapper

if TYPE_CHECKING:
from collections.abc import Callable

from aws_lambda_powertools.utilities.auth_alpha.jwt._internal.base import Verifier
from aws_lambda_powertools.utilities.auth.jwt._internal.base import Verifier

_ARN = re.compile(r"arn:[a-z0-9-]+:execute-api:[a-z0-9-]+:\d{12}:[a-z0-9]+/[^/]+/[A-Z]+/.*")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@

from aws_lambda_powertools.event_handler import ApiGatewayResolver, Response
from aws_lambda_powertools.event_handler.middlewares import BaseMiddlewareHandler
from aws_lambda_powertools.utilities.auth_alpha.jwt._internal.authorization import (
from aws_lambda_powertools.utilities.auth.jwt._internal.authorization import (
ForbiddenError,
InsufficientScopeError,
MissingTokenError,
enforce_scopes,
header_token,
required_scopes,
)
from aws_lambda_powertools.utilities.auth_alpha.jwt.exceptions import AuthError, AuthFailureReason, InvalidTokenError
from aws_lambda_powertools.utilities.auth.jwt.exceptions import AuthError, AuthFailureReason, InvalidTokenError

if TYPE_CHECKING:
from collections.abc import Callable
from typing import Any

from aws_lambda_powertools.event_handler.middlewares import NextMiddleware
from aws_lambda_powertools.utilities.auth_alpha.jwt._internal.base import Verifier
from aws_lambda_powertools.utilities.auth.jwt._internal.base import Verifier


@dataclass(frozen=True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
if TYPE_CHECKING:
from collections.abc import Iterator

from aws_lambda_powertools.utilities.auth_alpha.jwt._internal.base import Verifier
from aws_lambda_powertools.utilities.auth.jwt._internal.base import Verifier


@contextmanager
Expand Down
Loading
Loading