Skip to content

fix: properly set token_expiry_is_time_of_expiration and mask access token when logging #637

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Jul 7, 2025
Merged

fix: properly set token_expiry_is_time_of_expiration and mask access token when logging #637

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0764b63
set token_expiry_is_time_of_expiration in DeclarativeSingleUseRefresh…
lmossman Jul 3, 2025
4e6b9f2
mask access token when logging OAuth token refresh response
lmossman Jul 3, 2025
b1d5d05
properly handle case where no access key can be found in response
lmossman Jul 3, 2025
bf1eaf2
properly handle json exception
lmossman Jul 3, 2025
10a27b1
initialize response_json and json_exception to None at start
lmossman Jul 3, 2025
ab062f8
refactor _make_handled_request to be simpler
lmossman Jul 3, 2025
b24db1b
handle max recursion error
lmossman Jul 3, 2025
503dac6
ruff format
lmossman Jul 3, 2025
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
1 change: 1 addition & 0 deletions airbyte_cdk/sources/declarative/parsers/model_to_component_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2801,6 +2801,7 @@ def create_oauth_authenticator(
).eval(config),
scopes=model.scopes,
token_expiry_date_format=model.token_expiry_date_format,
token_expiry_is_time_of_expiration=bool(model.token_expiry_date_format),
message_repository=self._message_repository,
refresh_token_error_status_codes=model.refresh_token_updater.refresh_token_error_status_codes,
refresh_token_error_key=model.refresh_token_updater.refresh_token_error_key,
Expand Down
7 changes: 6 additions & 1 deletion airbyte_cdk/sources/streams/http/requests_native_auth/abstract_oauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,15 @@ def _make_handled_request(self) -> Any:
data=self.build_refresh_request_body(),
headers=self.build_refresh_request_headers(),
)
response_json = response.json()
# extract the access token and add to secrets to avoid logging the raw value
access_key = self._extract_access_token(response_json)
if access_key:
add_to_secrets(access_key)
# log the response even if the request failed for troubleshooting purposes
self._log_response(response)
response.raise_for_status()
return response.json()
return response_json
except requests.exceptions.RequestException as e:
if e.response is not None:
if e.response.status_code == 429 or e.response.status_code >= 500:
Expand Down
Loading