summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-05-04 17:55:32 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-05-04 17:55:32 -0400
commit943d16d669d660d8c3cb853a968c2eaa6f088f14 (patch)
tree7dce6006738bcd19698392b92d99e071b315bef0
parentcd4f6648134d39e018ac5ac0c085f1dc57be0104 (diff)
parent52e4303cf2e0f8a51df33d3f8f30310ca5897069 (diff)
Merge tag '0.5.1' into debian/experimental
Tag keymanager version 0.5.1
-rw-r--r--MANIFEST.in2
-rw-r--r--changes/bug-serializable-keys1
-rw-r--r--src/leap/keymanager/keys.py27
3 files changed, 29 insertions, 1 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index d1a0e9a..8a66511 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
include pkg/*
include versioneer.py
include LICENSE
-include CHANGELOG
+include CHANGELOG.rst
include src/leap/keymanager/_version.py
diff --git a/changes/bug-serializable-keys b/changes/bug-serializable-keys
new file mode 100644
index 0000000..0885fd2
--- /dev/null
+++ b/changes/bug-serializable-keys
@@ -0,0 +1 @@
+- encryption keys can now be serialized to json using key.get_dict()
diff --git a/src/leap/keymanager/keys.py b/src/leap/keymanager/keys.py
index 38d66b5..1955d54 100644
--- a/src/leap/keymanager/keys.py
+++ b/src/leap/keymanager/keys.py
@@ -192,6 +192,11 @@ class EncryptionKey(object):
__metaclass__ = ABCMeta
+ __slots__ = ('address', 'uids', 'fingerprint', 'key_data',
+ 'private', 'length', 'expiry_date', 'validation',
+ 'last_audited_at', 'refreshed_at',
+ 'encr_used', 'sign_used', '_index')
+
def __init__(self, address=None, uids=[], fingerprint="",
key_data="", private=False, length=0, expiry_date=None,
validation=ValidationLevels.Weak_Chain, last_audited_at=None,
@@ -212,6 +217,7 @@ class EncryptionKey(object):
self.refreshed_at = refreshed_at
self.encr_used = encr_used
self.sign_used = sign_used
+ self._index = len(self.__slots__)
def get_json(self):
"""
@@ -258,6 +264,27 @@ class EncryptionKey(object):
KEY_TAGS_KEY: [KEYMANAGER_ACTIVE_TAG],
})
+ def next(self):
+ if self._index == 0:
+ self._index = len(self.__slots__)
+ raise StopIteration
+
+ self._index -= 1
+ key = self.__slots__[self._index]
+
+ if key.startswith('_'):
+ return self.next()
+
+ value = getattr(self, key)
+ if key == "validation":
+ value = str(value)
+ elif key in ["expiry_date", "last_audited_at", "refreshed_at"]:
+ value = str(value)
+ return key, value
+
+ def __iter__(self):
+ return self
+
def __repr__(self):
"""
Representation of this class