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
8 changes: 0 additions & 8 deletions dashboard-frontend/src/lib/format.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion s3proxy/dashboard/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions s3proxy/handlers/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion s3proxy/handlers/multipart/upload_part.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 1 addition & 6 deletions s3proxy/handlers/objects/get.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 2 additions & 12 deletions s3proxy/handlers/objects/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down