changed the controllers/Repo/Mirror/Rpm.php to check /repodata/repomd…

….xml instead of the /repodata directory. Some RPM servers are configured to prohibit access to the directory itself
lbr38 · Nov 7, 2023 · fa14625 · fa14625
1 parent d48c2e5
commit fa14625
Show file tree

Hide file tree

Showing 21 changed files with 242 additions and 141 deletions.
diff --git a/www/controllers/Api/Api.php b/www/controllers/Api/Api.php
@@ -85,7 +85,7 @@ public function __construct()
          *  Check if authentication is valid from data sent
          */
         if (!$this->authenticationController->valid($this->authHeader, $this->data)) {
-            self::returnError(401, 'Bad credentials.');
+            self::returnError(401, 'Bad credentials');
         }
 
         /**
@@ -98,10 +98,10 @@ public function __construct()
          *  Check if method and URI are specified
          */
         if (empty($_SERVER['REQUEST_METHOD'])) {
-            throw new Exception('No method specified.');
+            throw new Exception('No method specified');
         }
         if (empty($_SERVER['REQUEST_URI'])) {
-            throw new Exception('No route specified.');
+            throw new Exception('No route specified');
         }
     }
 
@@ -124,7 +124,7 @@ public function run()
              *  Check if route is valid by checking if corresponding controller exists
              */
             if (!file_exists(ROOT . '/controllers/Api/' . ucfirst($this->route) . '/' . ucfirst($this->route) . '.php')) {
-                throw new Exception('No matching route.');
+                throw new Exception('No matching route');
             }
 
             $apiControllerPath = '\Controllers\Api\\' . ucfirst($this->route) . '\\' . ucfirst($this->route);

diff --git a/www/controllers/Api/Authentication.php b/www/controllers/Api/Authentication.php
@@ -34,19 +34,67 @@ public function getHostAuthenticationStatus()
     public function valid(string $authHeader = null, object $data = null)
     {
         /**
-         *  If API key is specified through the Authorization header
-         *  e.g. "Authorization: Bearer <API_KEY>"
+         *  New authentication method
          */
-        if (!empty($authHeader) && strpos($authHeader, 'Bearer ') === 0) {
+
+        /**
+         *  If API key or host Id+token is specified through the Authorization header
+         *  e.g.
+         *      "Authorization: Bearer <API_KEY>"
+         *      "Authorization: Host <HOST_ID>:<HOST_TOKEN>"
+         */
+        if (!empty($authHeader)) {
+            if (strpos($authHeader, 'Bearer ') === 0) {
+                /**
+                 *  Extract the token
+                 *  Remove "Bearer " from the header
+                 */
+                $apiKey = substr($authHeader, 7);
+            }
+
             /**
-             *  Extract the token
-             *  Remove "Bearer " from the header
+             *  If host Id+token are specified through the Authorization header
              */
-            $apiKey = substr($authHeader, 7);
+            if (strpos($authHeader, 'Host ') === 0) {
+                /**
+                 *  Extract the host Id and token
+                 *  Remove "Host " from the header
+                 */
+                $authIdToken = substr($authHeader, 5);
+
+                /**
+                 *  Split the host Id and token
+                 */
+                $authIdToken = explode(':', $authIdToken);
+
+                /**
+                 *  Check if host Id and token are specified
+                 */
+                if (count($authIdToken) != 2) {
+                    return false;
+                }
+
+                /**
+                 *  Set host authId and token
+                 */
+                $id = $authIdToken[0];
+                $token = $authIdToken[1];
+            }
+        }
+
+        /**
+         *  Old authentication method
+         */
+
+        /**
+         *  If API key is specified in data
+         */
+        if (!empty($data->apikey)) {
+            $apiKey = $data->apikey;
         }
 
         /**
-         *  If host authId and token are specified
+         *  If host authId and token are specified in data
          */
         if (!empty($data->id)) {
             $id = $data->id;

diff --git a/www/controllers/Api/Snapshot/Snapshot.php b/www/controllers/Api/Snapshot/Snapshot.php
@@ -65,7 +65,37 @@ public function execute()
                  *  Reconstruct a snapshot
                  *  https://repomanager.mydomain.net/api/v2/snapshot/$this->snapId/reconstruct
                  */
-                if ($this->action == 'reconstruct') {
+                if ($this->action == 'rebuild' and !empty($this->data->gpgSign)) {
+                    /**
+                     *  Same code as controllers/ajax/browse.php
+                     *  TODO : find a way to not duplicate code
+                     */
+                    $myoperation = new \Controllers\Operation\Operation();
+
+                    if ($myrepo->existsSnapId($this->snapId) !== true) {
+                        throw new Exception('Invalid repo snapshot ID');
+                    }
+
+                    if ($this->data->gpgSign != 'yes' and $this->data->gpgSign != 'no') {
+                        throw new Exception('Invalid GPG Resign value');
+                    }
+
+                    /**
+                     *  Create a json file that defines the operation to execute
+                     */
+                    $params = array();
+                    $params['action'] = 'reconstruct';
+                    $params['snapId'] = $this->snapId;
+                    $params['targetGpgResign'] = $this->data->gpgSign;
+
+                    /**
+                     *  Execute the operation
+                     */
+                    $myoperation->execute(array($params));
+
+                    unset($myoperation);
+
+                    return array('results' => 'Snapshot metadata rebuild started');
                 }
             }
         }

diff --git a/www/controllers/Operation/Form.php b/www/controllers/Operation/Form.php
@@ -251,7 +251,6 @@ public function validateForm(array $operations_params)
                     Param\Name::check($targetName);
                     Param\GpgCheck::check($operation_params['targetGpgCheck']);
                     Param\GpgResign::check($operation_params['targetGpgResign']);
-                    // Param\SourcePackageInc::check($operation_params['targetSourcePackage']);
 
                     if ($packageType == 'deb') {
                         if (!empty($operation_params['targetPackageTranslation'])) {
@@ -317,7 +316,6 @@ public function validateForm(array $operations_params)
                 }
 
                 Param\Arch::check($operation_params['targetArch']);
-                // Param\SourcePackageInc::check($operation_params['targetSourcePackage']);
 
                 if ($packageType == 'deb') {
                     if (!empty($operation_params['targetPackageTranslation'])) {

diff --git a/www/controllers/Operation/Param/SourcePackageInc.php b/www/controllers/Operation/Param/SourcePackageInc.php
diff --git a/www/controllers/Planification.php b/www/controllers/Planification.php
@@ -508,7 +508,6 @@ public function exec()
                     'targetGpgResign' => $this->targetGpgResign,
                     'targetEnv' => $this->targetEnv,
                     'targetArch' => $this->repo->getArch(),
-                    // 'targetSourcePackage' => $this->repo->getSourcePackage(),
                     'onlySyncDifference' => $this->onlySyncDifference
                 );
 
@@ -609,7 +608,6 @@ public function exec()
                         'targetGpgResign' => $this->targetGpgResign,
                         'targetEnv' => $this->targetEnv,
                         'targetArch' => $this->repo->getArch(),
-                        // 'targetSourcePackage' => $this->repo->getSourcePackage(),
                         'onlySyncDifference' => $this->onlySyncDifference
                     );
 

diff --git a/www/controllers/Repo/Mirror/Rpm.php b/www/controllers/Repo/Mirror/Rpm.php
@@ -530,7 +530,7 @@ public function mirror()
          */
         foreach ($this->archUrls as $arch => $archUrls) {
             foreach ($archUrls as $url) {
-                if (!\Controllers\Common::urlFileExists($url . '/repodata', $this->sslCustomCertificate, $this->sslCustomPrivateKey)) {
+                if (!\Controllers\Common::urlFileExists($url . '/repodata/repomd.xml', $this->sslCustomCertificate, $this->sslCustomPrivateKey)) {
                     // $this->logOutput(' - ' . $url . ' (unreachable or nothing here?)' . PHP_EOL);
 
                     /**

diff --git a/www/controllers/Repo/Operation/Create.php b/www/controllers/Repo/Operation/Create.php
@@ -45,7 +45,6 @@ public function __construct(string $poolId, array $operationParams)
             $requiredParams[] = 'source';
             $requiredParams[] = 'targetGpgCheck';
             $requiredParams[] = 'targetGpgResign';
-            // $requiredParams[] = 'targetSourcePackage';
         }
 
         /**

diff --git a/www/controllers/Repo/Operation/Duplicate.php b/www/controllers/Repo/Operation/Duplicate.php
@@ -31,7 +31,6 @@ public function __construct(string $poolId, array $operationParams)
          */
         $operationParams['targetGpgResign'] = $this->repo->getSigned();
         $operationParams['targetArch'] = $this->repo->getArch();
-        // $operationParams['targetSourcePackage'] = $this->repo->getSourcePackage();
         $operationParams['targetPackageTranslation'] = $this->repo->getPackageTranslation();
 
         /**

diff --git a/www/controllers/Repo/Operation/Update.php b/www/controllers/Repo/Operation/Update.php
@@ -33,7 +33,6 @@ public function __construct(string $poolId, array $operationParams)
          *  Check and set others operation parameters
          */
         $requiredParams = array('targetGpgCheck', 'targetGpgResign', 'targetArch', 'onlySyncDifference');
-        // $optionnalParams = array('targetEnv', 'targetSourcePackage', 'targetPackageTranslation');
         $optionnalParams = array('targetEnv', 'targetPackageTranslation');
         $this->operationParamsCheck('Update repo', $operationParams, $requiredParams);
         $this->operationParamsSet($operationParams, $requiredParams, $optionnalParams);

diff --git a/www/models/Host.php b/www/models/Host.php
@@ -424,7 +424,7 @@ public function getHostWithKernel(string $kernel)
         $hosts = array();
 
         try {
-            $stmt = $this->db->prepare("SELECT Hostname, Ip, Os, Os_family FROM hosts
+            $stmt = $this->db->prepare("SELECT Id, Hostname, Ip, Os, Os_family FROM hosts
             WHERE Kernel = :kernel
             AND Status = 'active'
             ORDER BY Hostname ASC");
@@ -449,7 +449,7 @@ public function getHostWithProfile(string $profile)
         $hosts = array();
 
         try {
-            $stmt = $this->db->prepare("SELECT Hostname, Ip, Os, Os_family FROM hosts
+            $stmt = $this->db->prepare("SELECT Id, Hostname, Ip, Os, Os_family FROM hosts
             WHERE Profile = :profile
             AND Status = 'active'
             ORDER BY Hostname ASC");
@@ -749,7 +749,7 @@ public function listRebootRequired()
     {
         $hosts = array();
 
-        $result = $this->db->query("SELECT Hostname, Ip, Os, Os_family FROM hosts WHERE Status = 'active' AND Reboot_required = 'true' ORDER BY Hostname ASC");
+        $result = $this->db->query("SELECT Id, Hostname, Ip, Os, Os_family FROM hosts WHERE Status = 'active' AND Reboot_required = 'true' ORDER BY Hostname ASC");
 
         while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
             $hosts[] = $row;

diff --git a/www/public/resources/js/host.js b/www/public/resources/js/host.js
@@ -368,14 +368,14 @@ $(document).on('mouseenter',".hosts-charts-list-label[chart-type=kernel]",functi
     /**
      *  Create a new <div> hosts-charts-list-label-hosts-list
      */
-    $('footer').append('<div class="hosts-charts-list-label-hosts-list">Loading<img src="/assets/images/loading.gif" class="icon"/></div>');
+    $('footer').append('<div class="hosts-charts-list-label-hosts-list"><span>Loading<img src="/assets/images/loading.gif" class="icon"/></span></div>');
 
     $('.hosts-charts-list-label-hosts-list').css({
         top: e.pageY - $('.hosts-charts-list-label-hosts-list').height() / 2,
         left: e.pageX - $('.hosts-charts-list-label-hosts-list').width() / 2
     });
 
-    $('.hosts-charts-list-label-hosts-list').show();
+    $('.hosts-charts-list-label-hosts-list').css('display', 'flex');
 
     getHostWithKernel(kernel);
 });
@@ -389,14 +389,14 @@ $(document).on('mouseenter',".hosts-charts-list-label[chart-type=profile]",funct
     /**
      *  Create a new <div> hosts-charts-list-label-hosts-list
      */
-    $('footer').append('<div class="hosts-charts-list-label-hosts-list">Loading<img src="/assets/images/loading.gif" class="icon"/></div>');
+    $('footer').append('<div class="hosts-charts-list-label-hosts-list"><span>Loading<img src="/assets/images/loading.gif" class="icon"/></span></div>');
 
     $('.hosts-charts-list-label-hosts-list').css({
         top: e.pageY - $('.hosts-charts-list-label-hosts-list').height() / 2,
         left: e.pageX - $('.hosts-charts-list-label-hosts-list').width() / 2
     });
 
-    $('.hosts-charts-list-label-hosts-list').show();
+    $('.hosts-charts-list-label-hosts-list').css('display', 'flex');
 
     getHostWithProfile(profile);
 });
@@ -405,6 +405,12 @@ $(document).on('mouseenter',".hosts-charts-list-label[chart-type=profile]",funct
  *  Event: Remove all hosts list <div> from the DOM when mouse has leave
  */
 $(document).on('mouseleave',".hosts-charts-list-label",function () {
+    if ($('.hosts-charts-list-label-hosts-list:hover').length == 0) {
+        $('.hosts-charts-list-label-hosts-list').remove();
+    }
+});
+
+$(document).on('mouseleave',".hosts-charts-list-label-hosts-list",function () {
     $('.hosts-charts-list-label-hosts-list').remove();
 });
 
@@ -1028,6 +1034,9 @@ function getHostWithKernel(kernel)
             hostsArray = jQuery.parseJSON(jsonValue.message);
             hostsArray.forEach(obj => {
                 Object.entries(obj).forEach(([key, value]) => {
+                    if (key == 'Id') {
+                        id = value;
+                    }
                     if (key == 'Hostname') {
                         hostname = value;
                     }
@@ -1041,10 +1050,16 @@ function getHostWithKernel(kernel)
                         os_family = value;
                     }
                 });
-                hosts += '<div>' + printOsIcon(os, os_family) + '<span>' + hostname + ' (' + ip + ') </span></div>';
+
+                hosts += '<div class="flex align-item-center column-gap-10 div-generic-blue margin-bottom-0">';
+                hosts += '<div>' + printOsIcon(os, os_family) + '</div>';
+                hosts += '<div class="flex flex-direction-column row-gap-4">';
+                hosts += '<span class="copy"><a href="/host?id=' + id + '" target="_blank" rel="noopener noreferrer">' + hostname + '</a></span>';
+                hosts += '<span class="copy font-size-12 lowopacity-cst">' + ip + '</span>';
+                hosts += '</div></div>';
             });
 
-            $('.hosts-charts-list-label-hosts-list').html('<div class="grid row-gap-4">' + hosts + '</div>');
+            $('.hosts-charts-list-label-hosts-list').html(hosts);
         },
         error: function (jqXHR, textStatus, thrownError) {
             jsonValue = jQuery.parseJSON(jqXHR.responseText);
@@ -1075,6 +1090,9 @@ function getHostWithProfile(profile)
             hostsArray = jQuery.parseJSON(jsonValue.message);
             hostsArray.forEach(obj => {
                 Object.entries(obj).forEach(([key, value]) => {
+                    if (key == 'Id') {
+                        id = value;
+                    }
                     if (key == 'Hostname') {
                         hostname = value;
                     }
@@ -1088,10 +1106,16 @@ function getHostWithProfile(profile)
                         os_family = value;
                     }
                 });
-                hosts += '<div>' + printOsIcon(os, os_family) + '<span>' + hostname + ' (' + ip + ') </span></div>';
+
+                hosts += '<div class="flex align-item-center column-gap-10 div-generic-blue margin-bottom-0">';
+                hosts += '<div>' + printOsIcon(os, os_family) + '</div>';
+                hosts += '<div class="flex flex-direction-column row-gap-4">';
+                hosts += '<span class="copy"><a href="/host?id=' + id + '" target="_blank" rel="noopener noreferrer">' + hostname + '</a></span>';
+                hosts += '<span class="copy font-size-12 lowopacity-cst">' + ip + '</span>';
+                hosts += '</div></div>';
             });
 
-            $('.hosts-charts-list-label-hosts-list').html('<div class="grid row-gap-4">' + hosts + '</div>');
+            $('.hosts-charts-list-label-hosts-list').html(hosts);
         },
         error: function (jqXHR, textStatus, thrownError) {
             jsonValue = jQuery.parseJSON(jqXHR.responseText);