From 4b97eb7c6605612e1a43a09094082e43bf46f71f Mon Sep 17 00:00:00 2001 From: chateau Date: Wed, 20 Mar 2019 00:35:57 +0100 Subject: [PATCH 1/3] corrected background scrolling for clouds theme --- portal/assets/themes/clouds/custom_portal.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/portal/assets/themes/clouds/custom_portal.css b/portal/assets/themes/clouds/custom_portal.css index 2591ca2..74abe80 100644 --- a/portal/assets/themes/clouds/custom_portal.css +++ b/portal/assets/themes/clouds/custom_portal.css @@ -16,6 +16,12 @@ a.app-tile, color: black !important; } +.content { + width: 100%; + height: 100%; + overflow: auto; +} + .ynh-user-portal { background-image: url("background.jpg"); background-repeat: no-repeat; From 4da84b0e30b21e80031ed279e76fa92407fda7be Mon Sep 17 00:00:00 2001 From: chateau Date: Wed, 20 Mar 2019 00:37:25 +0100 Subject: [PATCH 2/3] Revert "corrected background scrolling for clouds theme" This reverts commit 4b97eb7c6605612e1a43a09094082e43bf46f71f. --- portal/assets/themes/clouds/custom_portal.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/portal/assets/themes/clouds/custom_portal.css b/portal/assets/themes/clouds/custom_portal.css index 74abe80..2591ca2 100644 --- a/portal/assets/themes/clouds/custom_portal.css +++ b/portal/assets/themes/clouds/custom_portal.css @@ -16,12 +16,6 @@ a.app-tile, color: black !important; } -.content { - width: 100%; - height: 100%; - overflow: auto; -} - .ynh-user-portal { background-image: url("background.jpg"); background-repeat: no-repeat; From 13257e4de0974b90ebab60d23778e73656c7a3f1 Mon Sep 17 00:00:00 2001 From: chateau Date: Wed, 20 Mar 2019 03:17:17 +0100 Subject: [PATCH 3/3] allow to redirect sso pages the same way than apps urls (from login page) --- access.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/access.lua b/access.lua index 4943640..26698a9 100644 --- a/access.lua +++ b/access.lua @@ -162,7 +162,12 @@ then -- If all the previous cases have failed, redirect to portal else hlp.flash("info", hlp.t("please_login")) - return hlp.redirect(conf.portal_url) + -- Force the scheme to HTTPS. This is to avoid an issue with redirection loop + -- when trying to access http://main.domain.tld/ (SSOwat finds that user aint + -- logged in, therefore redirects to SSO, which redirects to the back_url, which + -- redirect to SSO, ..) + local back_url = "https://" .. ngx.var.host .. ngx.var.uri .. hlp.uri_args_string() + return hlp.redirect(conf.portal_url.."?r="..ngx.encode_base64(back_url)) end