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

[mod] uses app_list installed option instead

Browse source
This commit is contained in:
Laurent Peuch 2018-07-09 14:08:28 +02:00
parent 3bcbe1941a
commit 14387c43eb
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/yunohost/app.py
View file

@ -1284,7 +1284,7 @@ def app_ssowatconf(auth):
redirected_urls = {} redirected_urls = {}
try: try:
apps_list = app_list()['apps'] apps_list = app_list(installed=True)['apps']
except: except:
apps_list = [] apps_list = []
@ -1293,31 +1293,30 @@ def app_ssowatconf(auth):
return s.split(',') if s else [] return s.split(',') if s else []
for app in apps_list: for app in apps_list:
if _is_installed(app['id']): with open(APPS_SETTING_PATH + app['id'] + '/settings.yml') as f:
with open(APPS_SETTING_PATH + app['id'] + '/settings.yml') as f: app_settings = yaml.load(f)
app_settings = yaml.load(f) for item in _get_setting(app_settings, 'skipped_uris'):
for item in _get_setting(app_settings, 'skipped_uris'): if item[-1:] == '/':
if item[-1:] == '/': item = item[:-1]
item = item[:-1] skipped_urls.append(app_settings['domain'] + app_settings['path'].rstrip('/') + item)
skipped_urls.append(app_settings['domain'] + app_settings['path'].rstrip('/') + item) for item in _get_setting(app_settings, 'skipped_regex'):
for item in _get_setting(app_settings, 'skipped_regex'): skipped_regex.append(item)
skipped_regex.append(item) for item in _get_setting(app_settings, 'unprotected_uris'):
for item in _get_setting(app_settings, 'unprotected_uris'): if item[-1:] == '/':
if item[-1:] == '/': item = item[:-1]
item = item[:-1] unprotected_urls.append(app_settings['domain'] + app_settings['path'].rstrip('/') + item)
unprotected_urls.append(app_settings['domain'] + app_settings['path'].rstrip('/') + item) for item in _get_setting(app_settings, 'unprotected_regex'):
for item in _get_setting(app_settings, 'unprotected_regex'): unprotected_regex.append(item)
unprotected_regex.append(item) for item in _get_setting(app_settings, 'protected_uris'):
for item in _get_setting(app_settings, 'protected_uris'): if item[-1:] == '/':
if item[-1:] == '/': item = item[:-1]
item = item[:-1] protected_urls.append(app_settings['domain'] + app_settings['path'].rstrip('/') + item)
protected_urls.append(app_settings['domain'] + app_settings['path'].rstrip('/') + item) for item in _get_setting(app_settings, 'protected_regex'):
for item in _get_setting(app_settings, 'protected_regex'): protected_regex.append(item)
protected_regex.append(item) if 'redirected_urls' in app_settings:
if 'redirected_urls' in app_settings: redirected_urls.update(app_settings['redirected_urls'])
redirected_urls.update(app_settings['redirected_urls']) if 'redirected_regex' in app_settings:
if 'redirected_regex' in app_settings: redirected_regex.update(app_settings['redirected_regex'])
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'])