From e1cd35bd3f01934e52fbecbaafebca14012cfe0b Mon Sep 17 00:00:00 2001 From: serversidehannes Date: Wed, 10 Jun 2026 22:28:32 +0200 Subject: [PATCH] chore: replace deprecated setex, deduplicate internal_keys, delete dead robustMax, harden BaseException check --- dashboard-frontend/src/lib/format.ts | 8 -------- s3proxy/dashboard/auth.py | 2 +- s3proxy/handlers/base.py | 9 +++++++++ s3proxy/handlers/multipart/upload_part.py | 2 +- s3proxy/handlers/objects/get.py | 7 +------ s3proxy/handlers/objects/misc.py | 14 ++------------ 6 files changed, 14 insertions(+), 28 deletions(-) diff --git a/dashboard-frontend/src/lib/format.ts b/dashboard-frontend/src/lib/format.ts index 2e807f6..3e2097d 100644 --- a/dashboard-frontend/src/lib/format.ts +++ b/dashboard-frontend/src/lib/format.ts @@ -75,11 +75,3 @@ export function formatIsoShort(iso?: string): string { } } -// Robust Y max: scale to p98 so a single early spike doesn't squash the series -// flat. Matches the previous chart's behaviour. -export function robustMax(vals: number[]): number { - const sorted = vals.slice().sort((a, b) => a - b); - const p98 = sorted[Math.min(sorted.length - 1, Math.floor(sorted.length * 0.98))] || 0; - const rawMax = Math.max(...vals, 1); - return Math.max(1, p98 > 0 ? p98 : rawMax); -} diff --git a/s3proxy/dashboard/auth.py b/s3proxy/dashboard/auth.py index e73a872..340b805 100644 --- a/s3proxy/dashboard/auth.py +++ b/s3proxy/dashboard/auth.py @@ -27,7 +27,7 @@ def __init__(self, redis) -> None: async def create(self, username: str, ttl: int = SESSION_TTL_SECONDS) -> str: token = secrets.token_hex(32) - await self._redis.setex(f"{self._PREFIX}{token}", ttl, username.encode()) + await self._redis.set(f"{self._PREFIX}{token}", username.encode(), ex=ttl) return token async def get(self, token: str) -> str | None: diff --git a/s3proxy/handlers/base.py b/s3proxy/handlers/base.py index 07d7ce6..f57a109 100644 --- a/s3proxy/handlers/base.py +++ b/s3proxy/handlers/base.py @@ -95,6 +95,15 @@ def _raise_bucket_error(self, e: ClientError, bucket: str) -> NoReturn: """Raise appropriate S3Error for bucket operations. Always raises.""" raise_for_client_error(e, bucket) + def _internal_meta_keys(self) -> set[str]: + """Metadata keys owned by s3proxy that must never leak to clients.""" + return { + self.settings.dektag_name.lower(), + self.settings.kidtag_name.lower(), + "client-etag", + "plaintext-size", + } + def _parse_range(self, header: str, size: int) -> tuple[int, int]: if not header.startswith("bytes="): raise S3Error.invalid_range("Invalid range header format") diff --git a/s3proxy/handlers/multipart/upload_part.py b/s3proxy/handlers/multipart/upload_part.py index e8c758a..cbbe1c9 100644 --- a/s3proxy/handlers/multipart/upload_part.py +++ b/s3proxy/handlers/multipart/upload_part.py @@ -418,7 +418,7 @@ def _check_upload_results( part_num: int, ) -> None: for result in results: - if isinstance(result, Exception): + if isinstance(result, BaseException): exc_name = type(result).__name__ is_no_such_upload = False diff --git a/s3proxy/handlers/objects/get.py b/s3proxy/handlers/objects/get.py index b8b5030..6ff72bb 100644 --- a/s3proxy/handlers/objects/get.py +++ b/s3proxy/handlers/objects/get.py @@ -75,12 +75,7 @@ async def handle_get_object(self, request: Request, creds: S3Credentials) -> Res response.headers["ETag"] = f'"{effective_etag}"' # Add user metadata (x-amz-meta-*), excluding internal keys - internal_keys = { - self.settings.dektag_name.lower(), - self.settings.kidtag_name.lower(), - "client-etag", - "plaintext-size", - } + internal_keys = self._internal_meta_keys() for k, v in metadata.items(): if k.lower() not in internal_keys: response.headers[f"x-amz-meta-{k}"] = v diff --git a/s3proxy/handlers/objects/misc.py b/s3proxy/handlers/objects/misc.py index 15a4950..7f301ec 100644 --- a/s3proxy/handlers/objects/misc.py +++ b/s3proxy/handlers/objects/misc.py @@ -98,12 +98,7 @@ def _build_head_extra_headers(self, resp: dict, last_modified: str | None) -> di extra["x-amz-tagging-count"] = str(resp["TagCount"]) # Include user metadata (x-amz-meta-*) excluding internal s3proxy keys metadata = resp.get("Metadata", {}) - internal_keys = { - self.settings.dektag_name.lower(), - self.settings.kidtag_name.lower(), - "client-etag", - "plaintext-size", - } + internal_keys = self._internal_meta_keys() for key, value in metadata.items(): if key.lower() not in internal_keys: extra[f"x-amz-meta-{key}"] = value @@ -318,12 +313,7 @@ async def _copy_encrypted( else: # Copy user metadata from source (excluding our internal keys) src_metadata = head_resp.get("Metadata", {}) - internal_keys = { - self.settings.dektag_name.lower(), - self.settings.kidtag_name.lower(), - "client-etag", - "plaintext-size", - } + internal_keys = self._internal_meta_keys() for meta_key, meta_value in src_metadata.items(): if meta_key.lower() not in internal_keys: dest_metadata[meta_key] = meta_value