summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorVincent Vanackere <vincent.vanackere@trustelem.com>2017-03-07 16:22:57 +0100
committerVincent Vanackere <vincent.vanackere@trustelem.com>2017-03-07 16:22:57 +0100
commitbe3651381955b861bab52c48c17880988f003721 (patch)
treec191355183ac00e13513da6304a0685070ca3949 /lib/base.php
parenta5a872c9d7f5a199c92ec57b9c17788a82e6fda9 (diff)
downloadnextcloud-server-be3651381955b861bab52c48c17880988f003721.tar.gz
nextcloud-server-be3651381955b861bab52c48c17880988f003721.zip
Extend Same Site cookie user_saml exemption rule
The current check does not trigger if $request->getRequestUri() does not return index.php as a prefix (on my config this was occuring using nginx to serve Nextcloud) Signed-off-by: Vincent Vanackere <vincent.vanackere@trustelem.com>
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index a4bb4f584f8..e9e9af8c553 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -528,7 +528,7 @@ class OC {
//
// Questions about this code? Ask Lukas ;-)
$currentUrl = substr(explode('?',$request->getRequestUri(), 2)[0], strlen(\OC::$WEBROOT));
- if($currentUrl === '/index.php/apps/user_saml/saml/acs') {
+ if($currentUrl === '/index.php/apps/user_saml/saml/acs' || $currentUrl === '/apps/user_saml/saml/acs') {
return;
}
// For the "index.php" endpoint only a lax cookie is required.