[5.1] Test PR

administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-03-20.sql

@@ -0,0 +1,18 @@
+--
+-- Table structure for table `#__tuf_metadata`
+--
+
+CREATE TABLE IF NOT EXISTS `#__tuf_metadata` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `extension_id` int DEFAULT 0,
+  `root_json` text DEFAULT NULL,
+  `target_json` text DEFAULT NULL,
+  `snapshot_json` text DEFAULT NULL,
+  `timestamp_json` text DEFAULT NULL,
+  `mirrors_json` text DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci COMMENT='Secure TUF Updates';
+
+-- --------------------------------------------------------
+INSERT INTO `#__tuf_metadata` (`extension_id`, `root_json`)
+SELECT `extension_id`, '{"keytype": "ed25519", "scheme": "ed25519", "keyid": "02c3130c26fb3fe13fda279d578f3bc251f2ca3a42e5878de063e0ee345533c9", "keyid_hash_algorithms": ["sha256", "sha512"], "keyval": {"public": "f813a2882b305389cac36a9b8ebee7576ba7a7de671d2617074b03c12fb003aa", "private": "b7cb4fab28bae035a6fc5d46736e6f2d10ea4ef943e6aace8c637c1fd141ac72"}}' FROM `#__extensions` WHERE `type`='file' AND `element`='joomla';

administrator/components/com_installer/src/Model/UpdateModel.php

@@ -21,6 +21,7 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Updater\Update;
 use Joomla\CMS\Updater\Updater;
+use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseQuery;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
@@ -336,7 +337,23 @@ public function update($uids, $minimumStability = Updater::STABILITY_STABLE)
                 continue;
             }
 
-            $update->loadFromXml($instance->detailsurl, $minimumStability);
+            $app = Factory::getApplication();
+            $db = Factory::getContainer()->get(DatabaseDriver::class);
+            $query = $db->getQuery(true)
+                ->select('type')
+                ->from('#__update_sites')
+                ->where($db->quoteName('id') . ' = :id')
+                ->bind(':id', $instance->update_site_id, ParameterType::INTEGER);
+            $db->setQuery($query);
+            $updateSiteType = (string) $db->loadObject();
+
+            if ($updateSiteType == 'tuf') {
+                $app->enqueueMessage(Text::_('JLIB_INSTALLER_TUF_NOT_AVAILABLE'), 'error');
+
+                return;
+            } else {
+                $update->loadFromXml($instance->detailsurl, $minimumStability);
+            }
 
             // Find and use extra_query from update_site if available
             $updateSiteInstance = new \Joomla\CMS\Table\UpdateSite($this->getDatabase());