diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-07 15:14:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-07 15:14:46 +0000 |
| commit | 3f620281f8529e699fd61371f913299bf94bc099 (patch) | |
| tree | 0f2bffc2bc6d9daad0134f1d01bc59226f9f2196 /openstack | |
| parent | 0c766d13e148f9bc5e7b1640db7654a5dee35c10 (diff) | |
| parent | 848c4d530e0c3dd6493289b38366e08260d437ca (diff) | |
| download | oslo-3f620281f8529e699fd61371f913299bf94bc099.tar.gz oslo-3f620281f8529e699fd61371f913299bf94bc099.tar.xz oslo-3f620281f8529e699fd61371f913299bf94bc099.zip | |
Merge "Some nitpicky securemessage cleanups"
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/rpc/securemessage.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openstack/common/rpc/securemessage.py b/openstack/common/rpc/securemessage.py index fa6eea5..9dc2eca 100644 --- a/openstack/common/rpc/securemessage.py +++ b/openstack/common/rpc/securemessage.py @@ -269,7 +269,7 @@ class _KDSClient(object): def get_ticket(self, source, target, crypto, key): - #prepare metadata + # prepare metadata md = {'requestor': source, 'target': target, 'timestamp': time.time(), @@ -283,17 +283,17 @@ class _KDSClient(object): reply = self._get_ticket({'metadata': metadata, 'signature': signature}) - # Verify reply + # verify reply signature = crypto.sign(key, (reply['metadata'] + reply['ticket'])) if signature != reply['signature']: raise InvalidEncryptedTicket(md['source'], md['destination']) md = jsonutils.loads(base64.b64decode(reply['metadata'])) - if (((md['source'] != source) or - (md['destination'] != target) or - (md['expiration'] < time.time()))): + if ((md['source'] != source or + md['destination'] != target or + md['expiration'] < time.time())): raise InvalidEncryptedTicket(md['source'], md['destination']) - #return ticket data + # return ticket data tkt = jsonutils.loads(crypto.decrypt(key, reply['ticket'])) return tkt, md['expiration'] |