Compare commits
10 Commits
9e46bdc460
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 135064fc10 | |||
| b141377b02 | |||
| a3a01eefe2 | |||
| 354e26295c | |||
| 30a447674d | |||
| 7a7d8f451e | |||
| 79e8baa609 | |||
| 8deaf6e599 | |||
| 7b595744e1 | |||
| 4877513bbf |
@@ -118,7 +118,7 @@ jobs:
|
|||||||
echo "CalVer tag: $VERSION"
|
echo "CalVer tag: $VERSION"
|
||||||
|
|
||||||
- name: Log in to Gitea Container Registry
|
- name: Log in to Gitea Container Registry
|
||||||
run: echo "${{ github.token }}" | docker login git.farh.net -u ${{ github.actor }} --password-stdin
|
run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login git.farh.net -u ${{ github.actor }} --password-stdin
|
||||||
|
|
||||||
- name: Extract metadata
|
- name: Extract metadata
|
||||||
id: meta
|
id: meta
|
||||||
@@ -140,8 +140,6 @@ jobs:
|
|||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
build-args: |
|
build-args: |
|
||||||
APT_CACHE_BUST=${{ github.run_id }}
|
APT_CACHE_BUST=${{ github.run_id }}
|
||||||
cache-from: type=gha
|
|
||||||
cache-to: type=gha,mode=max
|
|
||||||
|
|
||||||
- name: Scan api image for vulnerabilities
|
- name: Scan api image for vulnerabilities
|
||||||
uses: anchore/scan-action@v5
|
uses: anchore/scan-action@v5
|
||||||
@@ -162,13 +160,9 @@ jobs:
|
|||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./Dockerfile
|
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
build-args: |
|
|
||||||
APT_CACHE_BUST=${{ github.run_id }}
|
|
||||||
cache-from: type=gha
|
|
||||||
|
|
||||||
- name: Create git tag
|
- name: Create git tag
|
||||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||||
|
|||||||
@@ -35,12 +35,12 @@ class CacheClient:
|
|||||||
async def get(self, key: str) -> str | None:
|
async def get(self, key: str) -> str | None:
|
||||||
if not self._client:
|
if not self._client:
|
||||||
return None
|
return None
|
||||||
value = await self._client.get(key)
|
value: str | bytes | None = await self._client.get(key)
|
||||||
if value is None:
|
if value is None:
|
||||||
return None
|
return None
|
||||||
if isinstance(value, bytes):
|
if isinstance(value, bytes):
|
||||||
return value.decode("utf-8", errors="replace")
|
return value.decode("utf-8", errors="replace")
|
||||||
return value
|
return str(value)
|
||||||
|
|
||||||
async def set(self, key: str, value: str, ttl_seconds: int = 300) -> None:
|
async def set(self, key: str, value: str, ttl_seconds: int = 300) -> None:
|
||||||
if not self._client:
|
if not self._client:
|
||||||
|
|||||||
@@ -121,10 +121,6 @@ if settings.rate_limit_redis_enabled:
|
|||||||
logger.warning("Failed to connect to Redis for rate limiting, using in-memory: %s", e)
|
logger.warning("Failed to connect to Redis for rate limiting, using in-memory: %s", e)
|
||||||
_use_redis = False
|
_use_redis = False
|
||||||
|
|
||||||
_public_limiter: RateLimitBackend
|
|
||||||
_auth_limiter: RateLimitBackend
|
|
||||||
_auth_strict_limiter: RateLimitBackend
|
|
||||||
|
|
||||||
if _use_redis and _redis_client:
|
if _use_redis and _redis_client:
|
||||||
_public_limiter = RedisSlidingWindow(
|
_public_limiter = RedisSlidingWindow(
|
||||||
_redis_client, settings.rate_limit_requests, settings.rate_limit_window_seconds
|
_redis_client, settings.rate_limit_requests, settings.rate_limit_window_seconds
|
||||||
@@ -151,8 +147,8 @@ def _get_client_ip(request: Request) -> str:
|
|||||||
"""Extract client IP, respecting X-Forwarded-For behind a reverse proxy."""
|
"""Extract client IP, respecting X-Forwarded-For behind a reverse proxy."""
|
||||||
forwarded = request.headers.get("x-forwarded-for")
|
forwarded = request.headers.get("x-forwarded-for")
|
||||||
if forwarded:
|
if forwarded:
|
||||||
return forwarded.split(",")[0].strip()
|
return str(forwarded.split(",")[0].strip())
|
||||||
return request.client.host if request.client else "unknown"
|
return str(request.client.host) if request.client else "unknown"
|
||||||
|
|
||||||
|
|
||||||
def _get_rate_limit_key(request: Request) -> tuple[str, RateLimitBackend]:
|
def _get_rate_limit_key(request: Request) -> tuple[str, RateLimitBackend]:
|
||||||
|
|||||||
@@ -117,7 +117,6 @@ def _register_event_listeners():
|
|||||||
event.listen(cls, "before_insert", _set_timestamp_defaults)
|
event.listen(cls, "before_insert", _set_timestamp_defaults)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
TEST_JWT_SECRET = secrets.token_urlsafe(32)
|
TEST_JWT_SECRET = secrets.token_urlsafe(32)
|
||||||
TEST_SERVICE_KEY = secrets.token_urlsafe(32)
|
TEST_SERVICE_KEY = secrets.token_urlsafe(32)
|
||||||
TEST_FERNET_KEY = "7reF42nmTwbdN21PBoubGp7h_FU8qSimstmlaMLoRK8="
|
TEST_FERNET_KEY = "7reF42nmTwbdN21PBoubGp7h_FU8qSimstmlaMLoRK8="
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ def test_dispose_engine_importable_from_database():
|
|||||||
assert callable(dispose_engine)
|
assert callable(dispose_engine)
|
||||||
assert dispose_engine.__name__ == "dispose_engine"
|
assert dispose_engine.__name__ == "dispose_engine"
|
||||||
|
|
||||||
|
|
||||||
EXPECTED_ROUTES = [
|
EXPECTED_ROUTES = [
|
||||||
# Auth (3 — register/login/refresh are handled by Better-Auth service)
|
# Auth (3 — register/login/refresh are handled by Better-Auth service)
|
||||||
("get", "/auth/me"),
|
("get", "/auth/me"),
|
||||||
|
|||||||
Reference in New Issue
Block a user