From c6ad1a08abe50f38f8ad52fa3647994007d70e57 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Thu, 24 May 2018 07:06:21 +0000
Subject: [PATCH] Use strict in_array comparisons also for recently merged code
---
modules/core/lib/Auth/Process/Cardinality.php | 2 +-
modules/core/lib/Auth/Process/CardinalitySingle.php | 2 +-
modules/metarefresh/lib/MetaLoader.php | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modules/core/lib/Auth/Process/Cardinality.php b/modules/core/lib/Auth/Process/Cardinality.php
index 74d330f00..88b44f336 100644
--- a/modules/core/lib/Auth/Process/Cardinality.php
+++ b/modules/core/lib/Auth/Process/Cardinality.php
@@ -97,7 +97,7 @@ class sspmod_core_Auth_Process_Cardinality extends SimpleSAML_Auth_ProcessingFil
if (array_key_exists('Source', $request) && array_key_exists('entityid', $request['Source'])) {
$entityid = $request['Source']['entityid'];
}
- if (in_array($entityid, $this->ignoreEntities)) {
+ if (in_array($entityid, $this->ignoreEntities, true)) {
SimpleSAML\Logger::debug('Cardinality: Ignoring assertions from '.$entityid);
return;
}
diff --git a/modules/core/lib/Auth/Process/CardinalitySingle.php b/modules/core/lib/Auth/Process/CardinalitySingle.php
index 459d57d8b..a8dbb3c56 100644
--- a/modules/core/lib/Auth/Process/CardinalitySingle.php
+++ b/modules/core/lib/Auth/Process/CardinalitySingle.php
@@ -70,7 +70,7 @@ class sspmod_core_Auth_Process_CardinalitySingle extends SimpleSAML_Auth_Process
if (array_key_exists('Source', $request) &&
array_key_exists('entityid', $request['Source']) &&
- in_array($request['Source']['entityid'], $this->ignoreEntities)
+ in_array($request['Source']['entityid'], $this->ignoreEntities, true)
) {
SimpleSAML\Logger::debug('CardinalitySingle: Ignoring assertions from '.$request['Source']['entityid']);
return;
diff --git a/modules/metarefresh/lib/MetaLoader.php b/modules/metarefresh/lib/MetaLoader.php
index 5554c017f..0635cdd61 100644
--- a/modules/metarefresh/lib/MetaLoader.php
+++ b/modules/metarefresh/lib/MetaLoader.php
@@ -166,19 +166,19 @@ class sspmod_metarefresh_MetaLoader
$template = $source['template'];
}
- if (in_array('shib13-sp-remote', $this->types)) {
+ if (in_array('shib13-sp-remote', $this->types, true)) {
$this->addMetadata($source['src'], $entity->getMetadata1xSP(), 'shib13-sp-remote', $template);
}
- if (in_array('shib13-idp-remote', $this->types)) {
+ if (in_array('shib13-idp-remote', $this->types, true)) {
$this->addMetadata($source['src'], $entity->getMetadata1xIdP(), 'shib13-idp-remote', $template);
}
- if (in_array('saml20-sp-remote', $this->types)) {
+ if (in_array('saml20-sp-remote', $this->types, true)) {
$this->addMetadata($source['src'], $entity->getMetadata20SP(), 'saml20-sp-remote', $template);
}
- if (in_array('saml20-idp-remote', $this->types)) {
+ if (in_array('saml20-idp-remote', $this->types, true)) {
$this->addMetadata($source['src'], $entity->getMetadata20IdP(), 'saml20-idp-remote', $template);
}
- if (in_array('attributeauthority-remote', $this->types)) {
+ if (in_array('attributeauthority-remote', $this->types, true)) {
$attributeAuthorities = $entity->getAttributeAuthorities();
if (!empty($attributeAuthorities)) {
$this->addMetadata($source['src'], $attributeAuthorities[0], 'attributeauthority-remote', $template);
--
GitLab