self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-06-02 23:17:26 +02:00
Code Issues Releases Activity

ignore dkim_publickey when updating config

Browse Source
This commit is contained in:
Alexander Graf 2020-10-24 22:31:29 +02:00
parent c46f9328f7
commit 500967b2f5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/admin/mailu/models.py
View File

@ -202,13 +202,14 @@ class Base(db.Model):
raise KeyError(f'primary key {model.__table__}.{pkey} is missing', model, pkey, data) raise KeyError(f'primary key {model.__table__}.{pkey} is missing', model, pkey, data)
# check data keys and values # check data keys and values
for key, value in data.items(): for key in list(data.keys()):
# check key # check key
if not hasattr(model, key) and not key in model.__mapper__.relationships: if not hasattr(model, key) and not key in model.__mapper__.relationships:
raise KeyError(f'unknown key {model.__table__}.{key}', model, key, data) raise KeyError(f'unknown key {model.__table__}.{key}', model, key, data)
# check value type # check value type
value = data[key]
col = model.__mapper__.columns.get(key) col = model.__mapper__.columns.get(key)
if col is not None: if col is not None:
if not ((value is None and col.nullable) or (type(value) is col.type.python_type)): if not ((value is None and col.nullable) or (type(value) is col.type.python_type)):
@ -218,7 +219,10 @@ class Base(db.Model):
if rel is None: if rel is None:
itype = getattr(model, '_dict_types', {}).get(key) itype = getattr(model, '_dict_types', {}).get(key)
if itype is not None: if itype is not None:
if not isinstance(value, itype): if not itype: # empty tuple => ignore value
del data[key]
continue
elif not isinstance(value, itype):
raise TypeError(f'{model.__table__}.{key} {value!r} has invalid type {type(value).__name__!r}', model, key, data) raise TypeError(f'{model.__table__}.{key} {value!r} has invalid type {type(value).__name__!r}', model, key, data)
else: else:
raise NotImplementedError(f'type not defined for {model.__table__}.{key}') raise NotImplementedError(f'type not defined for {model.__table__}.{key}')
@ -365,7 +369,7 @@ class Domain(Base):
_dict_hide = {'users', 'managers', 'aliases'} _dict_hide = {'users', 'managers', 'aliases'}
_dict_show = {'dkim_key', 'dkim_publickey'} _dict_show = {'dkim_key', 'dkim_publickey'}
_dict_secret = {'dkim_key'} _dict_secret = {'dkim_key'}
_dict_types = {'dkim_key': (bytes, type(None))} _dict_types = {'dkim_key': (bytes, type(None)), 'dkim_publickey': tuple()}
_dict_output = {'dkim_key': lambda v: v.decode('utf-8').strip().split('\n')[1:-1]} _dict_output = {'dkim_key': lambda v: v.decode('utf-8').strip().split('\n')[1:-1]}
@staticmethod @staticmethod
def _dict_input(data): def _dict_input(data):