summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2014-11-10 09:50:56 -0600
committerRuben Pollan <meskio@sindominio.net>2014-11-10 13:41:28 -0600
commit22a16674ce6891de5ea0a9cbea38ddabc9dd6e06 (patch)
tree99c14f06cebcc3f8e55bbdb5b962771244cf919f /src
parentd1e0322d8c12dfb1511ad0895c5fc1e0271b8a30 (diff)
Use type instead of tags to get docs in openpgp
For that that now the type is the class.__name__ instead of str(class)
Diffstat (limited to 'src')
-rw-r--r--src/leap/keymanager/__init__.py2
-rw-r--r--src/leap/keymanager/keys.py8
-rw-r--r--src/leap/keymanager/openpgp.py10
3 files changed, 11 insertions, 9 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py
index 53dd9a78..0ffb6fc7 100644
--- a/src/leap/keymanager/__init__.py
+++ b/src/leap/keymanager/__init__.py
@@ -134,7 +134,7 @@ class KeyManager(object):
Return key class from string representation of key type.
"""
return filter(
- lambda klass: str(klass) == ktype,
+ lambda klass: klass.__name__ == ktype,
self._wrapper_map).pop()
def _get(self, uri, data=None):
diff --git a/src/leap/keymanager/keys.py b/src/leap/keymanager/keys.py
index 4952b9b3..5aeb7945 100644
--- a/src/leap/keymanager/keys.py
+++ b/src/leap/keymanager/keys.py
@@ -71,14 +71,14 @@ KEYMANAGER_KEY_TAG = 'keymanager-key'
#
TAGS_PRIVATE_INDEX = 'by-tags-private'
-TAGS_ADDRESS_PRIVATE_INDEX = 'by-tags-address-private'
+TYPE_ADDRESS_PRIVATE_INDEX = 'by-type-address-private'
INDEXES = {
TAGS_PRIVATE_INDEX: [
KEY_TAGS_KEY,
'bool(%s)' % KEY_PRIVATE_KEY,
],
- TAGS_ADDRESS_PRIVATE_INDEX: [
- KEY_TAGS_KEY,
+ TYPE_ADDRESS_PRIVATE_INDEX: [
+ KEY_TYPE_KEY,
KEY_ADDRESS_KEY,
'bool(%s)' % KEY_PRIVATE_KEY,
]
@@ -200,7 +200,7 @@ class EncryptionKey(object):
return json.dumps({
KEY_ADDRESS_KEY: self.address,
- KEY_TYPE_KEY: str(self.__class__),
+ KEY_TYPE_KEY: self.__class__.__name__,
KEY_ID_KEY: self.key_id,
KEY_FINGERPRINT_KEY: self.fingerprint,
KEY_DATA_KEY: self.key_data,
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py
index 1160434c..38db178c 100644
--- a/src/leap/keymanager/openpgp.py
+++ b/src/leap/keymanager/openpgp.py
@@ -36,8 +36,7 @@ from leap.keymanager.keys import (
EncryptionScheme,
is_address,
build_key_from_dict,
- KEYMANAGER_KEY_TAG,
- TAGS_ADDRESS_PRIVATE_INDEX,
+ TYPE_ADDRESS_PRIVATE_INDEX,
KEY_FINGERPRINT_KEY,
KEY_DATA_KEY,
)
@@ -210,6 +209,9 @@ class OpenPGPScheme(EncryptionScheme):
signing and verification).
"""
+ # type used on the soledad documents
+ OPENPGP_KEY_TYPE = OpenPGPKey.__name__
+
def __init__(self, soledad, gpgbinary=None):
"""
Initialize the OpenPGP wrapper.
@@ -427,8 +429,8 @@ class OpenPGPScheme(EncryptionScheme):
:rtype: leap.soledad.document.SoledadDocument
"""
doclist = self._soledad.get_from_index(
- TAGS_ADDRESS_PRIVATE_INDEX,
- KEYMANAGER_KEY_TAG,
+ TYPE_ADDRESS_PRIVATE_INDEX,
+ self.OPENPGP_KEY_TYPE,
address,
'1' if private else '0')
if len(doclist) is 0: