Started working on the invalid cases
diff --git a/tests/test_fernet.py b/tests/test_fernet.py
index 382a232..1507171 100644
--- a/tests/test_fernet.py
+++ b/tests/test_fernet.py
@@ -9,10 +9,11 @@
import six
-from cryptography.fernet import Fernet
+from cryptography.fernet import Fernet, InvalidToken
-def json_parametrize(keys, path):
+def json_parametrize(keys, fname):
+ path = os.path.join(os.path.dirname(__file__), "vectors", "fernet", fname)
with open(path) as f:
data = json.load(f)
return pytest.mark.parametrize(keys, [
@@ -23,8 +24,7 @@
class TestFernet(object):
@json_parametrize(
- ("secret", "now", "iv", "src", "token"),
- os.path.join(os.path.dirname(__file__), "vectors", "fernet", "generate.json")
+ ("secret", "now", "iv", "src", "token"), "generate.json",
)
def test_generate(self, secret, now, iv, src, token):
f = Fernet(base64.urlsafe_b64decode(secret.encode("ascii")))
@@ -36,8 +36,7 @@
assert actual_token == token
@json_parametrize(
- ("secret", "now", "src", "ttl_sec", "token"),
- os.path.join(os.path.dirname(__file__), "vectors", "fernet", "verify.json")
+ ("secret", "now", "src", "ttl_sec", "token"), "verify.json",
)
def test_verify(self, secret, now, src, ttl_sec, token):
f = Fernet(base64.urlsafe_b64decode(secret.encode("ascii")))
@@ -47,3 +46,20 @@
current_time=calendar.timegm(iso8601.parse_date(now).utctimetuple())
)
assert payload == src
+
+ @json_parametrize(("secret", "token", "now", "ttl_sec"), "invalid.json")
+ def test_invalid(self, secret, token, now, ttl_sec):
+ f = Fernet(base64.urlsafe_b64decode(secret.encode("ascii")))
+ with pytest.raises(InvalidToken):
+ f.decrypt(
+ token.encode("ascii"),
+ ttl=ttl_sec,
+ current_time=calendar.timegm(iso8601.parse_date(now).utctimetuple())
+ )
+
+ def test_unicode(self):
+ f = Fernet(b"\x00" * 32)
+ with pytest.raises(TypeError):
+ f.encrypt(six.u(""))
+ with pytest.raises(TypeError):
+ f.decrypt(six.u(""))