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 part of app_ssowatconf

Browse source
This commit is contained in:
Alexandre Aubin 2019-09-15 16:59:44 +02:00
parent cc59501b55
commit 95a8dfa71c
1 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/yunohost/app.py
View file

@ -41,7 +41,7 @@ from datetime import datetime
from moulinette import msignals, m18n, msettings from moulinette import msignals, m18n, msettings
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
from moulinette.utils.filesystem import read_json, read_toml from moulinette.utils.filesystem import read_json, read_toml, read_yaml
from yunohost.service import service_log, service_status, _run_service_command from yunohost.service import service_log, service_status, _run_service_command
from yunohost.utils import packages from yunohost.utils import packages
@ -1366,34 +1366,29 @@ def app_ssowatconf():
return s.split(',') if s else [] return s.split(',') if s else []
for app in apps_list: for app in apps_list:
with open(APPS_SETTING_PATH + app['id'] + '/settings.yml') as f:
app_settings = yaml.load(f)
if 'no_sso' in app_settings: app_settings = read_yaml(APPS_SETTING_PATH + app['id'] + '/settings.yml')
continue
for item in _get_setting(app_settings, 'skipped_uris'): if 'no_sso' in app_settings:
if item[-1:] == '/': continue
item = item[:-1]
skipped_urls.append(app_settings['domain'] + app_settings['path'].rstrip('/') + item) app_root_webpath = app_settings['domain'] + app_settings['path'].rstrip('/')
for item in _get_setting(app_settings, 'skipped_regex'):
skipped_regex.append(item) # Skipped
for item in _get_setting(app_settings, 'unprotected_uris'): skipped_urls += [app_root_webpath + uri.rstrip("/") for uri in _get_setting(app_settings, 'skipped_uris')]
if item[-1:] == '/': skipped_regex += _get_setting(app_settings, 'skipped_regex')
item = item[:-1]
unprotected_urls.append(app_settings['domain'] + app_settings['path'].rstrip('/') + item) # Unprotected
for item in _get_setting(app_settings, 'unprotected_regex'): unprotected_urls += [app_root_webpath + uri.rstrip("/") for uri in _get_setting(app_settings, 'unprotected_uris')]
unprotected_regex.append(item) unprotected_regex += _get_setting(app_settings, 'unprotected_regex')
for item in _get_setting(app_settings, 'protected_uris'):
if item[-1:] == '/': # Protected
item = item[:-1] unprotected_urls += [app_root_webpath + uri.rstrip("/") for uri in _get_setting(app_settings, 'protected_uris')]
protected_urls.append(app_settings['domain'] + app_settings['path'].rstrip('/') + item) unprotected_regex += _get_setting(app_settings, 'protected_regex')
for item in _get_setting(app_settings, 'protected_regex'):
protected_regex.append(item) # Redirected
if 'redirected_urls' in app_settings: redirected_urls.update(app_settings.get('redirected_urls', {}))
redirected_urls.update(app_settings['redirected_urls']) redirected_regex.update(app_settings.get('redirected_regex', {}))
if 'redirected_regex' in app_settings:
redirected_regex.update(app_settings['redirected_regex'])
for domain in domains: for domain in domains:
skipped_urls.extend([domain + '/yunohost/admin', domain + '/yunohost/api']) skipped_urls.extend([domain + '/yunohost/admin', domain + '/yunohost/api'])