From 18885b313e6444363484e7b8b4dabd133d4ca68c Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 24 May 2022 10:24:53 +0200
Subject: [PATCH] Fix Scrutinizer issues
---
modules/saml/lib/Controller/Metadata.php | 3 ++-
modules/saml/lib/Controller/SingleLogout.php | 2 +-
modules/saml/lib/Controller/WebBrowserSingleSignOn.php | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/saml/lib/Controller/Metadata.php b/modules/saml/lib/Controller/Metadata.php
index 15bb343e7..b4ff1428f 100644
--- a/modules/saml/lib/Controller/Metadata.php
+++ b/modules/saml/lib/Controller/Metadata.php
@@ -13,6 +13,7 @@ use SimpleSAML\Module;
use SimpleSAML\Module\saml\IdP\SAML2 as SAML2_IdP;
use SimpleSAML\Utils;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
use function strpos;
use function strrpos;
@@ -73,7 +74,7 @@ class Metadata
}
// check if valid local session exists
- if ($config->getOptionalBoolean('admin.protectmetadata', false)) {
+ if ($this->config->getOptionalBoolean('admin.protectmetadata', false)) {
return new RunnableResponse([$this->authUtils, 'requireAdmin']);
}
diff --git a/modules/saml/lib/Controller/SingleLogout.php b/modules/saml/lib/Controller/SingleLogout.php
index f5f9e344a..90195a322 100644
--- a/modules/saml/lib/Controller/SingleLogout.php
+++ b/modules/saml/lib/Controller/SingleLogout.php
@@ -89,7 +89,7 @@ class SingleLogout
{
Logger::info('SAML2.0 - IdP.initSLO: Accessing SAML 2.0 IdP endpoint init Single Logout');
- if ($this->config->getOptionalBoolean('enable.saml20-idp') === false || !Module::isModuleEnabled('saml')) {
+ if ($this->config->getBoolean('enable.saml20-idp') === false || !Module::isModuleEnabled('saml')) {
throw new Error\Error('NOACCESS', null, 403);
}
diff --git a/modules/saml/lib/Controller/WebBrowserSingleSignOn.php b/modules/saml/lib/Controller/WebBrowserSingleSignOn.php
index 5cac59c8a..7a996cd4e 100644
--- a/modules/saml/lib/Controller/WebBrowserSingleSignOn.php
+++ b/modules/saml/lib/Controller/WebBrowserSingleSignOn.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace SimpleSAML\Module\saml\Controller;
+use Exception;
use SAML2\Exception\Protocol\UnsupportedBindingException;
use SAML2\ArtifactResolve;
use SAML2\ArtifactResponse;
--
GitLab