diff options
| author | Tulio Casagrande <tcasagra@thoughtworks.com> | 2017-03-09 19:25:37 -0300 |
|---|---|---|
| committer | Tulio Casagrande <tcasagra@thoughtworks.com> | 2017-03-09 19:25:37 -0300 |
| commit | e779ecd3be6bfe45f2bd082e890e1c600785e676 (patch) | |
| tree | 250843bbcb4670109b2c5670f8e9013d32c3c8ff | |
| parent | c1966cd7cfa27445f2a09501709dc66a18d79058 (diff) | |
[bug] secrets version defaults to v1
| -rw-r--r-- | client/src/leap/soledad/client/_secrets/crypto.py | 2 | ||||
| -rw-r--r-- | testing/tests/client/test_secrets.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/client/src/leap/soledad/client/_secrets/crypto.py b/client/src/leap/soledad/client/_secrets/crypto.py index afa80034..8148151d 100644 --- a/client/src/leap/soledad/client/_secrets/crypto.py +++ b/client/src/leap/soledad/client/_secrets/crypto.py @@ -72,7 +72,7 @@ class SecretsCrypto(object): # def decrypt(self, data): - version = data.get('version', 1) + version = data.setdefault('version', 1) method = getattr(self, '_decrypt_v%d' % version) try: return method(data) diff --git a/testing/tests/client/test_secrets.py b/testing/tests/client/test_secrets.py index 7c909bcb..7b643cb4 100644 --- a/testing/tests/client/test_secrets.py +++ b/testing/tests/client/test_secrets.py @@ -158,8 +158,9 @@ class SecretsCryptoTestCase(unittest.TestCase): decrypted = self._crypto.decrypt(encrypted) self.assertEqual(decrypted, self.SECRETS) - def test__decrypt_v1_without_version_field(self): + def test__no_version_defaults_to_v1(self): encrypted = dict(self.ENCRYPTED_V1) del encrypted['version'] decrypted = self._crypto.decrypt(encrypted) self.assertEqual(decrypted, self.SECRETS) + self.assertEqual(encrypted['version'], 1) |