external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-20 02:52:11 +00:00
Code Issues Releases Wiki Activity

Minor code reformat

Browse Source
This commit is contained in:
NewbieOrange 2021-07-28 00:41:27 +08:00
parent 405860cac5
commit aed5a39383
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
management/auth.py
View File

@ -117,7 +117,7 @@ class KeyAuthService:
"/usr/bin/doveadm", "pw", "/usr/bin/doveadm", "pw",
"-p", pw, "-p", pw,
"-t", pw_hash, "-t", pw_hash,
]) ])
except: except:
# Login failed. # Login failed.
raise ValueError("Invalid password.") raise ValueError("Invalid password.")

24
management/daemon.py
View File

@ -93,7 +93,7 @@ def authorized_personnel_only(viewfunc):
return Response(json.dumps({ return Response(json.dumps({
"status": "error", "status": "error",
"reason": error, "reason": error,
})+"\n", status=status, mimetype='application/json', headers=headers) })+"\n", status=status, mimetype='application/json', headers=headers)
return newview return newview
@ -235,7 +235,7 @@ def mail_aliases_add():
request.form.get('permitted_senders', ''), request.form.get('permitted_senders', ''),
env, env,
update_if_exists=(request.form.get('update_if_exists', '') == '1') update_if_exists=(request.form.get('update_if_exists', '') == '1')
) )
@app.route('/mail/aliases/remove', methods=['POST']) @app.route('/mail/aliases/remove', methods=['POST'])
@authorized_personnel_only @authorized_personnel_only
@ -245,7 +245,7 @@ def mail_aliases_remove():
@app.route('/mail/domains') @app.route('/mail/domains')
@authorized_personnel_only @authorized_personnel_only
def mail_domains(): def mail_domains():
return "".join(x+"\n" for x in get_mail_domains(env)) return "".join(x+"\n" for x in get_mail_domains(env))
# DNS # DNS
@ -293,12 +293,12 @@ def dns_get_records(qname=None, rtype=None):
# Make a better data structure. # Make a better data structure.
records = [ records = [
{ {
"qname": r[0], "qname": r[0],
"rtype": r[1], "rtype": r[1],
"value": r[2], "value": r[2],
"sort-order": { }, "sort-order": { },
} for r in records ] } for r in records ]
# To help with grouping by zone in qname sorting, label each record with which zone it is in. # To help with grouping by zone in qname sorting, label each record with which zone it is in.
# There's an inconsistency in how we handle zones in get_dns_zones and in sort_domains, so # There's an inconsistency in how we handle zones in get_dns_zones and in sort_domains, so
@ -319,9 +319,9 @@ def dns_get_records(qname=None, rtype=None):
r["sort-order"]["created"] = i r["sort-order"]["created"] = i
domain_sort_order = utils.sort_domains([r["qname"] for r in records], env) domain_sort_order = utils.sort_domains([r["qname"] for r in records], env)
for i, r in enumerate(sorted(records, key = lambda r : ( for i, r in enumerate(sorted(records, key = lambda r : (
zones.index(r["zone"]), zones.index(r["zone"]),
domain_sort_order.index(r["qname"]), domain_sort_order.index(r["qname"]),
r["rtype"]))): r["rtype"]))):
r["sort-order"]["qname"] = i r["sort-order"]["qname"] = i
# Return. # Return.