jamlib 3.0.0rc2__tar.gz → 3.1.0__tar.gz

{jamlib-3.0.0rc2/src/jamlib.egg-info → jamlib-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jamlib
-Version: 3.0.0rc2
+Version: 3.1.0
 Summary: Simple and universal library for authorization.
 Author-email: Makridenko Adrian <adrianmakridenko@duck.com>, Ksenia Travnikova <kseniatravnikova@duck.com>
 License: Apache-2.0
@@ -16,7 +16,6 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -32,20 +31,22 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: cryptography>=46.0.5
+Provides-Extra: cli
+Requires-Dist: click>=8.3.1; extra == "cli"
 Provides-Extra: redis
-Requires-Dist: redis>=6.4.0; extra == "redis"
+Requires-Dist: redis>=7.3.0; extra == "redis"
 Provides-Extra: json
 Requires-Dist: tinydb>=4.8.2; extra == "json"
 Provides-Extra: yaml
-Requires-Dist: pyyaml>=6.0.2; extra == "yaml"
+Requires-Dist: pyyaml>=6.0.3; extra == "yaml"
 Provides-Extra: toml
 Requires-Dist: toml>=0.10.2; extra == "toml"
 Provides-Extra: litestar
-Requires-Dist: litestar>=2.18.0; extra == "litestar"
+Requires-Dist: litestar>=2.21.1; extra == "litestar"
 Provides-Extra: starlette
-Requires-Dist: starlette>=0.48.0; extra == "starlette"
+Requires-Dist: starlette>=0.52.1; extra == "starlette"
 Provides-Extra: fastapi
-Requires-Dist: fastapi>=0.119.0; extra == "fastapi"
+Requires-Dist: fastapi>=0.135.1; extra == "fastapi"
 Provides-Extra: flask
 Requires-Dist: flask>=3.1.2; extra == "flask"
 Dynamic: license-file

{jamlib-3.0.0rc2 → jamlib-3.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jamlib"
-version = "3.0.0.rc2"
+version = "3.1.0"
 description = "Simple and universal library for authorization."
 authors = [
     {name = "Makridenko Adrian",email = "adrianmakridenko@duck.com"},
@@ -34,7 +34,6 @@ classifiers = [
     "Intended Audience :: Information Technology",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -55,18 +54,22 @@ Issues = "https://github.com/lyaguxafrog/jam/issues"
 Changelog = "https://github.com/lyaguxafrog/jam/blob/master/CHANGELOG.md"
 
 
+[project.scripts]
+jam = "jam.cli:cli"
+
 [project.optional-dependencies]
-redis=["redis>=6.4.0"]
+cli=["click>=8.3.1"]
+redis=["redis>=7.3.0"]
 json=["tinydb>=4.8.2"]
-yaml=["pyyaml>=6.0.2"]
+yaml=["pyyaml>=6.0.3"]
 toml=["toml>=0.10.2"]
-litestar=["litestar>=2.18.0"]
-starlette=["starlette>=0.48.0"]
-fastapi=["fastapi>=0.119.0"]
+litestar=["litestar>=2.21.1"]
+starlette=["starlette>=0.52.1"]
+fastapi=["fastapi>=0.135.1"]
 flask=["flask>=3.1.2"]
 
 [build-system]
-requires = ["setuptools>=61.0", "wheel"]
+requires = ["setuptools>=82.0.1", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools.packages.find]
@@ -75,15 +78,14 @@ include = ["jam*"]
 
 [dependency-groups]
 dev = [
-    "black>=25.1.0",
-    "fakeredis>=2.28.1",
-    "icecream>=2.1.4",
-    "isort>=6.0.1",
-    "pre-commit>=4.2.0",
-    "pyrefly>=0.39.1",
-    "ruff>=0.11.2",
+    "click>=8.3.1",
+    "fakeredis>=2.34.1",
+    "icecream>=2.1.10",
+    "pre-commit>=4.5.1",
+    "pyrefly>=0.56.0",
+    "ruff>=0.15.6",
     "unicecream>=0.2.1",
-    "uvicorn>=0.37.0",
+    "uvicorn>=0.41.0",
 ]
 docs = [
     "mkdocs>=1.6.1",
@@ -95,8 +97,8 @@ docs = [
     "termynal>=0.13.0",
 ]
 tests = [
-    "pytest>=8.4.2",
-    "pytest-asyncio>=1.1.0",
+    "pytest>=9.0.2",
+    "pytest-asyncio>=1.3.0",
     "coverage>=7.13.4"
 ]
 

{jamlib-3.0.0rc2 → jamlib-3.1.0}/src/jam/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-"""JAM - Universal auth* library
+"""JAM - Universal auth* library.
 
 Source code: https://github.com/lyaguxafrog/jam
 Documentation: https://jam.makridenko.ru
@@ -12,5 +12,5 @@ from jam.encoders import JsonEncoder
 from jam.instance import Jam
 
 
-__version__ = "3.0.0.rc2"
+__version__ = "3.0.0"
 __all__ = ["Jam", "JsonEncoder", "BaseJam", "BaseEncoder"]

jamlib-3.1.0/src/jam/cli/__init__.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+"""CLI tool for Jam."""
+
+from .cli import cli
+
+__all__ = ["cli"]

jamlib-3.1.0/src/jam/cli/cli.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+from importlib.metadata import version
+
+
+try:
+    import click
+except ImportError:
+    from jam.exceptions import JamError
+
+    raise JamError(
+        message="To use the Jam CLI, run 'pip install jamlib[cli]'.",
+        error_code="jam.cli",
+    )
+
+from jam.cli.commands import keys, password
+
+
+@click.group()
+@click.version_option(version=version("jamlib"))
+def cli() -> None:
+    """Jam CLI - Key generation and password utilities."""
+    pass
+
+
+cli.add_command(keys.keys)
+cli.add_command(password.password)

jamlib-3.1.0/src/jam/cli/commands/__init__.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from . import keys, password
+
+__all__ = ["keys", "password"]

jamlib-3.1.0/src/jam/cli/commands/keys.py

@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+
+import click
+
+from jam.utils import (
+    generate_aes_key,
+    generate_ecdsa_p384_keypair,
+    generate_ed25519_keypair,
+    generate_rsa_key_pair,
+    generate_symmetric_key,
+)
+
+
+@click.group()
+def keys() -> None:
+    """Generate cryptographic keys."""
+    pass
+
+
+@keys.command()
+@click.option(
+    "--public-out", "-p", default="public.pem", help="Public key output file"
+)
+@click.option(
+    "--private-out", "-o", default="private.pem", help="Private key output file"
+)
+def rsa(public_out: str, private_out: str) -> None:
+    """Generate RSA key pair."""
+    key_pair = generate_rsa_key_pair()
+
+    with open(private_out, "w") as f:
+        f.write(key_pair["private"])
+    with open(public_out, "w") as f:
+        f.write(key_pair["public"])
+
+    click.echo(f"RSA key pair generated: {private_out}, {public_out}")
+
+
+@keys.command()
+@click.option(
+    "--public-out", "-p", default="public.pem", help="Public key output file"
+)
+@click.option(
+    "--private-out", "-o", default="private.pem", help="Private key output file"
+)
+def ed25519(public_out: str, private_out: str) -> None:
+    """Generate Ed25519 key pair."""
+    key_pair = generate_ed25519_keypair()
+
+    with open(private_out, "w") as f:
+        f.write(key_pair["private"])
+    with open(public_out, "w") as f:
+        f.write(key_pair["public"])
+
+    click.echo(f"Ed25519 key pair generated: {private_out}, {public_out}")
+
+
+@keys.command()
+@click.option(
+    "--public-out", "-p", default="public.pem", help="Public key output file"
+)
+@click.option(
+    "--private-out", "-o", default="private.pem", help="Private key output file"
+)
+def ecdsa(public_out: str, private_out: str) -> None:
+    """Generate ECDSA P-384 key pair."""
+    key_pair = generate_ecdsa_p384_keypair()
+
+    with open(private_out, "w") as f:
+        f.write(key_pair["private"])
+    with open(public_out, "w") as f:
+        f.write(key_pair["public"])
+
+    click.echo(f"ECDSA P-384 key pair generated: {private_out}, {public_out}")
+
+
+@keys.command()
+@click.option("--out", "-o", default="aes.key", help="AES key output file")
+def aes(out: str) -> None:
+    """Generate AES key."""
+    key = generate_aes_key()
+
+    with open(out, "wb") as f:
+        f.write(key)
+
+    click.echo(f"AES key generated: {out}")
+
+
+@keys.command()
+@click.option(
+    "--out", "-o", default="symmetric.key", help="Symmetric key output file"
+)
+@click.option(
+    "--bytes", "-b", default=32, help="Key size in bytes (default: 32)"
+)
+def symmetric(out: str, bytes: int) -> None:
+    """Generate symmetric key."""
+    key = generate_symmetric_key(bytes)
+
+    with open(out, "w") as f:
+        f.write(key)
+
+    click.echo(f"Symmetric key generated: {out} ({bytes} bytes)")

jamlib-3.1.0/src/jam/cli/commands/password.py

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+
+import click
+
+from jam.utils import (
+    check_password,
+    deserialize_hash,
+    hash_password,
+    serialize_hash,
+)
+
+
+@click.group()
+def password() -> None:
+    """Password hashing and verification utilities."""
+    pass
+
+
+@password.command()
+@click.argument("password")
+@click.option("--out", "-o", default=None, help="Output file (default: stdout)")
+def hash(password: str, out: str | None) -> None:
+    """Hash a password."""
+    salt, hash_hex = hash_password(password)
+    serialized = serialize_hash(salt, hash_hex)
+
+    if out:
+        with open(out, "w") as f:
+            f.write(serialized)
+        click.echo(f"Password hash written to: {out}")
+    else:
+        click.echo(serialized)
+
+
+@password.command()
+@click.option(
+    "--hash",
+    "-h",
+    required=True,
+    help="Hash to verify against (format: salt$hash)",
+)
+def verify(hash: str) -> None:
+    """Verify a password against a hash."""
+    salt_hex, hash_hex = deserialize_hash(hash)
+
+    password = click.prompt("Password", hide_input=True)
+
+    result = check_password(password, salt_hex, hash_hex)
+    if result:
+        click.echo("✓ Password matches")
+    else:
+        click.echo("✗ Password does not match")
+        raise click.Abort()

{jamlib-3.0.0rc2 → jamlib-3.1.0}/src/jam/ext/litestar/middleware.py

@@ -21,11 +21,15 @@ class BaseMiddleware(AbstractAuthenticationMiddleware):
     AUTH_MODULE: Callable
     HEADER_NAME: str | None
     COOKIE_NAME: str | None
+    BEARER: bool = False
     USER: type[BaseUser]
 
     def _get_auth_token(self, connection: ASGIConnection) -> str | None:
         if self.HEADER_NAME:
             token = connection.headers.get(self.HEADER_NAME, None)
+            if self.BEARER and token:
+                token = token.split(" ")[1]
+            return token
         elif self.COOKIE_NAME:
             token = connection.cookies.get(self.COOKIE_NAME, None)
         else:

{jamlib-3.0.0rc2 → jamlib-3.1.0}/src/jam/ext/litestar/plugins.py

@@ -39,6 +39,7 @@ class BasePlugin(InitPlugin):
         pointer: str = GENERIC_POINTER,
         cookie_name: str | None = None,
         header_name: str | None = None,
+        bearer: bool = False,
         middleware: bool = True,
         user: type[BaseUser] | None = None,
         **kwargs,
@@ -50,6 +51,7 @@ class BasePlugin(InitPlugin):
             pointer (str): Config pointer
             cookie_name (str | None): Cookie name to read token
             header_name (str | None): Header name to read token
+            bearer (bool): Use bearer prefix for token (e.g. "Bearer ")
             middleware (bool): Use middleware?
             user (type[BaseUser]): User for request state. See: DOCUMENTATION
             **kwargs: Config arguments if config=None
@@ -84,6 +86,7 @@ class BasePlugin(InitPlugin):
             _middleware.HEADER_NAME = header_name
             _middleware.AUTH_MODULE = self._auth
             _middleware.USER = user  # type: ignore
+            _middleware.BEARER = bearer
             self._middleware = _middleware
 
     def on_app_init(self, app_config: AppConfig) -> AppConfig:  # noqa
@@ -111,6 +114,7 @@ class JWTPlugin(BasePlugin):
         cookie_name: str | None = None,
         header_name: str | None = None,
         middleware: bool = True,
+        bearer: bool = False,
         use_list: bool = False,
         user: type[BaseUser] | None = None,
         **kwargs,
@@ -123,6 +127,7 @@ class JWTPlugin(BasePlugin):
             cookie_name (str | None): Cookie name to read token
             header_name (str | None): Header name to read token
             middleware (bool): Use middleware?
+            bearer (bool): Use bearer prefix for token (e.g. "Bearer ")
             use_list (bool): Use token list for authentication?
             user (type[BaseUser]): User for request state. See: DOCUMENTATION
             **kwargs: Config arguments if config=None
@@ -133,6 +138,7 @@ class JWTPlugin(BasePlugin):
             cookie_name=cookie_name,
             header_name=header_name,
             middleware=middleware,
+            bearer=bearer,
             user=user,
             **kwargs,
         )

{jamlib-3.0.0rc2 → jamlib-3.1.0}/src/jam/ext/starlette/backends.py

@@ -31,6 +31,7 @@ class BaseBackend(AuthenticationBackend):
         pointer: str = GENERIC_POINTER,
         cookie_name: str | None = None,
         header_name: str | None = None,
+        bearer: bool = False,
         user: type[BaseUser] = SimpleUser,
         **kwargs,
     ) -> None:
@@ -44,6 +45,7 @@ class BaseBackend(AuthenticationBackend):
             )
         self._cookie_name = cookie_name
         self._header_name = header_name
+        self._bearer = bearer
         self._user = user
         self._config_setup(config, pointer, kwargs)
 
@@ -53,7 +55,11 @@ class BaseBackend(AuthenticationBackend):
         elif self._header_name:
             token_bear = connection.headers.get(self._header_name, None)
             if token_bear:
-                token = token_bear.split("Bearer ")[1]  # noqa: E701
+                token = (
+                    token_bear.split("Bearer ")[1]
+                    if self._bearer
+                    else token_bear
+                )  # noqa: E701
             else:
                 token = None  # noqa: E701
         else:

{jamlib-3.0.0rc2 → jamlib-3.1.0}/src/jam/jwt/lists/__base__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from abc import ABC, abstractmethod
-from typing import Any, Literal
+from typing import Literal
 
 
 class BaseJWTList(ABC):
@@ -12,16 +12,16 @@ class BaseJWTList(ABC):
         self.__list_type__ = list_type
 
     @abstractmethod
-    def add(self, token: str) -> Any:
+    def add(self, token: str) -> None:
         """Method for adding token to list."""
         raise NotImplementedError
 
     @abstractmethod
-    def check(self, token: str) -> Any:
+    def check(self, token: str) -> bool:
         """Method for checking if a token is present in the list."""
         raise NotImplementedError
 
     @abstractmethod
-    def delete(self, token: str) -> Any:
+    def delete(self, token: str) -> None:
         """Method for removing a token from a list."""
         raise NotImplementedError

{jamlib-3.0.0rc2 → jamlib-3.1.0/src/jamlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jamlib
-Version: 3.0.0rc2
+Version: 3.1.0
 Summary: Simple and universal library for authorization.
 Author-email: Makridenko Adrian <adrianmakridenko@duck.com>, Ksenia Travnikova <kseniatravnikova@duck.com>
 License: Apache-2.0
@@ -16,7 +16,6 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -32,20 +31,22 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: cryptography>=46.0.5
+Provides-Extra: cli
+Requires-Dist: click>=8.3.1; extra == "cli"
 Provides-Extra: redis
-Requires-Dist: redis>=6.4.0; extra == "redis"
+Requires-Dist: redis>=7.3.0; extra == "redis"
 Provides-Extra: json
 Requires-Dist: tinydb>=4.8.2; extra == "json"
 Provides-Extra: yaml
-Requires-Dist: pyyaml>=6.0.2; extra == "yaml"
+Requires-Dist: pyyaml>=6.0.3; extra == "yaml"
 Provides-Extra: toml
 Requires-Dist: toml>=0.10.2; extra == "toml"
 Provides-Extra: litestar
-Requires-Dist: litestar>=2.18.0; extra == "litestar"
+Requires-Dist: litestar>=2.21.1; extra == "litestar"
 Provides-Extra: starlette
-Requires-Dist: starlette>=0.48.0; extra == "starlette"
+Requires-Dist: starlette>=0.52.1; extra == "starlette"
 Provides-Extra: fastapi
-Requires-Dist: fastapi>=0.119.0; extra == "fastapi"
+Requires-Dist: fastapi>=0.135.1; extra == "fastapi"
 Provides-Extra: flask
 Requires-Dist: flask>=3.1.2; extra == "flask"
 Dynamic: license-file

{jamlib-3.0.0rc2 → jamlib-3.1.0}/src/jamlib.egg-info/SOURCES.txt

@@ -25,6 +25,11 @@ src/jam/aio/sessions/__base__.py
 src/jam/aio/sessions/__init__.py
 src/jam/aio/sessions/json.py
 src/jam/aio/sessions/redis.py
+src/jam/cli/__init__.py
+src/jam/cli/cli.py
+src/jam/cli/commands/__init__.py
+src/jam/cli/commands/keys.py
+src/jam/cli/commands/password.py
 src/jam/exceptions/__init__.py
 src/jam/exceptions/base.py
 src/jam/exceptions/jwt.py
@@ -95,5 +100,6 @@ src/jam/utils/xor.py
 src/jamlib.egg-info/PKG-INFO
 src/jamlib.egg-info/SOURCES.txt
 src/jamlib.egg-info/dependency_links.txt
+src/jamlib.egg-info/entry_points.txt
 src/jamlib.egg-info/requires.txt
 src/jamlib.egg-info/top_level.txt

jamlib-3.1.0/src/jamlib.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+jam = jam.cli:cli

{jamlib-3.0.0rc2 → jamlib-3.1.0}/src/jamlib.egg-info/requires.txt

@@ -1,7 +1,10 @@
 cryptography>=46.0.5
 
+[cli]
+click>=8.3.1
+
 [fastapi]
-fastapi>=0.119.0
+fastapi>=0.135.1
 
 [flask]
 flask>=3.1.2
@@ -10,16 +13,16 @@ flask>=3.1.2
 tinydb>=4.8.2
 
 [litestar]
-litestar>=2.18.0
+litestar>=2.21.1
 
 [redis]
-redis>=6.4.0
+redis>=7.3.0
 
 [starlette]
-starlette>=0.48.0
+starlette>=0.52.1
 
 [toml]
 toml>=0.10.2
 
 [yaml]
-pyyaml>=6.0.2
+pyyaml>=6.0.3