fix(proxy): restore 5 items dropped by bad rebase in #12724 - #13063
Merged
Conversation
The rebase on #12724 (single http_proxy consolidation) incorrectly dropped changes from master that the proxy refactor had no relation to: - conf/openlibrary.yml: restore otp_seed dev seed (needed by OTP auth) - conf/openlibrary.yml: restore sentry.frontend DSN block (Sentry JS) - conf/openlibrary.yml: restore profiles_sample_rate: 0.05 (was 0.001) - conf/openlibrary.yml: restore author_exclusions: [] (404 exclusions) - requirements.txt: restore cryptography==44.0.2 (Fernet cookie encrypt) The cryptography omission is the most critical: accounts/model.py imports Fernet at runtime for S3 key cookie encryption, so its absence causes ModuleNotFoundError on any code path touching S3 auth cookies. Verified: docker compose run --rm home python -m pytest \ openlibrary/tests/core/test_processors.py -x -v # 9 passed docker compose run --rm home python -c \ "from cryptography.fernet import Fernet; print('OK')" # cryptography OK Closes #12724 regression
Collaborator
Author
|
Thank you for opening this PR! 🤖 Copilot has been assigned for an initial review. A reviewer must first be assigned. There are no open PRs of equal or higher priority ahead of this one. PR triage checklist (maintainers / Richy)
Note This comment was automatically generated by PAM, Open Library's Project AI Manager. PAM provides status visibility, performs basic project management functions, and gives actionable feedback so contributors aren't left waiting. |
Member
|
These changes all LGTM cc: @cdrini; I have reviewed and tested and also spun up a second reviewer to verify the results didn't miss anything. |
This was referenced Jun 30, 2026
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.
Summary
PR #12724 (single
http_proxyconsolidation) contained a bad rebase that accidentally dropped 5 items frommasterthat had nothing to do with the proxy refactor. This PR surgically restores them.Triggered by @mekarpeles
What regressed
conf/openlibrary.ymlotp_seed: dev-otp-seed-for-e2e-testingconf/openlibrary.ymlsentry.frontendDSN blockconf/openlibrary.ymlprofiles_sample_rate: 0.05(changed to 0.001)conf/openlibrary.ymlauthor_exclusions: []requirements.txtcryptography==44.0.2ModuleNotFoundErroron any S3 auth cookie pathThe
cryptographyomission is the most critical:openlibrary/accounts/model.pyimportsfrom cryptography.fernet import Fernetat runtime for S3-key cookie encryption (added in #12856). Its absence causes a hardModuleNotFoundErroron any code path that touches S3 auth cookies.How to confirm the regression exists on current master:
What this PR does
Restores exactly those 5 items — nothing else. The proxy changes from #12724 (vendors.py, affiliate_server.py, http_proxy config comment, python-amazon-paapi fork pin) are preserved.
The net diff against the pre-merge commit (
7c92384d3) shows only the two intentional changes from #12724: thehttp_proxycomment block and thepython-amazon-paapifork pin. All 5 regressions are fully restored.Verification
Related
cryptographywas first required by feat: store S3 keys as encrypted session cookie instead of in account store #12856 (S3 encrypted session cookie)author_exclusionswas added by fix(processors): remove booklending_utils startup dependency; use config-driven author_exclusions #13024sentry.frontendwas added by Add sentry frontend performance tracking to see user-time performance #13033