simplesamlphp / simplesamlphp-module-metarefresh

lib/MetaLoader.php

Spacing +55 added lines, -55 removed lines

@@ -108,13 +108,13 @@ 
             try {
                 list($data, $responseHeaders) = \SimpleSAML\Utils\HTTP::fetch($source['src'], $context, true);
             } catch (\Exception $e) {
-                Logger::warning('metarefresh: ' . $e->getMessage());
+                Logger::warning('metarefresh: '.$e->getMessage());
             }
 
             // We have response headers, so the request succeeded
             if (!isset($responseHeaders)) {
                 // No response headers, this means the request failed in some way, so re-use old data
-                Logger::debug('No response from ' . $source['src'] . ' - attempting to re-use cached metadata');
+                Logger::debug('No response from '.$source['src'].' - attempting to re-use cached metadata');
                 $this->addCachedMetadata($source);
                 return;
             } elseif (preg_match('@^HTTP/1\.[01]\s304\s@', $responseHeaders[0])) {
@@ -124,7 +124,7 @@ 
                 return;
             } elseif (!preg_match('@^HTTP/1\.[01]\s200\s@', $responseHeaders[0])) {
                 // Other error
-                Logger::debug('Error from ' . $source['src'] . ' - attempting to re-use cached metadata');
+                Logger::debug('Error from '.$source['src'].' - attempting to re-use cached metadata');
                 $this->addCachedMetadata($source);
                 return;
             }
@@ -143,8 +143,8 @@ 
         try {
             $entities = $this->loadXML($data, $source);
         } catch (\Exception $e) {
-            Logger::debug('XML parser error when parsing ' . $source['src'] . ' - attempting to re-use cached metadata');
-            Logger::debug('XML parser returned: ' . $e->getMessage());
+            Logger::debug('XML parser error when parsing '.$source['src'].' - attempting to re-use cached metadata');
+            Logger::debug('XML parser returned: '.$e->getMessage());
             $this->addCachedMetadata($source);
             return;
         }
@@ -152,14 +152,14 @@ 
         foreach ($entities as $entity) {
             if (isset($source['blacklist'])) {
                 if (!empty($source['blacklist']) && in_array($entity->getEntityId(), $source['blacklist'], true)) {
-                    Logger::info('Skipping "' . $entity->getEntityId() . '" - blacklisted.' . "\n");
+                    Logger::info('Skipping "'.$entity->getEntityId().'" - blacklisted.'."\n");
                     continue;
                 }
             }
 
             if (isset($source['whitelist'])) {
                 if (!empty($source['whitelist']) && !in_array($entity->getEntityId(), $source['whitelist'], true)) {
-                    Logger::info('Skipping "' . $entity->getEntityId() . '" - not in the whitelist.' . "\n");
+                    Logger::info('Skipping "'.$entity->getEntityId().'" - not in the whitelist.'."\n");
                     continue;
                 }
             }
@@ -171,22 +171,22 @@ 
                     continue;
 
                 /* Do a recursive comparison for each whitelist of the attributewhitelist with the idpmetadata for this IdP. At least one of these whitelists should match */
-                $match=0;
-                foreach ($source['attributewhitelist'] as $whitelist)   {
+                $match = 0;
+                foreach ($source['attributewhitelist'] as $whitelist) {
                     if ($this->containsArray($whitelist, $idpmetadata)) {
-                        $match=1;
+                        $match = 1;
                         break;
                     }
                 }
-                if ($match==0) /* No match found -> next IdP */
+                if ($match == 0) /* No match found -> next IdP */
                     continue;
-                Logger::debug('Whitelisted entityID: '. $entity->getEntityID());
+                Logger::debug('Whitelisted entityID: '.$entity->getEntityID());
             }
 
             if (array_key_exists('certificates', $source) && ($source['certificates'] !== null)) {
                 if (!$entity->validateSignature($source['certificates'])) {
                     Logger::info(
-                        'Skipping "' . $entity->getEntityId() . '" - could not verify signature using certificate.' . "\n"
+                        'Skipping "'.$entity->getEntityId().'" - could not verify signature using certificate.'."\n"
                     );
                     continue;
                 }
@@ -226,14 +226,14 @@ 
      */
     private function containsArray($src, $dst) {
         if (is_array($src)) {
-            if (!is_array($dst))    {
+            if (!is_array($dst)) {
                 return false;
             }
-            $dstkeys=array_keys($dst);
+            $dstkeys = array_keys($dst);
 
             /* Loop over all src keys */
-            foreach($src as $srckey => $srcval)    {
-                if (is_int($srckey))    {
+            foreach ($src as $srckey => $srcval) {
+                if (is_int($srckey)) {
                     /* key is number, check that the key appears as one
                      * of the destination keys: if not, then src has
                      * more keys than dst */
@@ -242,10 +242,10 @@ 
 
                     /* loop over dest keys, to find value: we don't know
                      * whether they are in the same order */
-                    $submatch=0;
-                    foreach ($dstkeys as $dstkey)   {
+                    $submatch = 0;
+                    foreach ($dstkeys as $dstkey) {
                         if ($this->containsArray($srcval, $dst[$dstkey])) {
-                            $submatch=1;
+                            $submatch = 1;
                             break;
                         }
                     }
@@ -253,19 +253,19 @@ 
                         return false;
                 } else {
                     /* key is regexp: find matching keys */
-                    $matchingdstkeys=preg_grep($srckey, $dstkeys);
+                    $matchingdstkeys = preg_grep($srckey, $dstkeys);
                     if (!is_array($matchingdstkeys))
                         return false;
 
-                    $match=0;
+                    $match = 0;
                     foreach ($matchingdstkeys as $dstkey) {
                         if ($this->containsArray($srcval, $dst[$dstkey])) {
                             /* Found a match */
-                            $match=1;
+                            $match = 1;
                             break;
                         }
                     }
-                    if ($match==0) /* none of the keys has a matching value */
+                    if ($match == 0) /* none of the keys has a matching value */
                         return false;
                 }
             }
@@ -296,11 +296,11 @@ 
                 $sourceState = $this->state[$source['src']];
 
                 if (isset($sourceState['last-modified'])) {
-                    $rawheader .= 'If-Modified-Since: ' . $sourceState['last-modified'] . "\r\n";
+                    $rawheader .= 'If-Modified-Since: '.$sourceState['last-modified']."\r\n";
                 }
 
                 if (isset($sourceState['etag'])) {
-                    $rawheader .= 'If-None-Match: ' . $sourceState['etag'] . "\r\n";
+                    $rawheader .= 'If-None-Match: '.$sourceState['etag']."\r\n";
                 }
             }
         }
@@ -372,7 +372,7 @@ 
         try {
             $doc = \SAML2\DOMDocumentFactory::fromString($data);
         } catch (\Exception $e) {
-            throw new \Exception('Failed to read XML from ' . $source['src']);
+            throw new \Exception('Failed to read XML from '.$source['src']);
         }
         return \SimpleSAML\Metadata\SAMLParser::parseDescriptorsElement($doc->documentElement);
     }
@@ -386,12 +386,12 @@ 
     public function writeState(): void
     {
         if ($this->changed && !is_null($this->stateFile)) {
-            Logger::debug('Writing: ' . $this->stateFile);
+            Logger::debug('Writing: '.$this->stateFile);
             \SimpleSAML\Utils\System::writeFile(
                 $this->stateFile,
-                "<?php\n/* This file was generated by the metarefresh module at " . $this->getTime() . ".\n" .
-                " Do not update it manually as it will get overwritten. */\n" .
-                '$state = ' . var_export($this->state, true) . ";\n?>\n",
+                "<?php\n/* This file was generated by the metarefresh module at ".$this->getTime().".\n".
+                " Do not update it manually as it will get overwritten. */\n".
+                '$state = '.var_export($this->state, true).";\n?>\n",
                 0644
             );
         }
@@ -406,19 +406,19 @@ 
     public function dumpMetadataStdOut(): void
     {
         foreach ($this->metadata as $category => $elements) {
-            echo '/* The following data should be added to metadata/' . $category . '.php. */' . "\n";
+            echo '/* The following data should be added to metadata/'.$category.'.php. */'."\n";
 
             foreach ($elements as $m) {
                 $filename = $m['filename'];
                 $entityID = $m['metadata']['entityid'];
 
                 echo "\n";
-                echo '/* The following metadata was generated from ' . $filename . ' on ' . $this->getTime() . '. */' . "\n";
-                echo '$metadata[\'' . addslashes($entityID) . '\'] = ' . var_export($m['metadata'], true) . ';' . "\n";
+                echo '/* The following metadata was generated from '.$filename.' on '.$this->getTime().'. */'."\n";
+                echo '$metadata[\''.addslashes($entityID).'\'] = '.var_export($m['metadata'], true).';'."\n";
             }
 
             echo "\n";
-            echo '/* End of data which should be added to metadata/' . $category . '.php. */' . "\n";
+            echo '/* End of data which should be added to metadata/'.$category.'.php. */'."\n";
             echo "\n";
         }
     }
@@ -497,7 +497,7 @@ 
 
         $arpxml = $arp->getXML();
 
-        Logger::info('Writing ARP file: ' . $arpfile . "\n");
+        Logger::info('Writing ARP file: '.$arpfile."\n");
         file_put_contents($arpfile, $arpxml);
     }
 
@@ -515,37 +515,37 @@ 
         }
 
         if (!file_exists($outputDir)) {
-            Logger::info('Creating directory: ' . $outputDir . "\n");
+            Logger::info('Creating directory: '.$outputDir."\n");
             $res = @mkdir($outputDir, 0777, true);
             if ($res === false) {
-                throw new \Exception('Error creating directory: ' . $outputDir);
+                throw new \Exception('Error creating directory: '.$outputDir);
             }
         }
 
         foreach ($this->types as $type) {
-            $filename = $outputDir . '/' . $type . '.php';
+            $filename = $outputDir.'/'.$type.'.php';
 
             if (array_key_exists($type, $this->metadata)) {
                 $elements = $this->metadata[$type];
-                Logger::debug('Writing: ' . $filename);
+                Logger::debug('Writing: '.$filename);
 
-                $content  = '<?php' . "\n" . '/* This file was generated by the metarefresh module at ';
-                $content .= $this->getTime() . "\nDo not update it manually as it will get overwritten\n" . '*/' . "\n";
+                $content  = '<?php'."\n".'/* This file was generated by the metarefresh module at ';
+                $content .= $this->getTime()."\nDo not update it manually as it will get overwritten\n".'*/'."\n";
 
                 foreach ($elements as $m) {
                     $entityID = $m['metadata']['entityid'];
-                    $content .= "\n" . '$metadata[\'';
-                    $content .= addslashes($entityID) . '\'] = ' . var_export($m['metadata'], true) . ';' . "\n";
+                    $content .= "\n".'$metadata[\'';
+                    $content .= addslashes($entityID).'\'] = '.var_export($m['metadata'], true).';'."\n";
                 }
 
-                $content .= "\n" . '?>';
+                $content .= "\n".'?>';
 
                 \SimpleSAML\Utils\System::writeFile($filename, $content, 0644);
             } elseif (is_file($filename)) {
                 if (unlink($filename)) {
-                    Logger::debug('Deleting stale metadata file: ' . $filename);
+                    Logger::debug('Deleting stale metadata file: '.$filename);
                 } else {
-                    Logger::warning('Could not delete stale metadata file: ' . $filename);
+                    Logger::warning('Could not delete stale metadata file: '.$filename);
                 }
             }
         }
@@ -568,8 +568,8 @@ 
                 $entityId = $m['metadata']['entityid'];
 
                 Logger::debug(
-                    'metarefresh: Add metadata entry ' .
-                    var_export($entityId, true) . ' in set ' . var_export($set, true) . '.'
+                    'metarefresh: Add metadata entry '.
+                    var_export($entityId, true).' in set '.var_export($set, true).'.'
                 );
                 $metaHandler->saveMetadata($entityId, $set, $m['metadata']);
             }
@@ -581,19 +581,19 @@ 
             foreach ($metaHandler->getMetadataSet($set) as $entityId => $metadata) {
                 if (!array_key_exists('expire', $metadata)) {
                     Logger::warning(
-                        'metarefresh: Metadata entry without expire timestamp: ' . var_export($entityId, true) .
-                        ' in set ' . var_export($set, true) . '.'
+                        'metarefresh: Metadata entry without expire timestamp: '.var_export($entityId, true).
+                        ' in set '.var_export($set, true).'.'
                     );
                     continue;
                 }
                 if ($metadata['expire'] > $ct) {
                     continue;
                 }
-                Logger::debug('metarefresh: ' . $entityId . ' expired ' . date('l jS \of F Y h:i:s A', $metadata['expire']));
+                Logger::debug('metarefresh: '.$entityId.' expired '.date('l jS \of F Y h:i:s A', $metadata['expire']));
                 Logger::debug(
-                    'metarefresh: Delete expired metadata entry ' .
-                    var_export($entityId, true) . ' in set ' . var_export($set, true) .
-                    '. (' . ($ct - $metadata['expire']) . ' sec)'
+                    'metarefresh: Delete expired metadata entry '.
+                    var_export($entityId, true).' in set '.var_export($set, true).
+                    '. ('.($ct - $metadata['expire']).' sec)'
                 );
                 $metaHandler->deleteMetadata($entityId, $set);
             }

Braces +18 added lines, -9 removed lines

@@ -167,8 +167,10 @@ 
             /* Do we have an attribute whitelist? */
             if (isset($source['attributewhitelist']) && !empty($source['attributewhitelist'])) {
                 $idpmetadata = $entity->getMetadata20IdP();
-                if (!isset($idpmetadata)) /* Skip non-IdPs */
+                if (!isset($idpmetadata)) {
+                    /* Skip non-IdPs */
                     continue;
+                }
 
                 /* Do a recursive comparison for each whitelist of the attributewhitelist with the idpmetadata for this IdP. At least one of these whitelists should match */
                 $match=0;
@@ -178,8 +180,10 @@ 
                         break;
                     }
                 }
-                if ($match==0) /* No match found -> next IdP */
+                if ($match==0) {
+                    /* No match found -> next IdP */
                     continue;
+                }
                 Logger::debug('Whitelisted entityID: '. $entity->getEntityID());
             }
 
@@ -237,8 +241,9 @@ 
                     /* key is number, check that the key appears as one
                      * of the destination keys: if not, then src has
                      * more keys than dst */
-                    if (!array_key_exists($srckey, $dst))
-                        return false;
+                    if (!array_key_exists($srckey, $dst)) {
+                                            return false;
+                    }
 
                     /* loop over dest keys, to find value: we don't know
                      * whether they are in the same order */
@@ -249,13 +254,15 @@ 
                             break;
                         }
                     }
-                    if ($submatch == 0)
-                        return false;
+                    if ($submatch == 0) {
+                                            return false;
+                    }
                 } else {
                     /* key is regexp: find matching keys */
                     $matchingdstkeys=preg_grep($srckey, $dstkeys);
-                    if (!is_array($matchingdstkeys))
-                        return false;
+                    if (!is_array($matchingdstkeys)) {
+                                            return false;
+                    }
 
                     $match=0;
                     foreach ($matchingdstkeys as $dstkey) {
@@ -265,8 +272,10 @@ 
                             break;
                         }
                     }
-                    if ($match==0) /* none of the keys has a matching value */
+                    if ($match==0) {
+                        /* none of the keys has a matching value */
                         return false;
+                    }
                 }
             }
             /* each src key/value matches */