updated tests

Author: daniel-sanche

google/auth/crypt/rsa.py

@@ -100,7 +100,7 @@ def __init__(self, private_key, key_id=None):
         if module_str.startswith(RSA_KEY_MODULE_PREFIX):
             impl_lib = _python_rsa
         elif module_str.startswith(CRYPTOGRAPHY_KEY_MODULE_PREFIX):
-            impl_lib = _cryptography_rs
+            impl_lib = _cryptography_rsa
         else:
             raise ValueError(f"unrecognized private key type: {private_key}")
         self._impl = impl_lib.RSASigner(private_key, key_id=key_id)

tests/crypt/test_rsa.py

@@ -20,7 +20,6 @@
 import pytest
 import rsa as rsa_lib
 
-from google.auth import exceptions
 from google.auth.crypt import _cryptography_rsa
 from google.auth.crypt import _python_rsa
 from google.auth.crypt import rsa
@@ -64,17 +63,6 @@ def test_init_with_unknown_key(self):
         with pytest.raises(ValueError):
             rsa.RSAVerifier(unknown_key)
 
-    @mock.patch("google.auth.crypt.rsa._cryptography_rsa", None)
-    @mock.patch("google.auth.crypt.rsa._python_rsa", None)
-    def test_init_with_missing_dependencies(self):
-        with pytest.raises(exceptions.MissingOptionalDependencyError) as e:
-            rsa.RSAVerifier(RSA_PUBLIC_KEY)
-        assert "RSAVerifier requires `cryptography`" in str(e)
-        assert (
-            "`rsa` is also supported for legacy compatibility, but is deprecated"
-            in str(e)
-        )
-
     def test_verify_delegates(self):
         verifier = rsa.RSAVerifier(CRYPTOGRAPHY_PUBLIC_KEY)
 
@@ -87,7 +75,6 @@ def test_verify_delegates(self):
             mock_verify.assert_called_once_with(b"message", b"signature")
 
     @mock.patch("google.auth.crypt.rsa._cryptography_rsa")
-    @mock.patch("google.auth.crypt.rsa._python_rsa", None)
     def test_from_string_cryptography(self, mock_crypto):
         expected_verifier = mock.Mock()
         mock_crypto.RSAVerifier.from_string.return_value = expected_verifier
@@ -97,30 +84,6 @@ def test_from_string_cryptography(self, mock_crypto):
         assert result == expected_verifier
         mock_crypto.RSAVerifier.from_string.assert_called_once_with(PUBLIC_KEY_BYTES)
 
-    @mock.patch("google.auth.crypt.rsa._cryptography_rsa", None)
-    @mock.patch("google.auth.crypt.rsa._python_rsa")
-    def test_from_string_python_rsa(self, mock_python_rsa):
-        expected_verifier = mock.Mock()
-        mock_python_rsa.RSAVerifier.from_string.return_value = expected_verifier
-
-        result = rsa.RSAVerifier.from_string(PUBLIC_KEY_BYTES)
-
-        assert result == expected_verifier
-        mock_python_rsa.RSAVerifier.from_string.assert_called_once_with(
-            PUBLIC_KEY_BYTES
-        )
-
-    @mock.patch("google.auth.crypt.rsa._cryptography_rsa", None)
-    @mock.patch("google.auth.crypt.rsa._python_rsa", None)
-    def test_from_string_missing_deps(self):
-        with pytest.raises(exceptions.MissingOptionalDependencyError) as e:
-            rsa.RSAVerifier.from_string(PUBLIC_KEY_BYTES)
-        assert "RSAVerifier requires `cryptography`" in str(e)
-        assert (
-            "`rsa` is also supported for legacy compatibility, but is deprecated"
-            in str(e)
-        )
-
 
 class TestRSASigner:
     def test_init_with_cryptography_key(self):
@@ -145,17 +108,6 @@ def test_init_with_unknown_key(self):
         with pytest.raises(ValueError):
             rsa.RSASigner(unknown_key)
 
-    @mock.patch("google.auth.crypt.rsa._cryptography_rsa", None)
-    @mock.patch("google.auth.crypt.rsa._python_rsa", None)
-    def test_init_with_missing_dependencies(self):
-        with pytest.raises(exceptions.MissingOptionalDependencyError) as e:
-            rsa.RSASigner(RSA_PRIVATE_KEY)
-        assert "RSASigner requires `cryptography`" in str(e)
-        assert (
-            "`rsa` is also supported for legacy compatibility, but is deprecated"
-            in str(e)
-        )
-
     def test_sign_delegates(self):
         signer = rsa.RSASigner(RSA_PRIVATE_KEY)
 
@@ -167,7 +119,6 @@ def test_sign_delegates(self):
             mock_sign.assert_called_once_with(b"message")
 
     @mock.patch("google.auth.crypt.rsa._cryptography_rsa")
-    @mock.patch("google.auth.crypt.rsa._python_rsa", None)
     def test_from_string_delegates_to_cryptography(self, mock_crypto):
         expected_signer = mock.Mock()
         mock_crypto.RSASigner.from_string.return_value = expected_signer
@@ -179,31 +130,6 @@ def test_from_string_delegates_to_cryptography(self, mock_crypto):
             PRIVATE_KEY_BYTES, key_id="123"
         )
 
-    @mock.patch("google.auth.crypt.rsa._cryptography_rsa", None)
-    @mock.patch("google.auth.crypt.rsa._python_rsa")
-    def test_from_string_delegates_to_python_rsa(self, mock_python_rsa):
-        expected_signer = mock.Mock()
-        mock_python_rsa.RSASigner.from_string.return_value = expected_signer
-
-        result = rsa.RSASigner.from_string(PRIVATE_KEY_BYTES, key_id="123")
-
-        assert result == expected_signer
-        mock_python_rsa.RSASigner.from_string.assert_called_once_with(
-            PRIVATE_KEY_BYTES, key_id="123"
-        )
-
-    @mock.patch("google.auth.crypt.rsa._cryptography_rsa", None)
-    @mock.patch("google.auth.crypt.rsa._python_rsa", None)
-    def test_from_string_missing_deps(self):
-        with pytest.raises(exceptions.MissingOptionalDependencyError) as e:
-            rsa.RSASigner.from_string(PRIVATE_KEY_BYTES)
-        assert "RSASigner requires `cryptography`" in str(e)
-        assert (
-            "`rsa` is also supported for legacy compatibility, but is deprecated"
-            in str(e)
-        )
-
-    @mock.patch("google.auth.crypt.rsa._python_rsa", None)
     def test_end_to_end_cryptography_lib(self):
         signer = rsa.RSASigner.from_string(PRIVATE_KEY_BYTES)
         message = b"Hello World"
@@ -214,13 +140,12 @@ def test_end_to_end_cryptography_lib(self):
         assert isinstance(verifier, _cryptography_rsa.RSAVerifier)
         assert isinstance(signer, _cryptography_rsa.RSASigner)
 
-    @mock.patch("google.auth.crypt.rsa._cryptography_rsa", None)
     def test_end_to_end_rsa_lib(self):
-        signer = rsa.RSASigner.from_string(PRIVATE_KEY_BYTES)
+        signer = rsa.RSASigner(RSA_PRIVATE_KEY)
         message = b"Hello World"
         sig = signer.sign(message)
-        verifier = rsa.RSAVerifier.from_string(PUBLIC_KEY_BYTES)
+        verifier = rsa.RSAVerifier(RSA_PUBLIC_KEY)
         result = verifier.verify(message, sig)
         assert bool(result) is True
-        assert isinstance(verifier, _python_rsa.RSAVerifier)
-        assert isinstance(signer, _python_rsa.RSASigner)
+        assert isinstance(verifier._impl, _python_rsa.RSAVerifier)
+        assert isinstance(signer._impl, _python_rsa.RSASigner)