-
Notifications
You must be signed in to change notification settings - Fork 33
Update http.py to mask "x-api-key" header #102
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
cpandya2909
wants to merge
1
commit into
google:main
Choose a base branch
from
cpandya2909:patch-1
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,7 +65,14 @@ def post( | |
| url = self._make_url(endpoint) | ||
| headers = self._make_headers(headers) | ||
|
|
||
| logging.debug("POST URL: %s, Headers:%s", url, headers) | ||
| # Headers have x-api-key, which is API key. So skip loggig it. | ||
| if "x-api-key" in headers: | ||
| masked_headers = headers.copy() | ||
| masked_headers["x-api-key"] = "***" | ||
| logging.debug("POST URL: %s, Headers:%s", url, masked_headers) | ||
| del masked_headers | ||
| else: | ||
| logging.debug("POST URL: %s, Headers:%s", url, headers) | ||
| logging.debug("Request: %s", model.model_dump_json()) | ||
| start_time = time() | ||
| response = self.client.post(url, headers=headers, json=data) | ||
|
|
@@ -100,7 +107,14 @@ def get( | |
| url = self._make_url(endpoint) | ||
| headers = self._make_headers(headers) | ||
|
|
||
| logging.debug("GET URL: %s, Headers:%s", url, headers) | ||
| # Headers have x-api-key, which is API key. So skip loggig it. | ||
| if "x-api-key" in headers: | ||
| masked_headers = headers.copy() | ||
| masked_headers["x-api-key"] = "***" | ||
| logging.debug("GET URL: %s, Headers:%s", url, masked_headers) | ||
| del masked_headers | ||
| else: | ||
| logging.debug("GET URL: %s, Headers:%s", url, headers) | ||
|
Comment on lines
+110
to
+117
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similar to the # Headers have x-api-key, which is an API key, so we mask it for logging.
headers_to_log = headers
if "x-api-key" in headers:
headers_to_log = headers.copy()
headers_to_log["x-api-key"] = "***"
logging.debug("GET URL: %s, Headers:%s", url, headers_to_log) |
||
| logging.debug("Request: %s", json.dumps(query_params)) | ||
|
|
||
| start_time = time() | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logic for masking the API key before logging is correct, but it can be made more concise and readable. The
if/elseblock contains a duplicatedlogging.debugcall. You can refactor this to determine which headers to log first, and then make a single logging call. This also removes the need fordel masked_headers, which is redundant as the variable would be garbage collected anyway. Additionally, there's a typo in the comment (loggig).