summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-03-09 12:53:21 +0100
committerGitHub <noreply@github.com>2017-03-09 12:53:21 +0100
commit6d10a2aece9ab4cce0f57f20594b9fcb9372a794 (patch)
treefe910b06e2fdd140e4e81035c73760238dadddea
parenta4aea572e416d0a2e5bb3c9b6548ed13b4c90b4f (diff)
parentbe3651381955b861bab52c48c17880988f003721 (diff)
downloadnextcloud-server-6d10a2aece9ab4cce0f57f20594b9fcb9372a794.tar.gz
nextcloud-server-6d10a2aece9ab4cce0f57f20594b9fcb9372a794.zip
Merge pull request #3754 from trustelem/user_saml-samesite-exclude
Extend Same Site cookie user_saml exemption rule
-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.