YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Simplify app_ssowatconf code related to permissions

Browse source
This commit is contained in:
Alexandre Aubin 2019-09-11 21:40:04 +02:00
parent 853c6a161a
commit 98b1c30330
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/yunohost/app.py
View file

@ -1414,12 +1414,10 @@ def app_ssowatconf():
skipped_regex.append("^[^/]*/%.well%-known/acme%-challenge/.*$") skipped_regex.append("^[^/]*/%.well%-known/acme%-challenge/.*$")
skipped_regex.append("^[^/]*/%.well%-known/autoconfig/mail/config%-v1%.1%.xml.*$") skipped_regex.append("^[^/]*/%.well%-known/autoconfig/mail/config%-v1%.1%.xml.*$")
permission = {} permissions_per_url = {}
for a in user_permission_list()['permissions'].values(): for permission_name, permission_infos in user_permission_list(full=True)['permissions'].items():
for p in a.values(): for url in permission_infos["urls"]:
if 'URL' in p: permissions_per_url[url] = permission_infos['corresponding_users']
for u in p['URL']:
permission[u] = p['allowed_users']
conf_dict = { conf_dict = {
'portal_domain': main_domain, 'portal_domain': main_domain,
@ -1441,7 +1439,7 @@ def app_ssowatconf():
'redirected_regex': redirected_regex, 'redirected_regex': redirected_regex,
'users': {username: app_map(user=username) 'users': {username: app_map(user=username)
for username in user_list()['users'].keys()}, for username in user_list()['users'].keys()},
'permission': permission, 'permissions': permissions_per_url,
} }
with open('/etc/ssowat/conf.json', 'w+') as f: with open('/etc/ssowat/conf.json', 'w+') as f: