Add more tests and enable Python 3.5 and 3.6 in .travis.yml.

Author: Gasper Zejn

.travis.yml

@@ -5,6 +5,8 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
+  - "3.6"
   - "pypy-5.3.1"
 install:
   - pip install -U tox codecov tox-travis

tests/algorithms/test_EC.py

@@ -1,6 +1,6 @@
 
 from jose.constants import ALGORITHMS
-from jose.exceptions import JOSEError
+from jose.exceptions import JOSEError, JWKError
 
 from jose.backends.ecdsa_backend import ECDSAECKey
 from jose.backends.cryptography_backend import CryptographyECKey
@@ -40,3 +40,16 @@ def test_object(self):
 
         with pytest.raises(JOSEError):
             CryptographyECKey(key, ALGORITHMS.ES256)
+
+    def test_invalid_algorithm(self):
+        with pytest.raises(JWKError):
+            ECDSAECKey({'kty': 'bla'}, ALGORITHMS.ES256)
+
+    def test_verify(self):
+        key = ECDSAECKey(private_key, ALGORITHMS.ES256)
+        msg = b'test'
+        signature = key.sign(msg)
+        public_key = key.public_key()
+
+        assert public_key.verify(msg, signature) == True
+        assert public_key.verify(msg, b'not a signature') == False

tests/algorithms/test_RSA.py

@@ -4,7 +4,7 @@
 from jose.backends.pycrypto_backend import RSAKey
 from jose.backends.cryptography_backend import CryptographyRSAKey
 from jose.constants import ALGORITHMS
-from jose.exceptions import JOSEError
+from jose.exceptions import JOSEError, JWKError
 
 from Crypto.PublicKey import RSA
 
@@ -15,7 +15,7 @@
 if sys.version_info > (3,):
     long = int
 
-private_key = """-----BEGIN RSA PRIVATE KEY-----
+private_key = b"""-----BEGIN RSA PRIVATE KEY-----
 MIIJKwIBAAKCAgEAtSKfSeI0fukRIX38AHlKB1YPpX8PUYN2JdvfM+XjNmLfU1M7
 4N0VmdzIX95sneQGO9kC2xMIE+AIlt52Yf/KgBZggAlS9Y0Vx8DsSL2HvOjguAdX
 ir3vYLvAyyHin/mUisJOqccFKChHKjnk0uXy/38+1r17/cYTp76brKpU1I4kM20M
@@ -110,6 +110,13 @@ def test_RSA_key_instance(self):
         pem = pubkey.to_pem()
         assert pem.startswith(b'-----BEGIN PUBLIC KEY-----')
 
+    def test_invalid_algorithm(self):
+        with pytest.raises(JWKError):
+            CryptographyRSAKey(private_key, ALGORITHMS.ES256)
+
+        with pytest.raises(JWKError):
+            CryptographyRSAKey({'kty': 'bla'}, ALGORITHMS.RS256)
+
     def test_RSA_jwk(self):
         d = {
             "kty": "RSA",
@@ -133,14 +140,29 @@ def test_bad_cert(self):
         with pytest.raises(JOSEError):
             CryptographyRSAKey(key, ALGORITHMS.RS256)
 
+    def test_get_public_key(self):
+        key = CryptographyRSAKey(private_key, ALGORITHMS.RS256)
+        public_key = key.public_key()
+        public_key2 = public_key.public_key()
+        assert public_key == public_key2
+
+        key = RSAKey(private_key, ALGORITHMS.RS256)
+        public_key = key.public_key()
+        public_key2 = public_key.public_key()
+        assert public_key == public_key2
+
+    def test_to_pem(self):
+        key = CryptographyRSAKey(private_key, ALGORITHMS.RS256)
+        assert key.to_pem().strip() == private_key.strip()
+
+        key = RSAKey(private_key, ALGORITHMS.RS256)
+        assert key.to_pem().strip() == private_key.strip()
+
     def test_signing_parity(self):
         key1 = RSAKey(private_key, ALGORITHMS.RS256)
-        public_key = key1.public_key().to_pem()
-        vkey1 = RSAKey(public_key, ALGORITHMS.RS256)
+        vkey1 = key1.public_key()
         key2 = CryptographyRSAKey(private_key, ALGORITHMS.RS256)
-        vkey2 = CryptographyRSAKey(public_key, ALGORITHMS.RS256)
-
-        assert key2.public_key().to_pem() == public_key
+        vkey2 = key2.public_key()
 
         msg = b'test'
         sig1 = key1.sign(msg)
@@ -153,3 +175,13 @@ def test_signing_parity(self):
 
         # invalid signature
         assert not vkey2.verify(msg, b'n' * 64)
+
+    def test_pycrypto_invalid_signature(self):
+
+        key = RSAKey(private_key, ALGORITHMS.RS256)
+        msg = b'test'
+        signature = key.sign(msg)
+        public_key = key.public_key()
+
+        assert public_key.verify(msg, signature) == True
+        assert public_key.verify(msg, 1) == False

tests/algorithms/test_cryptography_EC.py

@@ -1,6 +1,6 @@
 
 from jose.constants import ALGORITHMS
-from jose.exceptions import JOSEError
+from jose.exceptions import JOSEError, JWKError
 from jose.backends.cryptography_backend import CryptographyECKey
 from jose.backends.ecdsa_backend import ECDSAECKey
 
@@ -24,6 +24,25 @@ def test_EC_key(self):
         public_pem = k.public_key().to_pem()
         public_key = CryptographyECKey(public_pem, ALGORITHMS.ES256)
 
+    def test_invalid_algorithm(self):
+        with pytest.raises(JWKError):
+            CryptographyECKey(private_key, 'nonexistent')
+
+        with pytest.raises(JWKError):
+            CryptographyECKey({'kty': 'bla'}, ALGORITHMS.ES256)
+
+    def test_key_too_short(self):
+        priv_key = ecdsa.SigningKey.generate(curve=ecdsa.NIST256p).to_pem()
+        key = CryptographyECKey(priv_key, ALGORITHMS.ES512)
+        with pytest.raises(TypeError):
+            key.sign('foo')
+
+    def test_get_public_key(self):
+        key = CryptographyECKey(private_key, ALGORITHMS.ES256)
+        pubkey = key.public_key()
+        pubkey2 = pubkey.public_key()
+        assert pubkey == pubkey2
+
     def test_string_secret(self):
         key = 'secret'
         with pytest.raises(JOSEError):