Inspection of "Merge branch 'master' into release_2_1" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — release_2_1 ( 1471d5...cd1bdf )

by Tomasz

created 2024-11-27 10:43 UTC

Status

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -16,12 +16,12 @@
 block discarded – undo
  * License: see the web/copyright.inc.php file in the file structure or
  *          <base_url>/copyright.php after deploying the software
  */?>
-<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1>
-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1>
+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
-<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
+<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
 <pre>
-    <?php print_r($statusInfo);?>
+    <?php print_r($statusInfo); ?>
 </pre>

Please login to merge, or discard this patch.

web/skins/example/index.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -20,7 +20,7 @@
 block discarded – undo
  */
 ?>
 <h1>Example Skin (main user frontpage)</h1>
-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>

Please login to merge, or discard this patch.

web/tou.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
  * @package UserGUI
  * 
  */
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 $loggerInstance = new \core\common\Logging();
 $langObject = new \core\common\Language();
 $cat = new \core\CAT();
@@ -51,9 +51,9 @@  discard block
 block discarded – undo
     <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
         <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
 
-        <div id="motd"><?php print ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
+        <div id="motd"><?php print (isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
 
-        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
+        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
         <div id="tou">
             <?php
             require "user/tou.php";
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
         </div>
         <div>
             <table style='width:100%'>
-                <caption><?php echo "Legalese";?></caption>
+                <caption><?php echo "Legalese"; ?></caption>
                 <tr>
-                    <th class='wai-invisible' scope='col'><?php echo "Copyright";?></th>
-                    <th class='wai-invisible' scope='col'><?php echo "Privacy Notice";?></th>
-                    <th class='wai-invisible' scope='col'><?php echo "Attribution";?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Copyright"; ?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Privacy Notice"; ?></th>
+                    <th class='wai-invisible' scope='col'><?php echo "Attribution"; ?></th>
                 </tr>
                 <tr>
                     <td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
                     </td>
                     <?php
                     if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
-                        $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['name']) . "</a></td>";
+                        $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['name'])."</a></td>";
                     }
                     ?>
                     <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>

Please login to merge, or discard this patch.

web/admin/action_generate_zone.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
     "nl" => "_radsec._tcp.eduroam.nl.",
     ];
     foreach ($cat->getSuperglueZone() as $oneEntry) {
-        foreach (explode(',',$oneEntry['inst_realm']) as $oneRealm) {
+        foreach (explode(',', $oneEntry['inst_realm']) as $oneRealm) {
             $target = "_radsec._somewhere.eduroam.org";
             foreach ($NROs as $tld => $nroTarget) {
                 if (preg_match("/$tld$/", $oneRealm)) {

Please login to merge, or discard this patch.

web/admin/sanity_tests.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $Tests = [
     'Directories',
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 
 $uiElements = new \web\lib\admin\UIElements();
 
-if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
+if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
     $Tests[] = 'Makensis';
     $Tests[] = 'Makensis=>NSISmodules';
 }

Please login to merge, or discard this patch.

config/Diagnostics-template.php 2 patches

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -34,13 +34,13 @@
 block discarded – undo
  */
 class Diagnostics
 {
-         /**
-         * Various paths.
-         * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
-         * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
-         *   See also NSIS_VERSION further down
-         * @var array
-         */
+            /**
+             * Various paths.
+             * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
+             * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
+             *   See also NSIS_VERSION further down
+             * @var array
+             */
         const PATHS = [
             'c_rehash' => 'c_rehash',
             'eapol_test' => 'eapol_test',

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -125,6 +125,6 @@
 block discarded – undo
         ];
         const TIMEOUTS = [
             'ajax_radius_tests' => 15000, // miliseconds
-            'crl_download' => 10,         // seconds
+            'crl_download' => 10, // seconds
         ];
 }

Please login to merge, or discard this patch.

core/CertificationAuthorityEmbeddedRSA.php 1 patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -16,10 +16,10 @@  discard block
 block discarded – undo
 class CertificationAuthorityEmbeddedRSA extends EntityWithDBProperties implements CertificationAuthorityInterface
 {
 
-    private const LOCATION_ROOT_CA = ROOT . "/config/SilverbulletClientCerts/rootca-RSA.pem";
-    private const LOCATION_ISSUING_CA = ROOT . "/config/SilverbulletClientCerts/real-RSA.pem";
-    private const LOCATION_ISSUING_KEY = ROOT . "/config/SilverbulletClientCerts/real-RSA.key";
-    private const LOCATION_CONFIG = ROOT . "/config/SilverbulletClientCerts/openssl-RSA.cnf";
+    private const LOCATION_ROOT_CA = ROOT."/config/SilverbulletClientCerts/rootca-RSA.pem";
+    private const LOCATION_ISSUING_CA = ROOT."/config/SilverbulletClientCerts/real-RSA.pem";
+    private const LOCATION_ISSUING_KEY = ROOT."/config/SilverbulletClientCerts/real-RSA.key";
+    private const LOCATION_CONFIG = ROOT."/config/SilverbulletClientCerts/openssl-RSA.cnf";
 
     /**
      * string with the PEM variant of the root CA
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
         parent::__construct();
         $this->rootPem = file_get_contents(CertificationAuthorityEmbeddedRSA::LOCATION_ROOT_CA);
         if ($this->rootPem === FALSE) {
-            throw new Exception("Root CA PEM file not found: " . CertificationAuthorityEmbeddedRSA::LOCATION_ROOT_CA);
+            throw new Exception("Root CA PEM file not found: ".CertificationAuthorityEmbeddedRSA::LOCATION_ROOT_CA);
         }
         $this->issuingCertRaw = file_get_contents(CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA);
         if ($this->issuingCertRaw === FALSE) {
-            throw new Exception("Issuing CA PEM file not found: " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA);
+            throw new Exception("Issuing CA PEM file not found: ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA);
         }
         $rootParsed = openssl_x509_read($this->rootPem);
         $issuingCertCandidate = openssl_x509_read($this->issuingCertRaw);
@@ -80,15 +80,15 @@  discard block
 block discarded – undo
         }
         $this->issuingCert = $issuingCertCandidate;
         if (stat(CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY) === FALSE) {
-            throw new Exception("Private key not found: " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY);
+            throw new Exception("Private key not found: ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY);
         }
-        $issuingKeyTemp = openssl_pkey_get_private("file://" . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY);
+        $issuingKeyTemp = openssl_pkey_get_private("file://".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY);
         if ($issuingKeyTemp === FALSE || is_resource($issuingKeyTemp)) {
             throw new Exception("The private key did not parse correctly (or is not a PHP8 object)!");
         }
         $this->issuingKey = $issuingKeyTemp;
         if (stat(CertificationAuthorityEmbeddedRSA::LOCATION_CONFIG) === FALSE) {
-            throw new Exception("openssl configuration not found: " . CertificationAuthorityEmbeddedRSA::LOCATION_CONFIG);
+            throw new Exception("openssl configuration not found: ".CertificationAuthorityEmbeddedRSA::LOCATION_CONFIG);
         }
         $this->conffile = CertificationAuthorityEmbeddedRSA::LOCATION_CONFIG;
     }
@@ -131,27 +131,27 @@  discard block
 block discarded – undo
         // generate stub index.txt file
         $tempdirArray = \core\common\Entity::createTemporaryDirectory("test");
         $tempdir = $tempdirArray['dir'];
-        $nowIndexTxt = (new \DateTime())->format("ymdHis") . "Z";
-        $expiryIndexTxt = $originalExpiry->format("ymdHis") . "Z";
+        $nowIndexTxt = (new \DateTime())->format("ymdHis")."Z";
+        $expiryIndexTxt = $originalExpiry->format("ymdHis")."Z";
         // serials for our CA are always integers
         $serialHex = strtoupper(dechex((int) $cert->serial));
         if (strlen($serialHex) % 2 == 1) {
-            $serialHex = "0" . $serialHex;
+            $serialHex = "0".$serialHex;
         }
 
-        $indexStatement = "$certstatus\t$expiryIndexTxt\t" . ($certstatus == "R" ? "$nowIndexTxt,unspecified" : "") . "\t$serialHex\tunknown\t/O=" . \config\ConfAssistant::CONSORTIUM['name'] . "/OU=$federation/CN=$cert->username\n";
+        $indexStatement = "$certstatus\t$expiryIndexTxt\t".($certstatus == "R" ? "$nowIndexTxt,unspecified" : "")."\t$serialHex\tunknown\t/O=".\config\ConfAssistant::CONSORTIUM['name']."/OU=$federation/CN=$cert->username\n";
         $this->loggerInstance->debug(4, "index.txt contents-to-be: $indexStatement");
-        if (!file_put_contents($tempdir . "/index.txt", $indexStatement)) {
+        if (!file_put_contents($tempdir."/index.txt", $indexStatement)) {
             $this->loggerInstance->debug(1, "Unable to write openssl index.txt file for revocation handling!");
         }
         // index.txt.attr is dull but needs to exist
-        file_put_contents($tempdir . "/index.txt.attr", "unique_subject = yes\n");
+        file_put_contents($tempdir."/index.txt.attr", "unique_subject = yes\n");
         // call "openssl ocsp" to manufacture our own OCSP statement
         // adding "-rmd sha1" to the following command-line makes the
         // choice of signature algorithm for the response explicit
         // but it's only available from openssl-1.1.0 (which we do not
         // want to require just for that one thing).
-        $execCmd = \config\Master::PATHS['openssl'] . " ocsp -issuer " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA . " -sha1 -ndays 10 -no_nonce -serial 0x$serialHex -CA " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA . " -rsigner " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA . " -rkey " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY . " -index $tempdir/index.txt -no_cert_verify -respout $tempdir/$serialHex.response.der";
+        $execCmd = \config\Master::PATHS['openssl']." ocsp -issuer ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA." -sha1 -ndays 10 -no_nonce -serial 0x$serialHex -CA ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA." -rsigner ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA." -rkey ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY." -index $tempdir/index.txt -no_cert_verify -respout $tempdir/$serialHex.response.der";
         $this->loggerInstance->debug(2, "Calling openssl ocsp with following cmdline: $execCmd\n");
         $output = [];
         $return = 999;
@@ -159,11 +159,11 @@  discard block
 block discarded – undo
         if ($return !== 0) {
             throw new Exception("Non-zero return value from openssl ocsp!");
         }
-        $ocsp = file_get_contents($tempdir . "/$serialHex.response.der");
+        $ocsp = file_get_contents($tempdir."/$serialHex.response.der");
         // remove the temp dir!
-        unlink($tempdir . "/$serialHex.response.der");
-        unlink($tempdir . "/index.txt.attr");
-        unlink($tempdir . "/index.txt");
+        unlink($tempdir."/$serialHex.response.der");
+        unlink($tempdir."/index.txt.attr");
+        unlink($tempdir."/index.txt");
         rmdir($tempdir);
         $this->databaseHandle->exec("UPDATE silverbullet_certificate SET OCSP = ?, OCSP_timestamp = NOW() WHERE serial_number = ?", "si", $ocsp, $cert->serial);
         return $ocsp;

Please login to merge, or discard this patch.

web/admin/inc/filepreview.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 ?>
 <?php
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $validator = new \web\lib\common\InputValidation();
 $idRaw = $_GET["id"] ?? "";
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
         // Set data type and caching for 30 days
         $info = new finfo();
         $filetype = $info->buffer($finalBlob, FILEINFO_MIME_TYPE);
-        header("Content-type: " . $filetype);
+        header("Content-type: ".$filetype);
 
         switch ($filetype) {
             case "text/rtf": // fall-through, same treatment
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
         header("Cache-Control: must-revalidate");
         $offset = 60 * 60 * 24 * 30;
         // gmdate can't possibly fail, because it operates on time() and an integer offset
-        $ExpStr = "Expires: " . /** @scrutinizer ignore-type */ gmdate("D, d M Y H:i:s", time() + $offset) . " GMT";
+        $ExpStr = "Expires: "./** @scrutinizer ignore-type */ gmdate("D, d M Y H:i:s", time() + $offset)." GMT";
         header($ExpStr);
         //  Print out the image
         echo $finalBlob;

Please login to merge, or discard this patch.

web/admin/inc/userStats.inc.php 1 patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
  * ******************************************************************************
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $auth->authenticate();
@@ -29,31 +29,31 @@  discard block
 block discarded – undo
 ?>
 
 <h1><?php $tablecaption = _("User Authentication Records"); echo $tablecaption; ?></h1>
-<p><?php echo _("Note that:");?></p>
+<p><?php echo _("Note that:"); ?></p>
 <ul>
-    <li><?php echo _("Authentication records are deleted after six months retention time");?></li>
-    <li><?php echo _("Operator Domain is based on the RADIUS attribute 'Operator-Name' and not sent by all hotspots");?></li>
-    <li><?php echo _("Different MAC addresses per credential may be due to MAC Address randomisation in recent operating systems");?></li>
+    <li><?php echo _("Authentication records are deleted after six months retention time"); ?></li>
+    <li><?php echo _("Operator Domain is based on the RADIUS attribute 'Operator-Name' and not sent by all hotspots"); ?></li>
+    <li><?php echo _("Different MAC addresses per credential may be due to MAC Address randomisation in recent operating systems"); ?></li>
 </ul>
 <table class='authrecord'>
-    <caption><?php echo $tablecaption;?></caption>
+    <caption><?php echo $tablecaption; ?></caption>
     <tr>
-        <th scope="col"><strong><?php echo _("Timestamp");?></strong></th>
-        <th scope="col"><strong><?php echo _("Credential");?></strong></th>
-        <th scope="col"><strong><?php echo _("MAC Address");?></strong></th>
-        <th scope="col"><strong><?php echo _("Result");?></strong></th>
-        <th scope="col"><strong><?php echo _("Operator Domain");?></strong></th>
+        <th scope="col"><strong><?php echo _("Timestamp"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Credential"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Result"); ?></strong></th>
+        <th scope="col"><strong><?php echo _("Operator Domain"); ?></strong></th>
     </tr>
     <?php
     $userAuthData = $profile->getUserAuthRecords($userInt);
     foreach ($userAuthData as $oneRecord) {
-        echo "<tr class='".($oneRecord['RESULT'] == "Access-Accept" ? "auth-success" : "auth-fail" )."'>"
+        echo "<tr class='".($oneRecord['RESULT'] == "Access-Accept" ? "auth-success" : "auth-fail")."'>"
                 . "<td>".$oneRecord['TIMESTAMP']."</td>"
                 // $oneRecord['CN'] is a simple string, not an array, so disable Scrutinizer type check here
-                . "<td>"./** @scrutinizer ignore-type */ substr_replace($oneRecord['CN'], "@…", strpos($oneRecord['CN'],"@"))."</td>"
+                . "<td>"./** @scrutinizer ignore-type */ substr_replace($oneRecord['CN'], "@…", strpos($oneRecord['CN'], "@"))."</td>"
                 . "<td>".$oneRecord['MAC']."</td>"
                 . "<td>".($oneRecord['RESULT'] == "Access-Accept" ? _("Success") : _("Failure"))."</td>"
-                . "<td>".substr($oneRecord['OPERATOR'] ?? "1(unknown)",1)."</td>"
+                . "<td>".substr($oneRecord['OPERATOR'] ?? "1(unknown)", 1)."</td>"
                 . "</tr>";
     }
     ?>

Please login to merge, or discard this patch.

		@@ -16,12 +16,12 @@
		block discarded – undo
16	16	* License: see the web/copyright.inc.php file in the file structure or
17	17	* <base_url>/copyright.php after deploying the software
18	18	*/?>
19		-<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1>
20		-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
	19	+<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1>
	20	+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
21	21	<p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
22	22	<p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
23		-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
24		-<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
	23	+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
	24	+<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
25	25	<pre>
26		- <?php print_r($statusInfo);?>
	26	+ <?php print_r($statusInfo); ?>
27	27	</pre>

		@@ -20,7 +20,7 @@
		block discarded – undo
20	20	*/
21	21	?>
22	22	<h1>Example Skin (main user frontpage)</h1>
23		-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
	23	+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
24	24	<p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
25	25	<p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
26		-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
	26	+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	* @package UserGUI
28	28	*
29	29	*/
30		-require dirname(dirname(__FILE__)) . "/config/_config.php";
	30	+require dirname(dirname(__FILE__))."/config/_config.php";
31	31	$loggerInstance = new \core\common\Logging();
32	32	$langObject = new \core\common\Language();
33	33	$cat = new \core\CAT();
		@@ -51,9 +51,9 @@ discard block
		block discarded – undo
51	51	<body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
52	52	<img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
53	53
54		- <div id="motd"><?php print ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
	54	+ <div id="motd"><?php print (isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp'); ?></div>
55	55
56		- <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
	56	+ <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo \config\Master::APPEARANCE['productname']; ?></a></h1>
57	57	<div id="tou">
58	58	<?php
59	59	require "user/tou.php";
		@@ -61,11 +61,11 @@ discard block
		block discarded – undo
61	61	</div>
62	62	<div>
63	63	<table style='width:100%'>
64		- <caption><?php echo "Legalese";?></caption>
	64	+ <caption><?php echo "Legalese"; ?></caption>
65	65	<tr>
66		- <th class='wai-invisible' scope='col'><?php echo "Copyright";?></th>
67		- <th class='wai-invisible' scope='col'><?php echo "Privacy Notice";?></th>
68		- <th class='wai-invisible' scope='col'><?php echo "Attribution";?></th>
	66	+ <th class='wai-invisible' scope='col'><?php echo "Copyright"; ?></th>
	67	+ <th class='wai-invisible' scope='col'><?php echo "Privacy Notice"; ?></th>
	68	+ <th class='wai-invisible' scope='col'><?php echo "Attribution"; ?></th>
69	69	</tr>
70	70	<tr>
71	71	<td style='padding-left:20px; padding-right:20px; text-align:left; vertical-align:top;'>
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	</td>
74	74	<?php
75	75	if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
76		- $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),\config\ConfAssistant::CONSORTIUM['name']) . "</a></td>";
	76	+ $retval .= "<td><a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), \config\ConfAssistant::CONSORTIUM['name'])."</a></td>";
77	77	}
78	78	?>
79	79	<td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	*/
27	27	?>
28	28	<?php
29		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	29	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
30	30
31	31	$auth = new \web\lib\admin\Authentication();
32	32	$deco = new \web\lib\admin\PageDecoration();
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	"nl" => "_radsec._tcp.eduroam.nl.",
76	76	];
77	77	foreach ($cat->getSuperglueZone() as $oneEntry) {
78		- foreach (explode(',',$oneEntry['inst_realm']) as $oneRealm) {
	78	+ foreach (explode(',', $oneEntry['inst_realm']) as $oneRealm) {
79	79	$target = "_radsec._somewhere.eduroam.org";
80	80	foreach ($NROs as $tld => $nroTarget) {
81	81	if (preg_match("/$tld$/", $oneRealm)) {

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	* <base_url>/copyright.php after deploying the software
20	20	*/
21	21
22		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	22	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23	23
24	24	$Tests = [
25	25	'Directories',
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43
44	44	$uiElements = new \web\lib\admin\UIElements();
45	45
46		-if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" \|\| \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
	46	+if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" \|\| \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
47	47	$Tests[] = 'Makensis';
48	48	$Tests[] = 'Makensis=>NSISmodules';
49	49	}

		@@ -34,13 +34,13 @@
		block discarded – undo
34	34	*/
35	35	class Diagnostics
36	36	{
37		- /**
38		- * Various paths.
39		- * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
40		- * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
41		- * See also NSIS_VERSION further down
42		- * @var array
43		- */
	37	+ /**
	38	+ * Various paths.
	39	+ * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
	40	+ * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
	41	+ * See also NSIS_VERSION further down
	42	+ * @var array
	43	+ */
44	44	const PATHS = [
45	45	'c_rehash' => 'c_rehash',
46	46	'eapol_test' => 'eapol_test',

		@@ -125,6 +125,6 @@
		block discarded – undo
125	125	];
126	126	const TIMEOUTS = [
127	127	'ajax_radius_tests' => 15000, // miliseconds
128		- 'crl_download' => 10, // seconds
	128	+ 'crl_download' => 10, // seconds
129	129	];
130	130	}

		@@ -16,10 +16,10 @@ discard block
		block discarded – undo
16	16	class CertificationAuthorityEmbeddedRSA extends EntityWithDBProperties implements CertificationAuthorityInterface
17	17	{
18	18
19		- private const LOCATION_ROOT_CA = ROOT . "/config/SilverbulletClientCerts/rootca-RSA.pem";
20		- private const LOCATION_ISSUING_CA = ROOT . "/config/SilverbulletClientCerts/real-RSA.pem";
21		- private const LOCATION_ISSUING_KEY = ROOT . "/config/SilverbulletClientCerts/real-RSA.key";
22		- private const LOCATION_CONFIG = ROOT . "/config/SilverbulletClientCerts/openssl-RSA.cnf";
	19	+ private const LOCATION_ROOT_CA = ROOT."/config/SilverbulletClientCerts/rootca-RSA.pem";
	20	+ private const LOCATION_ISSUING_CA = ROOT."/config/SilverbulletClientCerts/real-RSA.pem";
	21	+ private const LOCATION_ISSUING_KEY = ROOT."/config/SilverbulletClientCerts/real-RSA.key";
	22	+ private const LOCATION_CONFIG = ROOT."/config/SilverbulletClientCerts/openssl-RSA.cnf";
23	23
24	24	/**
25	25	* string with the PEM variant of the root CA
		@@ -66,11 +66,11 @@ discard block
		block discarded – undo
66	66	parent::__construct();
67	67	$this->rootPem = file_get_contents(CertificationAuthorityEmbeddedRSA::LOCATION_ROOT_CA);
68	68	if ($this->rootPem === FALSE) {
69		- throw new Exception("Root CA PEM file not found: " . CertificationAuthorityEmbeddedRSA::LOCATION_ROOT_CA);
	69	+ throw new Exception("Root CA PEM file not found: ".CertificationAuthorityEmbeddedRSA::LOCATION_ROOT_CA);
70	70	}
71	71	$this->issuingCertRaw = file_get_contents(CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA);
72	72	if ($this->issuingCertRaw === FALSE) {
73		- throw new Exception("Issuing CA PEM file not found: " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA);
	73	+ throw new Exception("Issuing CA PEM file not found: ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA);
74	74	}
75	75	$rootParsed = openssl_x509_read($this->rootPem);
76	76	$issuingCertCandidate = openssl_x509_read($this->issuingCertRaw);
		@@ -80,15 +80,15 @@ discard block
		block discarded – undo
80	80	}
81	81	$this->issuingCert = $issuingCertCandidate;
82	82	if (stat(CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY) === FALSE) {
83		- throw new Exception("Private key not found: " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY);
	83	+ throw new Exception("Private key not found: ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY);
84	84	}
85		- $issuingKeyTemp = openssl_pkey_get_private("file://" . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY);
	85	+ $issuingKeyTemp = openssl_pkey_get_private("file://".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY);
86	86	if ($issuingKeyTemp === FALSE \|\| is_resource($issuingKeyTemp)) {
87	87	throw new Exception("The private key did not parse correctly (or is not a PHP8 object)!");
88	88	}
89	89	$this->issuingKey = $issuingKeyTemp;
90	90	if (stat(CertificationAuthorityEmbeddedRSA::LOCATION_CONFIG) === FALSE) {
91		- throw new Exception("openssl configuration not found: " . CertificationAuthorityEmbeddedRSA::LOCATION_CONFIG);
	91	+ throw new Exception("openssl configuration not found: ".CertificationAuthorityEmbeddedRSA::LOCATION_CONFIG);
92	92	}
93	93	$this->conffile = CertificationAuthorityEmbeddedRSA::LOCATION_CONFIG;
94	94	}
		@@ -131,27 +131,27 @@ discard block
		block discarded – undo
131	131	// generate stub index.txt file
132	132	$tempdirArray = \core\common\Entity::createTemporaryDirectory("test");
133	133	$tempdir = $tempdirArray['dir'];
134		- $nowIndexTxt = (new \DateTime())->format("ymdHis") . "Z";
135		- $expiryIndexTxt = $originalExpiry->format("ymdHis") . "Z";
	134	+ $nowIndexTxt = (new \DateTime())->format("ymdHis")."Z";
	135	+ $expiryIndexTxt = $originalExpiry->format("ymdHis")."Z";
136	136	// serials for our CA are always integers
137	137	$serialHex = strtoupper(dechex((int) $cert->serial));
138	138	if (strlen($serialHex) % 2 == 1) {
139		- $serialHex = "0" . $serialHex;
	139	+ $serialHex = "0".$serialHex;
140	140	}
141	141
142		- $indexStatement = "$certstatus\t$expiryIndexTxt\t" . ($certstatus == "R" ? "$nowIndexTxt,unspecified" : "") . "\t$serialHex\tunknown\t/O=" . \config\ConfAssistant::CONSORTIUM['name'] . "/OU=$federation/CN=$cert->username\n";
	142	+ $indexStatement = "$certstatus\t$expiryIndexTxt\t".($certstatus == "R" ? "$nowIndexTxt,unspecified" : "")."\t$serialHex\tunknown\t/O=".\config\ConfAssistant::CONSORTIUM['name']."/OU=$federation/CN=$cert->username\n";
143	143	$this->loggerInstance->debug(4, "index.txt contents-to-be: $indexStatement");
144		- if (!file_put_contents($tempdir . "/index.txt", $indexStatement)) {
	144	+ if (!file_put_contents($tempdir."/index.txt", $indexStatement)) {
145	145	$this->loggerInstance->debug(1, "Unable to write openssl index.txt file for revocation handling!");
146	146	}
147	147	// index.txt.attr is dull but needs to exist
148		- file_put_contents($tempdir . "/index.txt.attr", "unique_subject = yes\n");
	148	+ file_put_contents($tempdir."/index.txt.attr", "unique_subject = yes\n");
149	149	// call "openssl ocsp" to manufacture our own OCSP statement
150	150	// adding "-rmd sha1" to the following command-line makes the
151	151	// choice of signature algorithm for the response explicit
152	152	// but it's only available from openssl-1.1.0 (which we do not
153	153	// want to require just for that one thing).
154		- $execCmd = \config\Master::PATHS['openssl'] . " ocsp -issuer " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA . " -sha1 -ndays 10 -no_nonce -serial 0x$serialHex -CA " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA . " -rsigner " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA . " -rkey " . CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY . " -index $tempdir/index.txt -no_cert_verify -respout $tempdir/$serialHex.response.der";
	154	+ $execCmd = \config\Master::PATHS['openssl']." ocsp -issuer ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA." -sha1 -ndays 10 -no_nonce -serial 0x$serialHex -CA ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA." -rsigner ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_CA." -rkey ".CertificationAuthorityEmbeddedRSA::LOCATION_ISSUING_KEY." -index $tempdir/index.txt -no_cert_verify -respout $tempdir/$serialHex.response.der";
155	155	$this->loggerInstance->debug(2, "Calling openssl ocsp with following cmdline: $execCmd\n");
156	156	$output = [];
157	157	$return = 999;
		@@ -159,11 +159,11 @@ discard block
		block discarded – undo
159	159	if ($return !== 0) {
160	160	throw new Exception("Non-zero return value from openssl ocsp!");
161	161	}
162		- $ocsp = file_get_contents($tempdir . "/$serialHex.response.der");
	162	+ $ocsp = file_get_contents($tempdir."/$serialHex.response.der");
163	163	// remove the temp dir!
164		- unlink($tempdir . "/$serialHex.response.der");
165		- unlink($tempdir . "/index.txt.attr");
166		- unlink($tempdir . "/index.txt");
	164	+ unlink($tempdir."/$serialHex.response.der");
	165	+ unlink($tempdir."/index.txt.attr");
	166	+ unlink($tempdir."/index.txt");
167	167	rmdir($tempdir);
168	168	$this->databaseHandle->exec("UPDATE silverbullet_certificate SET OCSP = ?, OCSP_timestamp = NOW() WHERE serial_number = ?", "si", $ocsp, $cert->serial);
169	169	return $ocsp;

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	?>
23	23	<?php
24	24
25		-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
	25	+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
26	26
27	27	$validator = new \web\lib\common\InputValidation();
28	28	$idRaw = $_GET["id"] ?? "";
		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	// Set data type and caching for 30 days
38	38	$info = new finfo();
39	39	$filetype = $info->buffer($finalBlob, FILEINFO_MIME_TYPE);
40		- header("Content-type: " . $filetype);
	40	+ header("Content-type: ".$filetype);
41	41
42	42	switch ($filetype) {
43	43	case "text/rtf": // fall-through, same treatment
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	header("Cache-Control: must-revalidate");
55	55	$offset = 60 * 60 * 24 * 30;
56	56	// gmdate can't possibly fail, because it operates on time() and an integer offset
57		- $ExpStr = "Expires: " . /** @scrutinizer ignore-type */ gmdate("D, d M Y H:i:s", time() + $offset) . " GMT";
	57	+ $ExpStr = "Expires: "./** @scrutinizer ignore-type */ gmdate("D, d M Y H:i:s", time() + $offset)." GMT";
58	58	header($ExpStr);
59	59	// Print out the image
60	60	echo $finalBlob;

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	* ******************************************************************************
10	10	*/
11	11
12		-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
	12	+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
13	13
14	14	$auth = new \web\lib\admin\Authentication();
15	15	$auth->authenticate();
		@@ -29,31 +29,31 @@ discard block
		block discarded – undo
29	29	?>
30	30
31	31	<h1><?php $tablecaption = _("User Authentication Records"); echo $tablecaption; ?></h1>
32		-<p><?php echo _("Note that:");?></p>
	32	+<p><?php echo _("Note that:"); ?></p>
33	33	<ul>
34		- <li><?php echo _("Authentication records are deleted after six months retention time");?></li>
35		- <li><?php echo _("Operator Domain is based on the RADIUS attribute 'Operator-Name' and not sent by all hotspots");?></li>
36		- <li><?php echo _("Different MAC addresses per credential may be due to MAC Address randomisation in recent operating systems");?></li>
	34	+ <li><?php echo _("Authentication records are deleted after six months retention time"); ?></li>
	35	+ <li><?php echo _("Operator Domain is based on the RADIUS attribute 'Operator-Name' and not sent by all hotspots"); ?></li>
	36	+ <li><?php echo _("Different MAC addresses per credential may be due to MAC Address randomisation in recent operating systems"); ?></li>
37	37	</ul>
38	38	<table class='authrecord'>
39		- <caption><?php echo $tablecaption;?></caption>
	39	+ <caption><?php echo $tablecaption; ?></caption>
40	40	<tr>
41		- <th scope="col"><strong><?php echo _("Timestamp");?></strong></th>
42		- <th scope="col"><strong><?php echo _("Credential");?></strong></th>
43		- <th scope="col"><strong><?php echo _("MAC Address");?></strong></th>
44		- <th scope="col"><strong><?php echo _("Result");?></strong></th>
45		- <th scope="col"><strong><?php echo _("Operator Domain");?></strong></th>
	41	+ <th scope="col"><strong><?php echo _("Timestamp"); ?></strong></th>
	42	+ <th scope="col"><strong><?php echo _("Credential"); ?></strong></th>
	43	+ <th scope="col"><strong><?php echo _("MAC Address"); ?></strong></th>
	44	+ <th scope="col"><strong><?php echo _("Result"); ?></strong></th>
	45	+ <th scope="col"><strong><?php echo _("Operator Domain"); ?></strong></th>
46	46	</tr>
47	47	<?php
48	48	$userAuthData = $profile->getUserAuthRecords($userInt);
49	49	foreach ($userAuthData as $oneRecord) {
50		- echo "<tr class='".($oneRecord['RESULT'] == "Access-Accept" ? "auth-success" : "auth-fail" )."'>"
	50	+ echo "<tr class='".($oneRecord['RESULT'] == "Access-Accept" ? "auth-success" : "auth-fail")."'>"
51	51	. "<td>".$oneRecord['TIMESTAMP']."</td>"
52	52	// $oneRecord['CN'] is a simple string, not an array, so disable Scrutinizer type check here
53		- . "<td>"./** @scrutinizer ignore-type */ substr_replace($oneRecord['CN'], "@…", strpos($oneRecord['CN'],"@"))."</td>"
	53	+ . "<td>"./** @scrutinizer ignore-type */ substr_replace($oneRecord['CN'], "@…", strpos($oneRecord['CN'], "@"))."</td>"
54	54	. "<td>".$oneRecord['MAC']."</td>"
55	55	. "<td>".($oneRecord['RESULT'] == "Access-Accept" ? _("Success") : _("Failure"))."</td>"
56		- . "<td>".substr($oneRecord['OPERATOR'] ?? "1(unknown)",1)."</td>"
	56	+ . "<td>".substr($oneRecord['OPERATOR'] ?? "1(unknown)", 1)."</td>"
57	57	. "</tr>";
58	58	}
59	59	?>

GEANT / CAT

Push — release_2_1 ( 1471d5...cd1bdf )

Status

Category

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch