docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #276 from droopy4096/master-backports

Browse Source 
multiple bugfixes for config_sync and full coverage of user/alias/domain attributes added
This commit is contained in:
kaiyou
2017-09-28 20:21:44 +02:00
committed by GitHub
parent d84b63453f 18ba724505
commit 3e2dfee431
1 changed files with 103 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
admin/manage.py
View File

@@ -18,8 +18,10 @@ def admin(localpart, domain_name, password):
db.session.add(user)
db.session.commit()
@manager.command
def user(localpart, domain_name, password, hash_scheme=app.config['PASSWORD_SCHEME']):
def user(localpart, domain_name, password,
hash_scheme=app.config['PASSWORD_SCHEME']):
""" Create a user
"""
domain = models.Domain.query.get(domain_name)
@@ -35,6 +37,7 @@ def user(localpart, domain_name, password, hash_scheme=app.config['PASSWORD_SCHE
db.session.add(user)
db.session.commit()
@manager.option('-n', '--domain_name', dest='domain_name')
@manager.option('-u', '--max_users', dest='max_users')
@manager.option('-a', '--max_aliases', dest='max_aliases')
@@ -46,8 +49,10 @@ def domain(domain_name, max_users=0, max_aliases=0, max_quota_bytes=0):
db.session.add(domain)
db.session.commit()
@manager.command
def user_import(localpart, domain_name, password_hash, hash_scheme=app.config['PASSWORD_SCHEME']):
def user_import(localpart, domain_name, password_hash,
hash_scheme=app.config['PASSWORD_SCHEME']):
""" Import a user along with password hash. Available hashes:
'SHA512-CRYPT'
'SHA256-CRYPT'
@@ -67,10 +72,12 @@ def user_import(localpart, domain_name, password_hash, hash_scheme=app.config['P
db.session.add(user)
db.session.commit()
@manager.command
def config_update(verbose=False, delete_objects=False):
"""sync configuration with data from YAML-formatted stdin"""
import yaml, sys
import yaml
import sys
new_config = yaml.load(sys.stdin)
# print new_config
domains = new_config.get('domains', [])
@@ -90,15 +97,21 @@ def config_update(verbose=False, delete_objects=False):
max_aliases=max_aliases,
max_quota_bytes=max_quota_bytes)
db.session.add(domain)
print("Added " + str(domain_config))
else:
domain.max_users = max_users
domain.max_aliases = max_aliases
domain.max_quota_bytes = max_quota_bytes
db.session.add(domain)
print("Updated " + str(domain_config))
users = new_config.get('users', [])
tracked_users = set()
user_optional_params = ('comment', 'quota_bytes', 'global_admin',
'enable_imap', 'enable_pop', 'forward_enabled',
'forward_destination', 'reply_enabled',
'reply_subject', 'reply_body', 'displayed_name',
'spam_enabled', 'email', 'spam_threshold')
for user_config in users:
if verbose:
print(str(user_config))
@@ -108,6 +121,10 @@ def config_update(verbose=False, delete_objects=False):
hash_scheme = user_config.get('hash_scheme', None)
domain = models.Domain.query.get(domain_name)
email = '{0}@{1}'.format(localpart, domain_name)
optional_params = {}
for k in user_optional_params:
if k in user_config:
optional_params[k] = user_config[k]
if not domain:
domain = models.Domain(name=domain_name)
db.session.add(domain)
@@ -118,8 +135,11 @@ def config_update(verbose=False, delete_objects=False):
user = models.User(
localpart=localpart,
domain=domain,
global_admin=False
**optional_params
)
else:
for k in optional_params:
setattr(user, k, optional_params[k])
user.set_password(password_hash, hash_scheme=hash_scheme, raw=True)
db.session.add(user)
@@ -130,11 +150,11 @@ def config_update(verbose=False, delete_objects=False):
print(str(alias_config))
localpart = alias_config['localpart']
domain_name = alias_config['domain']
pre_destination=alias_config['destination']
if type(pre_destination) is str:
destination = pre_destination.split(',')
if type(alias_config['destination']) is str:
destination = alias_config['destination'].split(',')
else:
destination = pre_destination
destination = alias_config['destination']
wildcard = alias_config.get('wildcard', False)
domain = models.Domain.query.get(domain_name)
email = '{0}@{1}'.format(localpart, domain_name)
if not domain:
@@ -147,37 +167,51 @@ def config_update(verbose=False, delete_objects=False):
alias = models.Alias(
localpart=localpart,
domain=domain,
wildcard=wildcard,
destination=destination,
email=email
)
else:
alias.destination = destination
alias.wildcard = wildcard
db.session.add(alias)
db.session.commit()
managers = new_config.get('managers', [])
# tracked_managers=set()
for manager_config in managers:
if verbose:
print(str(manager_config))
domain_name = manager_config['domain']
user_name = manage_config['user']
user_name = manager_config['user']
domain = models.Domain.query.get(domain_name)
manageruser = models.User.query.get(user_name + '@' + domain_name)
if manageruser not in domain.managers:
domain.managers.append(manageruser)
db.session.add(domain)
db.session.commit()
if delete_objects:
for user in db.session.query(models.User).all():
if not (user.email in tracked_users):
if verbose:
print("Deleting user: " + str(user.email))
db.session.delete(user)
for alias in db.session.query(models.Alias).all():
if not (alias.email in tracked_aliases):
if verbose:
print("Deleting alias: " + str(alias.email))
db.session.delete(alias)
for domain in db.session.query(models.Domain).all():
if not (domain.name in tracked_domains):
if verbose:
print("Deleting domain: " + str(domain.name))
db.session.delete(domain)
db.session.commit()
@manager.command
def user_delete(email):
"""delete user"""
@@ -186,6 +220,7 @@ def user_delete(email):
db.session.delete(user)
db.session.commit()
@manager.command
def alias_delete(email):
"""delete alias"""
@@ -194,6 +229,7 @@ def alias_delete(email):
db.session.delete(alias)
db.session.commit()
@manager.command
def alias(localpart, domain_name, destination):
""" Create an alias
@@ -212,6 +248,8 @@ def alias(localpart, domain_name, destination):
db.session.commit()
# Set limits to a domain
@manager.command
def setlimits(domain_name, max_users, max_aliases, max_quota_bytes):
domain = models.Domain.query.get(domain_name)
@@ -223,6 +261,8 @@ def setlimits(domain_name, max_users, max_aliases, max_quota_bytes):
db.session.commit()
# Make the user manager of a domain
@manager.command
def setmanager(domain_name, user_name='manager'):
domain = models.Domain.query.get(domain_name)