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

Merge pull request #204 from YunoHost/fix-655-path-always-ended-striped

Browse source 
[fix] don't remove trailing char if it's not a slash
This commit is contained in:
Laurent Peuch 2016-12-11 23:30:55 +01:00 • committed by GitHub
commit 9e5cf16a9f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/yunohost/app.py
View file

@ -1011,19 +1011,19 @@ def app_ssowatconf(auth):
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'][:-1] + 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'][:-1] + 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'][:-1] + 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: