fix(usage): check dynamic env and add errors=replace in _token_spy_api_key in usage.py - #2826
Open
vaibhavsrv wants to merge 2 commits into
Open
fix(usage): check dynamic env and add errors=replace in _token_spy_api_key in usage.py#2826vaibhavsrv wants to merge 2 commits into
vaibhavsrv wants to merge 2 commits into
Conversation
…i_key in usage.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
In
ods/extensions/services/dashboard-api/routers/usage.py,_token_spy_api_key()checks module-levelTOKEN_SPY_API_KEY, which is evaluated once at import time. IfTOKEN_SPY_API_KEYis updated dynamically inos.environpost-import,_token_spy_api_key()returned stale key values. Additionally, readingTOKEN_SPY_KEY_FILEusedread_text(encoding="utf-8")withouterrors="replace"or catchingValueError, causing uncaught decode crashes if key files contained non-standard byte sequences.Fix
Update
_token_spy_api_key()inusage.pyto evaluateos.environ.get("TOKEN_SPY_API_KEY")dynamically, passerrors="replace"toread_text(), and catch(OSError, UnicodeError, ValueError).Verification
Verified syntax with
python3 -m py_compile ods/extensions/services/dashboard-api/routers/usage.py.git diff --checkpassed cleanly.