From b9a157e36de2b48da31947c1f9fd000bc923f757 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 29 Jun 2016 21:50:09 +0200 Subject: [PATCH] Add wantsnameid --- appinfo/app.php | 2 +- lib/controller/settingscontroller.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/appinfo/app.php b/appinfo/app.php index c81cf77..9265c33 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -54,7 +54,7 @@ try { // Since with Nextcloud 9 we don't have an unique entry point this is a little // bit hacky and won't necessarily detect all situations. $currentUrl = substr(explode('?',$request->getRequestUri(), 2)[0], strlen(\OC::$WEBROOT)); -if(($currentUrl === '/' || $currentUrl === '/index.php/' || $currentUrl === '/index.php') && !OC_User::isLoggedIn()) { +if(($currentUrl === '/index.php') && !OC_User::isLoggedIn()) { $csrfToken = \OC::$server->getCsrfTokenManager()->getToken(); header('Location: '.$urlGenerator->linkToRouteAbsolute('user_saml.SAML.login') .'?requesttoken='. urlencode($csrfToken->getEncryptedValue())); exit(); diff --git a/lib/controller/settingscontroller.php b/lib/controller/settingscontroller.php index 906b204..cf06f83 100644 --- a/lib/controller/settingscontroller.php +++ b/lib/controller/settingscontroller.php @@ -71,6 +71,7 @@ class SettingsController extends Controller { 'wantMessagesSigned' => $this->l10n->t('Indicates a requirement for the , and elements received by this SP to be signed.'), 'wantAssertionsSigned' => $this->l10n->t('Indicates a requirement for the elements received by this SP to be signed. [Metadata of the SP will offer this info]'), 'wantAssertionsEncrypted' => $this->l10n->t('Indicates a requirement for the elements received by this SP to be encrypted.'), + 'wantNameId' => $this->l10n->t(' Indicates a requirement for the NameID element on the SAMLResponse received by this SP to be present.'), 'wantNameIdEncrypted' => $this->l10n->t('Indicates a requirement for the NameID received by this SP to be encrypted.'), 'wantXMLValidation' => $this->l10n->t('Indicates if the SP will validate all received XMLs.'), ];