clear-skies 1.22.22__tar.gz → 1.22.23__tar.gz

{clear_skies-1.22.22 → clear_skies-1.22.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.22.22
+Version: 1.22.23
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT

{clear_skies-1.22.22 → clear_skies-1.22.23}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies"
-version = "1.22.22"
+version = "1.22.23"
 description = "A framework for building backends in the cloud"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",

{clear_skies-1.22.22 → clear_skies-1.22.23}/src/clearskies/authentication/__init__.py

@@ -1,11 +1,11 @@
 from ..binding_config import BindingConfig
-from .secret_bearer import SecretBearer
-from .public import Public
 from .auth0_jwks import Auth0JWKS
 from .authorization import Authorization
+from .authorization_pass_through import AuthorizationPassThrough
 from .jwks import JWKS
 from .jwks_jwcrypto import JWKSJwCrypto
-from .authorization_pass_through import AuthorizationPassThrough
+from .public import Public, PublicAuth
+from .secret_bearer import SecretBearer, SecretBearerAuth
 
 
 def public():
@@ -34,8 +34,10 @@ __all__ = [
     "BindingConfig",
     "public",
     "Public",
+    "PublicAuth",
     "secret_bearer",
     "SecretBearer",
+    "SecretBearerAuth",
     "auth0_jwks",
     "Auth0JWKS",
     "authorization",

{clear_skies-1.22.22 → clear_skies-1.22.23}/src/clearskies/authentication/authorization_pass_through.py

@@ -1,7 +1,7 @@
-from clearskies.authentication import JWKSJwCrypto
+from clearskies.authentication import jwks_jwcrypto
 
 
-class AuthorizationPassThrough(JWKSJwCrypto):
+class AuthorizationPassThrough(jwks_jwcrypto.JWKSJwCrypto):
     """
     This authentication class takes the authentication header from the incoming request and reflects
     it on outgoing requests.

{clear_skies-1.22.22 → clear_skies-1.22.23}/src/clearskies/authentication/jwks_jwcrypto.py

@@ -1,18 +1,18 @@
 import datetime
 import json
 
-from clearskies.authentication import JWKS
+from clearskies.authentication import jwks
 from clearskies.handlers.exceptions import ClientError
 
 
-class JWKSJwCrypto(JWKS):
+class JWKSJwCrypto(jwks.JWKS):
     def __init__(self, environment, requests):
         # the third parameter is supposed to be jose_jwt, but we're going to override all
         # the functions that use it
         super().__init__(environment, requests, {})
 
     def validate_jwt(self, raw_jwt):
-        from jwcrypto import jws, jwk, jwt
+        from jwcrypto import jwk, jws, jwt
         from jwcrypto.common import JWException
 
         keys = jwk.JWKSet()

{clear_skies-1.22.22 → clear_skies-1.22.23}/src/clearskies/authentication/public.py

@@ -1,3 +1,7 @@
+from requests.auth import AuthBase
+from requests.models import PreparedRequest
+
+
 class Public:
     is_public = True
     can_authorize = False
@@ -26,3 +30,11 @@ class Public:
 
     def documentation_security_scheme_name(self):
         return ""
+
+
+class PublicAuth(AuthBase, Public):
+    """Wrapper around SecretBearer to allow for the use of the SecretBearer class as an AuthBase class"""
+
+    def __call__(self, r: PreparedRequest) -> PreparedRequest:
+        r.headers = {**r.headers, **self.headers()}
+        return super().__call__(r)

{clear_skies-1.22.22 → clear_skies-1.22.23}/src/clearskies/authentication/secret_bearer.py

@@ -1,3 +1,6 @@
+from requests.auth import AuthBase
+from requests.models import PreparedRequest
+
 from .. import autodoc
 
 
@@ -78,3 +81,11 @@ class SecretBearer:
 
     def documentation_security_scheme_name(self):
         return self._documentation_security_name if self._documentation_security_name is not None else "ApiKey"
+
+
+class SecretBearerAuth(AuthBase, SecretBearer):
+    """Wrapper around SecretBearer to allow for the use of the SecretBearer class as an AuthBase class"""
+
+    def __call__(self, r: PreparedRequest) -> PreparedRequest:
+        r.headers = {**r.headers, **self.headers()}
+        return super().__call__(r)

{clear_skies-1.22.22 → clear_skies-1.22.23}/src/clearskies/backends/api_backend.py

@@ -1,10 +1,30 @@
-from .backend import Backend
+import re
 from typing import Any, Callable, Dict, List, Tuple
-from ..autodoc.schema import Integer as AutoDocInteger
+
+from requests import Session
+from requests.auth import AuthBase
+
 from .. import model
+from ..autodoc.schema import Integer as AutoDocInteger
 from ..column_types import JSON, DateTime
-import re
-from requests import Session
+from .backend import Backend
+
+
+class NullAuth(AuthBase):
+    """force requests to ignore the ``.netrc``
+
+    Some sites do not support regular authentication, but we still
+    want to store credentials in the ``.netrc`` file and submit them
+    as form elements. Without this, requests would otherwise use the
+    .netrc which leads, on some sites, to a 401 error.
+
+    Use with::
+
+        requests.get(url, auth=NullAuth())
+    """
+
+    def __call__(self, r):
+        return r
 
 
 class ApiBackend(Backend):
@@ -152,28 +172,21 @@ class ApiBackend(Backend):
             raise ValueError("Unexpected response from records request")
         return json["data"]
 
-    def _execute_request(self, url: str, method: str, json: dict[str,Any]= {}, headers: dict[str,Any]= {}, is_retry: bool = False):
-        if self._auth:
-            headers = {**headers, **self._auth.headers(retry_auth=is_retry)}
+    def _execute_request(
+        self, url: str, method: str, json: dict[str, Any] = {}, headers: dict[str, Any] = {}, is_retry: bool = False
+    ):
         # the requests library seems to build a slightly different request if you specify the json parameter,
         # even if it is null, and this causes trouble for some picky servers
         if not json:
-            response = self._requests.request(
-                method,
-                url,
-                headers=headers,
-            )
+            response = self._requests.request(method, url, headers=headers, auth=self._auth if self._auth else NullAuth())
         else:
             response = self._requests.request(
-                method,
-                url,
-                headers=headers,
-                json=json,
+                method, url, headers=headers, json=json, auth=self._auth if self._auth else NullAuth()
             )
 
         if not response.ok:
             if self._auth and self._auth.has_dynamic_credentials and not is_retry:
-                return self._execute_request(url, method, json=json, headers=headers, is_retry=True)
+                return self._execute_request(url, method, json=json, headers=headers, auth=self._auth, is_retry=True)
             if not response.ok:
                 raise ValueError(f"Failed request.  Status code: {response.status_code}, message: {response.content!r}")