xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-08-15 15:50:24 +00:00
Code Issues Projects Releases Wiki Activity

Address some problems caused by refactor

Browse Source
This commit is contained in:
Jarrod Johnson
2013-11-02 17:21:34 -04:00
parent c242f32e73
commit fc7d426d06
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
confluent/auth.py
View File

@@ -68,10 +68,10 @@ def authorize(name, element, tenant=False, access='rw'):
user, tenant = _get_usertenant(name, tenant)
if tenant is not None and not configmanager.is_tenant(tenant):
return None
configmanager = configmanager.ConfigManager(tenant)
userobj = configmanager.get_user(user)
manager = configmanager.ConfigManager(tenant)
userobj = manager.get_user(user)
if userobj: #returning
return (userobj, configmanager)
return (userobj, manager)
return None

6
confluent/config/configmanager.py
View File

@@ -35,7 +35,7 @@
import array
import ast
import collections
import confluent.crypto
import confluent.config.crypto as crypto
import confluent.util
import copy
import cPickle
@@ -182,7 +182,7 @@ def _decode_attribute(attribute, nodeobj, formatter=None, decrypt=False):
return nodeobj[attribute]
elif 'cryptvalue' in nodeobj[attribute] and decrypt:
retdict = copy.deepcopy(nodeobj[attribute])
retdict['value'] = confluent.crypto.decrypt_value(
retdict['value'] = crypto.decrypt_value(
nodeobj[attribute]['cryptvalue'])
return retdict
return nodeobj[attribute]
@@ -356,7 +356,7 @@ class ConfigManager(object):
groups=attribmap[node]['groups'])
if 'value' in newdict and attrname.startswith("secret."):
newdict['cryptvalue' ] = \
confluent.crypto.crypt_value(newdict['value'])
crypto.crypt_value(newdict['value'])
del newdict['value']
cfgobj[attrname] = newdict
if ('_expressionkeys' in cfgobj and

10
confluent/crypto.py → confluent/config/crypto.py
View File

@@ -8,7 +8,7 @@
# by passphrase and optionally TPM
import array
import confluent.config
import confluent.config.configmanager as configmanager
import math
import os
@@ -60,21 +60,21 @@ def _format_key(key, passphrase=None):
def init_masterkey(passphrase=None):
global _masterkey
global _masterintegritykey
cfgn = confluent.config.get_global('master_privacy_key')
cfgn = configmanager.get_global('master_privacy_key')
if cfgn:
_masterkey = _get_protected_key(cfgn, passphrase=passphrase)
else:
_masterkey = os.urandom(32)
confluent.config.set_global('master_privacy_key', _format_key(
configmanager.set_global('master_privacy_key', _format_key(
_masterkey,
passphrase=passphrase))
cfgn = confluent.config.get_global('master_integrity_key')
cfgn = configmanager.get_global('master_integrity_key')
if cfgn:
_masterintegritykey = _get_protected_key(cfgn, passphrase=passphrase)
else:
_masterintegritykey = os.urandom(64)
confluent.config.set_global('master_integrity_key', _format_key(
configmanager.set_global('master_integrity_key', _format_key(
_masterintegritykey,
passphrase=passphrase))