NB-Public/user_saml
14
0
Fork 0
mirror of https://github.com/netzbegruenung/user_saml.git synced 2024-04-28 15:24:52 +02:00
Code Issues Projects Releases Wiki Activity

always read the right idp config

Browse source 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Björn Schiessle 2018-07-10 18:39:19 +02:00
parent 39b3d52746
commit e378f22d10
No known key found for this signature in database
GPG key ID: 2378A753E2BF04F6
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Controller/SAMLController.php
View file

@ -161,6 +161,7 @@ class SAMLController extends Controller {
$ssoUrl = $auth->login(null, [], false, false, true); $ssoUrl = $auth->login(null, [], false, false, true);
$this->session->set('user_saml.AuthNRequestID', $auth->getLastRequestID()); $this->session->set('user_saml.AuthNRequestID', $auth->getLastRequestID());
$this->session->set('user_saml.OriginalUrl', $this->request->getParam('originalUrl', '')); $this->session->set('user_saml.OriginalUrl', $this->request->getParam('originalUrl', ''));
$this->session->set('user_saml.Idp', $idp);
break; break;
case 'environment-variable': case 'environment-variable':
$ssoUrl = $this->urlGenerator->getAbsoluteURL('/'); $ssoUrl = $this->urlGenerator->getAbsoluteURL('/');
@ -191,9 +192,12 @@ class SAMLController extends Controller {
/** /**
* @PublicPage * @PublicPage
* @NoCSRFRequired * @NoCSRFRequired
* @param int $idp
* @return Http\DataDownloadResponse
* @throws \OneLogin_Saml2_Error
*/ */
public function getMetadata() { public function getMetadata($idp) {
$settings = new \OneLogin_Saml2_Settings($this->SAMLSettings->getOneLoginSettingsArray()); $settings = new \OneLogin_Saml2_Settings($this->SAMLSettings->getOneLoginSettingsArray($idp));
$metadata = $settings->getSPMetadata(); $metadata = $settings->getSPMetadata();
$errors = $settings->validateMetadata($metadata); $errors = $settings->validateMetadata($metadata);
if (empty($errors)) { if (empty($errors)) {
@ -217,11 +221,12 @@ class SAMLController extends Controller {
*/ */
public function assertionConsumerService() { public function assertionConsumerService() {
$AuthNRequestID = $this->session->get('user_saml.AuthNRequestID'); $AuthNRequestID = $this->session->get('user_saml.AuthNRequestID');
if(is_null($AuthNRequestID) || $AuthNRequestID === '') { $idp = $this->session->get('user_saml.Idp');
if(is_null($AuthNRequestID) || $AuthNRequestID === '' || is_null($idp)) {
return; return;
} }
$auth = new \OneLogin_Saml2_Auth($this->SAMLSettings->getOneLoginSettingsArray()); $auth = new \OneLogin_Saml2_Auth($this->SAMLSettings->getOneLoginSettingsArray($idp));
$auth->processResponse($AuthNRequestID); $auth->processResponse($AuthNRequestID);
$errors = $auth->getErrors(); $errors = $auth->getErrors();
@ -285,7 +290,8 @@ class SAMLController extends Controller {
*/ */
public function singleLogoutService() { public function singleLogoutService() {
if($this->request->passesCSRFCheck()) { if($this->request->passesCSRFCheck()) {
$auth = new \OneLogin_Saml2_Auth($this->SAMLSettings->getOneLoginSettingsArray()); $idp = $this->session->get('user_saml.Idp');
$auth = new \OneLogin_Saml2_Auth($this->SAMLSettings->getOneLoginSettingsArray($idp));
$returnTo = null; $returnTo = null;
$parameters = array(); $parameters = array();
$nameId = $this->session->get('user_saml.samlNameId'); $nameId = $this->session->get('user_saml.samlNameId');