7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev_api_password' of github.com:veops/cmdb into dev_api_password

This commit is contained in:
fxiang21 2023-10-29 21:43:39 +08:00
parent 5fa8c438f4 e0059cfc84
commit 5b9f0cec4a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmdb-api/api/lib/cmdb/ci.py
View File

@ -723,7 +723,6 @@ class CIManager(object):
def save_password(cls, ci_id, attr_id, value, record_id, type_id):
changed = None
encrypt_value = None
value_table = ValueTypeMap.table[ValueTypeEnum.PASSWORD]
if current_app.config.get('SECRETS_ENGINE') == 'inner':
if value:
@ -762,7 +761,7 @@ class CIManager(object):
current_app.logger.warning('delete password to vault failed: {}'.format(e))
if changed is not None:
AttributeValueManager.write_change2(changed, record_id)
return AttributeValueManager.write_change2(changed, record_id)
@classmethod
def load_password(cls, ci_id, attr_id):

2
cmdb-api/api/lib/cmdb/value.py
View File

@ -69,7 +69,7 @@ class AttributeValueManager(object):
if attr.is_list:
res[field_name] = [ValueTypeMap.serialize[attr.value_type](i.value) for i in rs]
elif attr.is_password and rs:
res[field_name] = '******'
res[field_name] = '******' if rs[0].value else ''
else:
res[field_name] = ValueTypeMap.serialize[attr.value_type](rs[0].value) if rs else None