Refactor: Remove rsa and make cryptography a core dependency #1771
Conversation
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
This commit removes the `rsa` library as a dependency and makes the `cryptography` library a required, core dependency. Previously, `cryptography` was an optional dependency, and the library would fall back to a pure Python RSA implementation using the `rsa` library if `cryptography` was not installed. Changes made: - Modified `setup.py` to remove `rsa` from dependencies and add `cryptography` with version constraints. - Updated `google/auth/crypt/rsa.py` to directly use the `cryptography`-based RSA implementation (`_cryptography_rsa.py`) and remove the fallback mechanism. - Removed the pure Python RSA implementation file (`google/auth/crypt/_python_rsa.py`). - Removed the corresponding tests for the pure Python RSA implementation (`tests/crypt/test__python_rsa.py`). Core unit tests pass after these changes.
sai-sunder-s
added
the
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
sai-sunder-s
added
the
owlbot:run
gcf-owl-bot
bot
removed
the
owlbot:run
parthea
reviewed
May 30, 2025
|
|
||
| def autodoc_skip_member_handler(app, what, name, obj, skip, options): | ||
| """ | ||
| Skips members from internal modules (like _cryptography_rsa or base) |
There was a problem hiding this comment.
Please could you file a bug for issue that requires this docs workaround, even if it will be closed with the changes in this PR. Add a link to the issue in this comment.
| if public_obj is obj: | ||
| return True # Skip this internal one | ||
| except ImportError: | ||
| pass # Should not happen if the library is installed |
There was a problem hiding this comment.
If this is not expected to happen, can we just let the error bubble up?
| pass # Should not happen if the library is installed | ||
|
|
||
| # Handle Signer and Verifier from base | ||
| elif name in ("Signer", "Verifier") and hasattr(obj, "__module__"): |
There was a problem hiding this comment.
This code under this block is similar to the above if statement. Is it possible to refactor it?
Comment on lines
25
to
26
| # rsa==4.5 is the last version to support 2.7 | ||
| # https://github.com/sybrenstuvel/python-rsa/issues/152#issuecomment-643470233 |
There was a problem hiding this comment.
Suggested change
| # rsa==4.5 is the last version to support 2.7 | |
| # https://github.com/sybrenstuvel/python-rsa/issues/152#issuecomment-643470233 |
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.
This commit removes the
rsalibrary as a dependency and makes thecryptographylibrary a required, core dependency.Previously,
cryptographywas an optional dependency, and the library would fall back to a pure Python RSA implementation using thersalibrary ifcryptographywas not installed.Changes made:
setup.pyto removersafrom dependencies and addcryptographywith version constraints.google/auth/crypt/rsa.pyto directly use thecryptography-based RSA implementation (_cryptography_rsa.py) and remove the fallback mechanism.google/auth/crypt/_python_rsa.py).tests/crypt/test__python_rsa.py).Core unit tests pass after these changes.