simplesamlphp / simplesamlphp-module-aggregator2

lib/Aggregator.php

Indentation +191 added lines, -191 removed lines

@@ -80,39 +80,39 @@ 
 	protected $cacheGenerated;
 
 
-    /**
-     * An array of entity IDs to exclude from the aggregate.
-     *
-     * @var string[]|null
-     */
-    protected $excluded;
-
-
-    /**
-     * An indexed array of protocols to filter the aggregate by. keys can be any of:
-     *
-     * - urn:oasis:names:tc:SAML:1.1:protocol
-     * - urn:oasis:names:tc:SAML:2.0:protocol
-     *
-     * Values will be true if enabled, false otherwise.
-     *
-     * @var string[]|null
-     */
-    protected $protocols;
-
-
-    /**
-     * An array of roles to filter the aggregate by. Keys can be any of:
-     *
-     * - SAML2_XML_md_IDPSSODescriptor
-     * - SAML2_XML_md_SPSSODescriptor
-     * - SAML2_XML_md_AttributeAuthorityDescriptor
-     *
-     * Values will be true if enabled, false otherwise.
-     *
-     * @var string[]|null
-     */
-    protected $roles;
+	/**
+	 * An array of entity IDs to exclude from the aggregate.
+	 *
+	 * @var string[]|null
+	 */
+	protected $excluded;
+
+
+	/**
+	 * An indexed array of protocols to filter the aggregate by. keys can be any of:
+	 *
+	 * - urn:oasis:names:tc:SAML:1.1:protocol
+	 * - urn:oasis:names:tc:SAML:2.0:protocol
+	 *
+	 * Values will be true if enabled, false otherwise.
+	 *
+	 * @var string[]|null
+	 */
+	protected $protocols;
+
+
+	/**
+	 * An array of roles to filter the aggregate by. Keys can be any of:
+	 *
+	 * - SAML2_XML_md_IDPSSODescriptor
+	 * - SAML2_XML_md_SPSSODescriptor
+	 * - SAML2_XML_md_AttributeAuthorityDescriptor
+	 *
+	 * Values will be true if enabled, false otherwise.
+	 *
+	 * @var string[]|null
+	 */
+	protected $roles;
 
 
 	/**
@@ -207,11 +207,11 @@ 
 			$this->cacheTag = sha1(serialize($config));
 		}
 
-        // configure entity IDs excluded by default
-        $this->excludeEntities($config->getArrayize('exclude', null));
+		// configure entity IDs excluded by default
+		$this->excludeEntities($config->getArrayize('exclude', null));
 
-        // configure filters
-        $this->setFilters($config->getArrayize('filter', null));
+		// configure filters
+		$this->setFilters($config->getArrayize('filter', null));
 
 		$this->validLength = $config->getInteger('valid.length', 7*24*60*60);
 
@@ -523,158 +523,158 @@ 
 	}
 
 
-    /**
-     * Recursively traverse the children of an EntitiesDescriptor, removing those entities listed in the $entities
-     * property. Returns the EntitiesDescriptor with the entities filtered out.
-     *
-     * @param SAML2_XML_md_EntitiesDescriptor $descriptor The EntitiesDescriptor from where to exclude entities.
-     *
-     * @return SAML2_XML_md_EntitiesDescriptor The EntitiesDescriptor with excluded entities filtered out.
-     */
-    protected function exclude(SAML2_XML_md_EntitiesDescriptor $descriptor)
-    {
-        if (empty($this->excluded)) {
-            return $descriptor;
-        }
-
-        $filtered = array();
-        foreach ($descriptor->children as $child) {
-            if ($child instanceof SAML2_XML_md_EntityDescriptor) {
-                if (in_array($child->entityID, $this->excluded)) {
-                    continue;
-                }
-                $filtered[] = $child;
-            }
-
-            if ($child instanceof SAML2_XML_md_EntitiesDescriptor) {
-                $filtered[] = $this->exclude($child);
-            }
-        }
-
-        $descriptor->children = $filtered;
-        return $descriptor;
-    }
-
-
-    /**
-     * Recursively traverse the children of an EntitiesDescriptor, keeping only those entities with the roles listed in
-     * the $roles property, and support for the protocols listed in the $protocols property. Returns the
-     * EntitiesDescriptor containing only those entities.
-     *
-     * @param SAML2_XML_md_EntitiesDescriptor $descriptor The EntitiesDescriptor to filter.
-     *
-     * @return SAML2_XML_md_EntitiesDescriptor The EntitiesDescriptor with only the entities filtered.
-     */
-    protected function filter(SAML2_XML_md_EntitiesDescriptor $descriptor)
-    {
-        if ($this->roles === null || $this->protocols === null) {
-            return $descriptor;
-        }
-
-        $enabled_roles = array_keys($this->roles, true);
-        $enabled_protos = array_keys($this->protocols, true);
-
-        $filtered = array();
-        foreach ($descriptor->children as $child) {
-            if ($child instanceof SAML2_XML_md_EntityDescriptor) {
-                foreach ($child->RoleDescriptor as $role) {
-                    if (in_array(get_class($role), $enabled_roles)) {
-                        // we found a role descriptor that is enabled by our filters, check protocols
-                        if (array_intersect($enabled_protos, $role->protocolSupportEnumeration) !== array()) {
-                            // it supports some protocol we have enabled, add it
-                            $filtered[] = $child;
-                            break;
-                        }
-                    }
-                }
-
-            }
-
-            if ($child instanceof SAML2_XML_md_EntitiesDescriptor) {
-                $filtered[] = $this->filter($child);
-            }
-        }
-
-        $descriptor->children = $filtered;
-        return $descriptor;
-    }
-
-
-    /**
-     * Set this aggregator to exclude a set of entities from the resulting aggregate.
-     *
-     * @param array|null $entities The entity IDs of the entities to exclude.
-     */
-    public function excludeEntities($entities)
-    {
-        assert('is_array($entities) || is_null($entities)');
-
-        if ($entities === null) {
-            return;
-        }
-        $this->excluded = $entities;
-        sort($this->excluded);
-        $this->cacheId = sha1($this->cacheId . serialize($this->excluded));
-    }
-
-
-    /**
-     * Set the internal filters according to one or more options:
-     *
-     * - 'saml2': all SAML2.0-capable entities.
-     * - 'shib13': all SHIB1.3-capable entities.
-     * - 'saml20-idp': all SAML2.0-capable identity providers.
-     * - 'saml20-sp': all SAML2.0-capable service providers.
-     * - 'saml20-aa': all SAML2.0-capable attribute authorities.
-     * - 'shib13-idp': all SHIB1.3-capable identity providers.
-     * - 'shib13-sp': all SHIB1.3-capable service providers.
-     * - 'shib13-aa': all SHIB1.3-capable attribute authorities.
-     *
-     * @param array|null $set An array of the different roles and protocols to filter by.
-     */
-    public function setFilters($set)
-    {
-        assert('is_array($set) || is_null($set)');
-
-        if ($set === null) {
-            return;
-        }
-
-        // configure filters
-        $this->protocols = array(
-            SAML2_Const::NS_SAMLP                  => TRUE,
-            'urn:oasis:names:tc:SAML:1.1:protocol' => TRUE,
-        );
-        $this->roles = array(
-            'SAML2_XML_md_IDPSSODescriptor'             => TRUE,
-            'SAML2_XML_md_SPSSODescriptor'              => TRUE,
-            'SAML2_XML_md_AttributeAuthorityDescriptor' => TRUE,
-        );
-
-        // now translate from the options we have, to specific protocols and roles
-
-        // check SAML 2.0 protocol
-        $options = array('saml2', 'saml20-idp', 'saml20-sp', 'saml20-aa');
-        $this->protocols[SAML2_Const::NS_SAMLP] = (array_intersect($set, $options) !== array());
-
-        // check SHIB 1.3 protocol
-        $options = array('shib13', 'shib13-idp', 'shib13-sp', 'shib13-aa');
-        $this->protocols['urn:oasis:names:tc:SAML:1.1:protocol'] = (array_intersect($set, $options) !== array());
-
-        // check IdP
-        $options = array('saml2', 'shib13', 'saml20-idp', 'shib13-idp');
-        $this->roles['SAML2_XML_md_IDPSSODescriptor'] = (array_intersect($set, $options) !== array());
-
-        // check SP
-        $options = array('saml2', 'shib13', 'saml20-sp', 'shib13-sp');
-        $this->roles['SAML2_XML_md_SPSSODescriptor'] = (array_intersect($set, $options) !== array());
-
-        // check AA
-        $options = array('saml2', 'shib13', 'saml20-aa', 'shib13-aa');
-        $this->roles['SAML2_XML_md_AttributeAuthorityDescriptor'] = (array_intersect($set, $options) !== array());
-
-        $this->cacheId = sha1($this->cacheId . serialize($this->protocols) . serialize($this->roles));
-    }
+	/**
+	 * Recursively traverse the children of an EntitiesDescriptor, removing those entities listed in the $entities
+	 * property. Returns the EntitiesDescriptor with the entities filtered out.
+	 *
+	 * @param SAML2_XML_md_EntitiesDescriptor $descriptor The EntitiesDescriptor from where to exclude entities.
+	 *
+	 * @return SAML2_XML_md_EntitiesDescriptor The EntitiesDescriptor with excluded entities filtered out.
+	 */
+	protected function exclude(SAML2_XML_md_EntitiesDescriptor $descriptor)
+	{
+		if (empty($this->excluded)) {
+			return $descriptor;
+		}
+
+		$filtered = array();
+		foreach ($descriptor->children as $child) {
+			if ($child instanceof SAML2_XML_md_EntityDescriptor) {
+				if (in_array($child->entityID, $this->excluded)) {
+					continue;
+				}
+				$filtered[] = $child;
+			}
+
+			if ($child instanceof SAML2_XML_md_EntitiesDescriptor) {
+				$filtered[] = $this->exclude($child);
+			}
+		}
+
+		$descriptor->children = $filtered;
+		return $descriptor;
+	}
+
+
+	/**
+	 * Recursively traverse the children of an EntitiesDescriptor, keeping only those entities with the roles listed in
+	 * the $roles property, and support for the protocols listed in the $protocols property. Returns the
+	 * EntitiesDescriptor containing only those entities.
+	 *
+	 * @param SAML2_XML_md_EntitiesDescriptor $descriptor The EntitiesDescriptor to filter.
+	 *
+	 * @return SAML2_XML_md_EntitiesDescriptor The EntitiesDescriptor with only the entities filtered.
+	 */
+	protected function filter(SAML2_XML_md_EntitiesDescriptor $descriptor)
+	{
+		if ($this->roles === null || $this->protocols === null) {
+			return $descriptor;
+		}
+
+		$enabled_roles = array_keys($this->roles, true);
+		$enabled_protos = array_keys($this->protocols, true);
+
+		$filtered = array();
+		foreach ($descriptor->children as $child) {
+			if ($child instanceof SAML2_XML_md_EntityDescriptor) {
+				foreach ($child->RoleDescriptor as $role) {
+					if (in_array(get_class($role), $enabled_roles)) {
+						// we found a role descriptor that is enabled by our filters, check protocols
+						if (array_intersect($enabled_protos, $role->protocolSupportEnumeration) !== array()) {
+							// it supports some protocol we have enabled, add it
+							$filtered[] = $child;
+							break;
+						}
+					}
+				}
+
+			}
+
+			if ($child instanceof SAML2_XML_md_EntitiesDescriptor) {
+				$filtered[] = $this->filter($child);
+			}
+		}
+
+		$descriptor->children = $filtered;
+		return $descriptor;
+	}
+
+
+	/**
+	 * Set this aggregator to exclude a set of entities from the resulting aggregate.
+	 *
+	 * @param array|null $entities The entity IDs of the entities to exclude.
+	 */
+	public function excludeEntities($entities)
+	{
+		assert('is_array($entities) || is_null($entities)');
+
+		if ($entities === null) {
+			return;
+		}
+		$this->excluded = $entities;
+		sort($this->excluded);
+		$this->cacheId = sha1($this->cacheId . serialize($this->excluded));
+	}
+
+
+	/**
+	 * Set the internal filters according to one or more options:
+	 *
+	 * - 'saml2': all SAML2.0-capable entities.
+	 * - 'shib13': all SHIB1.3-capable entities.
+	 * - 'saml20-idp': all SAML2.0-capable identity providers.
+	 * - 'saml20-sp': all SAML2.0-capable service providers.
+	 * - 'saml20-aa': all SAML2.0-capable attribute authorities.
+	 * - 'shib13-idp': all SHIB1.3-capable identity providers.
+	 * - 'shib13-sp': all SHIB1.3-capable service providers.
+	 * - 'shib13-aa': all SHIB1.3-capable attribute authorities.
+	 *
+	 * @param array|null $set An array of the different roles and protocols to filter by.
+	 */
+	public function setFilters($set)
+	{
+		assert('is_array($set) || is_null($set)');
+
+		if ($set === null) {
+			return;
+		}
+
+		// configure filters
+		$this->protocols = array(
+			SAML2_Const::NS_SAMLP                  => TRUE,
+			'urn:oasis:names:tc:SAML:1.1:protocol' => TRUE,
+		);
+		$this->roles = array(
+			'SAML2_XML_md_IDPSSODescriptor'             => TRUE,
+			'SAML2_XML_md_SPSSODescriptor'              => TRUE,
+			'SAML2_XML_md_AttributeAuthorityDescriptor' => TRUE,
+		);
+
+		// now translate from the options we have, to specific protocols and roles
+
+		// check SAML 2.0 protocol
+		$options = array('saml2', 'saml20-idp', 'saml20-sp', 'saml20-aa');
+		$this->protocols[SAML2_Const::NS_SAMLP] = (array_intersect($set, $options) !== array());
+
+		// check SHIB 1.3 protocol
+		$options = array('shib13', 'shib13-idp', 'shib13-sp', 'shib13-aa');
+		$this->protocols['urn:oasis:names:tc:SAML:1.1:protocol'] = (array_intersect($set, $options) !== array());
+
+		// check IdP
+		$options = array('saml2', 'shib13', 'saml20-idp', 'shib13-idp');
+		$this->roles['SAML2_XML_md_IDPSSODescriptor'] = (array_intersect($set, $options) !== array());
+
+		// check SP
+		$options = array('saml2', 'shib13', 'saml20-sp', 'shib13-sp');
+		$this->roles['SAML2_XML_md_SPSSODescriptor'] = (array_intersect($set, $options) !== array());
+
+		// check AA
+		$options = array('saml2', 'shib13', 'saml20-aa', 'shib13-aa');
+		$this->roles['SAML2_XML_md_AttributeAuthorityDescriptor'] = (array_intersect($set, $options) !== array());
+
+		$this->cacheId = sha1($this->cacheId . serialize($this->protocols) . serialize($this->roles));
+	}
 
 	/**
 	 * Retrieve the complete, signed metadata as text.
@@ -687,8 +687,8 @@ 
 	public function updateCachedMetadata() {
 
 		$ed = $this->getEntitiesDescriptor();
-        $ed = $this->exclude($ed);
-        $ed = $this->filter($ed);
+		$ed = $this->exclude($ed);
+		$ed = $this->filter($ed);
 		$this->addSignature($ed);
 
 		$xml = $ed->toXML();

Spacing +3 added lines, -3 removed lines

@@ -240,7 +240,7 @@ 
 
 		$this->signAlg = $config->getString('sign.algorithm', XMLSecurityKey::RSA_SHA1);
 		if (!in_array($this->signAlg, self::$SUPPORTED_SIGNATURE_ALGORITHMS)) {
-			throw new SimpleSAML_Error_Exception('Unsupported signature algorithm '. var_export($this->signAlg, TRUE));
+			throw new SimpleSAML_Error_Exception('Unsupported signature algorithm ' . var_export($this->signAlg, TRUE));
 		}
 
 		$this->sslCAFile = $config->getString('ssl.cafile', NULL);
@@ -311,7 +311,7 @@ 
 			return;
 		}
 
-		$expireInfo = (string)$expires;
+		$expireInfo = (string) $expires;
 		if ($tag !== NULL) {
 			$expireInfo .= ':' . $tag;
 		}
@@ -354,7 +354,7 @@ 
 
 		$expireData = explode(':', $expireData, 2);
 
-		$expireTime = (int)$expireData[0];
+		$expireTime = (int) $expireData[0];
 		if ($expireTime <= time()) {
 			return FALSE;
 		}

templates/list.php

Indentation +20 added lines, -20 removed lines

@@ -5,29 +5,29 @@
 
 <?php
 if (count($this->data['sources']) === 0) {
-    echo "    <p>".$this->t('{aggregator2:aggregator:no_aggregators}')."</p>\n";
+	echo "    <p>".$this->t('{aggregator2:aggregator:no_aggregators}')."</p>\n";
 } else {
-    echo "    <ul>";
+	echo "    <ul>";
 
-    foreach ($this->data['sources'] as $id => $source) {
-        $encId = urlencode($id);
-        $params = array(
-            'id' => $encId,
-        );
-        echo str_repeat(' ', 8)."<li>\n";
-        echo str_repeat(' ', 12).'<a href="';
-        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params).'">'.htmlspecialchars($id)."</a>\n";
-        echo str_repeat(' ', 12).'<a href="';
-        $params['mimetype'] = 'text/plain';
-        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params).'">['.
-            $this->t('{aggregator2:aggregator:text}')."]</a>\n";
-        echo str_repeat(' ', 12).'<a href="';
-        $params['mimetype'] = 'application/xml';
-        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params)."\">[XML]</a>\n";
-        echo str_repeat(' ', 8)."</li>\n";
-    }
+	foreach ($this->data['sources'] as $id => $source) {
+		$encId = urlencode($id);
+		$params = array(
+			'id' => $encId,
+		);
+		echo str_repeat(' ', 8)."<li>\n";
+		echo str_repeat(' ', 12).'<a href="';
+		echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params).'">'.htmlspecialchars($id)."</a>\n";
+		echo str_repeat(' ', 12).'<a href="';
+		$params['mimetype'] = 'text/plain';
+		echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params).'">['.
+			$this->t('{aggregator2:aggregator:text}')."]</a>\n";
+		echo str_repeat(' ', 12).'<a href="';
+		$params['mimetype'] = 'application/xml';
+		echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params)."\">[XML]</a>\n";
+		echo str_repeat(' ', 8)."</li>\n";
+	}
 
-    echo "    </ul>\n";
+	echo "    </ul>\n";
 }
 
 $this->includeAtTemplateBase('includes/footer.php');

Spacing +10 added lines, -10 removed lines

@@ -5,7 +5,7 @@ 
 
 <?php
 if (count($this->data['sources']) === 0) {
-    echo "    <p>".$this->t('{aggregator2:aggregator:no_aggregators}')."</p>\n";
+    echo "    <p>" . $this->t('{aggregator2:aggregator:no_aggregators}') . "</p>\n";
 } else {
     echo "    <ul>";
 
@@ -14,17 +14,17 @@ 
         $params = array(
             'id' => $encId,
         );
-        echo str_repeat(' ', 8)."<li>\n";
-        echo str_repeat(' ', 12).'<a href="';
-        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params).'">'.htmlspecialchars($id)."</a>\n";
-        echo str_repeat(' ', 12).'<a href="';
+        echo str_repeat(' ', 8) . "<li>\n";
+        echo str_repeat(' ', 12) . '<a href="';
+        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params) . '">' . htmlspecialchars($id) . "</a>\n";
+        echo str_repeat(' ', 12) . '<a href="';
         $params['mimetype'] = 'text/plain';
-        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params).'">['.
-            $this->t('{aggregator2:aggregator:text}')."]</a>\n";
-        echo str_repeat(' ', 12).'<a href="';
+        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params) . '">[' .
+            $this->t('{aggregator2:aggregator:text}') . "]</a>\n";
+        echo str_repeat(' ', 12) . '<a href="';
         $params['mimetype'] = 'application/xml';
-        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params)."\">[XML]</a>\n";
-        echo str_repeat(' ', 8)."</li>\n";
+        echo SimpleSAML\Module::getModuleURL('aggregator2/get.php', $params) . "\">[XML]</a>\n";
+        echo str_repeat(' ', 8) . "</li>\n";
     }
 
     echo "    </ul>\n";

hooks/hook_frontpage.php

Indentation +6 added lines, -6 removed lines

@@ -5,12 +5,12 @@
  * @param array &$links The links on the frontpage, split into sections.
  */
 function aggregator2_hook_frontpage(&$links) {
-    assert('is_array($links)');
-    assert('array_key_exists("links", $links)');
+	assert('is_array($links)');
+	assert('array_key_exists("links", $links)');
 
-    $links['federation'][] = array(
-        'href' => SimpleSAML\Module::getModuleURL('aggregator2/'),
-        'text' => '{aggregator2:aggregator:frontpage_link}',
-    );
+	$links['federation'][] = array(
+		'href' => SimpleSAML\Module::getModuleURL('aggregator2/'),
+		'text' => '{aggregator2:aggregator:frontpage_link}',
+	);
 
 }

www/get.php

Indentation +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 
 if (!isset($_REQUEST['id'])) {
-    throw new SimpleSAML_Error_BadRequest('Missing required parameter "id".');
+	throw new SimpleSAML_Error_BadRequest('Missing required parameter "id".');
 }
 $id = (string) $_REQUEST['id'];
 
 $set = null;
 if (isset($_REQUEST['set'])) {
-    $set = explode(',', $_REQUEST['set']);
+	$set = explode(',', $_REQUEST['set']);
 }
 
 $excluded_entities = null;
 if (isset($_REQUEST['exclude'])) {
-    $excluded_entities = explode(',', $_REQUEST['exclude']);
+	$excluded_entities = explode(',', $_REQUEST['exclude']);
 }
 
 $aggregator = sspmod_aggregator2_Aggregator::getAggregator($id);
@@ -22,17 +22,17 @@ 
 
 $mimetype = 'application/samlmetadata+xml';
 $allowedmimetypes = array(
-    'text/plain',
-    'application/samlmetadata-xml',
-    'application/xml',
+	'text/plain',
+	'application/samlmetadata-xml',
+	'application/xml',
 );
 
 if (isset($_GET['mimetype']) && in_array($_GET['mimetype'], $allowedmimetypes)) {
-    $mimetype = $_GET['mimetype'];
+	$mimetype = $_GET['mimetype'];
 }
 
 if ($mimetype === 'text/plain') {
-    $xml = SimpleSAML_Utilities::formatXMLString($xml);
+	$xml = SimpleSAML_Utilities::formatXMLString($xml);
 }
 
 header('Content-Type: '.$mimetype);

Spacing +2 added lines, -2 removed lines

@@ -35,13 +35,13 @@
     $xml = SimpleSAML_Utilities::formatXMLString($xml);
 }
 
-header('Content-Type: '.$mimetype);
+header('Content-Type: ' . $mimetype);
 header('Content-Length: ' . strlen($xml));
 
 /*
  * At this point, if the ID was forged, getMetadata() would
  * have failed to find a valid metadata set, so we can trust it.
  */
-header('Content-Disposition: filename='.$id.'.xml');
+header('Content-Disposition: filename=' . $id . '.xml');
 
 echo $xml;