scriptoriumadmin/strix
1
0
Fork 0
mirror of https://github.com/usestrix/strix.git synced 2026-10-07 02:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(login): bound device flow timing values and clean up unreplaced secret temp files

Browse source
This commit is contained in:
Alex Schapiro 2026-08-26 21:54:04 +00:00
parent ef722c2ee0
commit 44fb7ac969
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
strix/interface/platform_cli.py
View file

@ -31,6 +31,8 @@ AUTH_PATH = Path.home() / ".strix" / "platform-auth.json"
_HTTP_TIMEOUT_S = 30
_DEFAULT_POLL_INTERVAL_S = 5
_MAX_POLL_INTERVAL_S = 60
_MAX_EXPIRES_IN_S = 30 * 60
_LOGIN_USAGE = (
"Usage:\n strix login [--no-browser] [--scopes SCOPE ...] [--workspace WORKSPACE]\n"
@ -182,8 +184,14 @@ def _run_device_flow(
or ""
)
device_code = str(authorization.get("device_code") or "")
expires_in = _as_positive_int(authorization.get("expires_in"), default=300)
interval = _as_positive_int(authorization.get("interval"), default=_DEFAULT_POLL_INTERVAL_S)
expires_in = _as_positive_int(
authorization.get("expires_in"), default=300, maximum=_MAX_EXPIRES_IN_S
)
interval = _as_positive_int(
authorization.get("interval"),
default=_DEFAULT_POLL_INTERVAL_S,
maximum=_MAX_POLL_INTERVAL_S,
)
if not device_code or not verification_uri:
raise PlatformAuthError("the server returned an incomplete device authorization")
@ -420,12 +428,14 @@ def _json_object(response: requests.Response) -> dict[str, Any]:
return cast("dict[str, Any]", data)
def _as_positive_int(value: Any, *, default: int) -> int:
def _as_positive_int(value: Any, *, default: int, maximum: int) -> int:
try:
parsed = int(value)
except (TypeError, ValueError, OverflowError):
return default
return parsed if parsed > 0 else default
if parsed <= 0:
return default
return min(parsed, maximum)
def _error_detail(response: requests.Response) -> str:

7
strix/utils/secret_files.py
View file

@ -28,4 +28,9 @@ def write_secret_text(path: Path, text: str) -> None:
tmp.unlink()
raise
tmp.replace(path)
try:
tmp.replace(path)
except BaseException:
with contextlib.suppress(OSError):
tmp.unlink()
raise