[6.1] Improvements to extension updater

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

@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Installer\Administrator\Model;
 
+use Joomla\CMS\Event\Installer\AfterPackageDownloadFailedEvent;
 use Joomla\CMS\Extension\ExtensionHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\Installer;
@@ -440,7 +441,22 @@ private function install($update)
 
         // Was the package downloaded?
         if (!$p_file) {
-            Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED', $url), 'error');
+            $dispatcher = $this->getDispatcher();
+            PluginHelper::importPlugin('installer', null, true, $dispatcher);
+            $event = new AfterPackageDownloadFailedEvent('onInstallerPackageDownloadFailed', [
+                'url'     => $url,
+                'message' => true,
+                'type'    => 'error',
+            ]);
+            $dispatcher->dispatch('onInstallerPackageDownloadFailed', $event);
+            $message = $event->getArgument('message', true);
+            $type    = $event->getArgument('type', 'error');
+
+            if ($message === true) {
+                InstallerHelper::enqueueDownloadFailMessage($url);
+            } elseif ($message !== false) {
+                Factory::getApplication()->enqueueMessage($message, $type);
+            }
 
             return false;
         }

libraries/src/Event/Installer/AfterPackageDownloadEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Event\Installer;
+
+use Joomla\Event\Event;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Installer events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterPackageDownloadEvent extends Event
+{
+}

libraries/src/Event/Installer/AfterPackageDownloadFailedEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Event\Installer;
+
+use Joomla\Event\Event;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Class for Installer events
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AfterPackageDownloadFailedEvent extends Event
+{
+}

libraries/src/Installer/InstallerHelper.php

@@ -10,6 +10,7 @@
 namespace Joomla\CMS\Installer;
 
 use Joomla\Archive\Archive;
+use Joomla\CMS\Event\Installer\AfterPackageDownloadEvent;
 use Joomla\CMS\Event\Installer\BeforePackageDownloadEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
@@ -57,6 +58,15 @@
      */
     public const HASH_NOT_PROVIDED = 2;
 
+    /**
+     * Message displayed when download fails.
+     *
+     * @var    string
+
+     * @since  __DEPLOY_VERSION__
+     */
+    protected static $downloadFailMessage = 'COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED';
+
     /**
      * Downloads a package
      *
@@ -74,58 +84,125 @@
         ini_set('user_agent', $version->getUserAgent('Installer'));
 
         // Load installer plugins, and allow URL and headers modification
-        $headers    = [];
+        $headers           = [];
+        $headers['accept'] = 'application/json, application/zip';
+
+        // Load installer plugins, and allow URL and headers modification
         $dispatcher = Factory::getApplication()->getDispatcher();
         PluginHelper::importPlugin('installer', null, true, $dispatcher);
         $event = new BeforePackageDownloadEvent('onInstallerBeforePackageDownload', [
-            'url'     => &$url, // @todo: Remove reference in Joomla 7, see BeforePackageDownloadEvent::__constructor()
-            'headers' => &$headers, // @todo: Remove reference in Joomla 7, see BeforePackageDownloadEvent::__constructor()
+            'url'     => &$url, // @todo: Remove reference in Joomla 6, see BeforePackageDownloadEvent::__constructor()
+            'headers' => &$headers, // @todo: Remove reference in Joomla 6, see BeforePackageDownloadEvent::__constructor()
         ]);
         $dispatcher->dispatch('onInstallerBeforePackageDownload', $event);
         $url     = $event->getArgument('url', $url);
         $headers = $event->getArgument('headers', $headers);
 
+        if (empty($url)) {
+            // Any logging and messaging of this are the responsibility of the event handlers.
+            return false;
+        }
+
         try {
-            $response = (new HttpFactory())->getHttp()->get($url, $headers);
+            $response = HttpFactory::getHttp()->get($url, $headers);
+
+            // Convert keys of headers to lowercase, to accommodate for case variations
+            $headers = array_change_key_case($response->headers, CASE_LOWER);
         } catch (\RuntimeException $exception) {
-            Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT', $exception->getMessage()), Log::WARNING, 'jerror');
+            $response = $exception;
+        }
+
+        // Load installer plugins, and check response
+        $dispatcher = Factory::getApplication()->getDispatcher();
+        PluginHelper::importPlugin('installer', null, true, $dispatcher);
+        $event = new AfterPackageDownloadEvent('onInstallerAfterPackageDownload', [
+            'url'      => &$url,
+            'response' => &$response,
+            'headers'  => &$headers,
+            'return'   => true,
+        ]);
+        $dispatcher->dispatch('onInstallerAfterPackageDownload', $event);
+        $return = $event->getArgument('return');
 
+        if ($return === false) {
             return false;
         }
 
-        // Convert keys of headers to lowercase, to accommodate for case variations
-        $headers = array_change_key_case($response->getHeaders(), CASE_LOWER);
+        if ($return !== true) {
+            return $return;
+        }
+
+        if ($response instanceof \Exception) {
+            Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT', $exception->getMessage()), Log::WARNING, 'jerror');
+
+            return false;
+        }
 
-        if (302 == $response->getStatusCode() && !empty($headers['location'])) {
+        if (302 == $response->code && !empty($headers['location'])) {
             return self::downloadPackage($headers['location']);
         }
 
-        if (200 != $response->getStatusCode()) {
+        if (200 != $response->code) {
             Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT', $response->getStatusCode()), Log::WARNING, 'jerror');
 
             return false;
         }
 
-        // Parse the Content-Disposition header to get the file name
         if (
-            !empty($headers['content-disposition'])
-            && preg_match("/\s*filename\s?=\s?(.*)/", $headers['content-disposition'][0], $parts)
+            !empty($headers['content-type'])
+            && !empty($headers['content-type'][0])
+            && strpos($headers['content-type'][0], 'application/json') !== false
         ) {
-            $flds   = explode(';', $parts[1]);
-            $target = trim($flds[0], '"');
-        }
+            $response = json_decode($response->body, true);
 
-        $tmpPath = Factory::getApplication()->get('tmp_path');
+            if (isset($response['downloadfailmessage'])) {
+                // Empty string will disable the download fail message.
+                // The response message may be used on errors. Allows the message type to be customised.
+                self::$downloadFailMessage = $response['downloadfailmessage'];
+            }
+
+            if (!empty($response['message'])) {
+                Factory::getApplication()->enqueueMessage($response['message'], $response['type'] ?? 'info');
+
+                if (!empty($response['error'])) {
+                    return false;
+                }
+            }
+
+            if (
+                !empty($response['error'])
+                || empty($response['package'])
+                || empty($response['target'])
+            ) {
+                Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT', ''), Log::WARNING, 'jerror');
 
-        // Set the target path if not given
-        if (!$target) {
-            $target = $tmpPath . '/' . self::getFilenameFromUrl($url);
+                return false;
+            }
+
+            $body   = base64_decode($response['package']);
+            $target = $response['target'];
         } else {
-            $target = $tmpPath . '/' . basename($target);
-        }
+            // Parse the Content-Disposition header to get the file name
+            if (
+                !empty($headers['content-disposition'])
+                && preg_match("/\s*filename\s?=\s?(.*)/", $headers['content-disposition'][0], $parts)
+            ) {
+                $flds   = explode(';', $parts[1]);
+                $target = trim($flds[0], '"');
+            }
+
+            $tmpPath = Factory::getApplication()->get('tmp_path');
+
+            // Set the target path if not given
+            if (!$target) {
+                $target = $tmpPath . '/' . self::getFilenameFromUrl($url);
+            } else {
+                $target = $tmpPath . '/' . basename($target);
+            }
 
-        // Fix Indirect Modification of Overloaded Property
-        $body = (string) $response->getBody();
+            // Fix Indirect Modification of Overloaded Property
+            $body = $response->body;
+        }
 
         // Write buffer to file
         File::write($target, $body);
@@ -139,6 +216,24 @@
         return basename($target);
     }
 
+    /*
+     * Enqueues the download fail message (if any).
+     *
+     * @param   string   $url    URL of file to download
+     *
+     * @return  void
+     *
+     * @since   6.1
+     */
+    public static function enqueueDownloadFailMessage($url)
+    {
+        if (empty(self::$downloadFailMessage)) {
+            return;
+        }
+
+        Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED', $url), 'error');
+    }
+
     /**
      * Unpacks a file and verifies it as a Joomla element package
      * Supports .gz .tar .tar.gz and .zip

libraries/src/Updater/Adapter/ExtensionAdapter.php

@@ -109,7 +109,8 @@ protected function _endElement($parser, $name)
 
                 // Check that the product matches and that the version matches (optionally a regexp)
                 if (
-                    $product == $this->currentUpdate->targetplatform['NAME']
+                    !empty($this->currentUpdate->targetplatform)
+                    && $product == $this->currentUpdate->targetplatform['NAME']
                     && preg_match('/^' . $this->currentUpdate->targetplatform['VERSION'] . '/', JVERSION)
                 ) {
                     // Check if PHP version supported via <php_minimum> tag, assume true if tag isn't present

libraries/src/Updater/UpdateAdapter.php

@@ -300,6 +300,11 @@ protected function getUpdateSiteResponse($options = [])
         $newUrl  = $event->getArgument('url', $url);
         $headers = $event->getArgument('headers', $headers);
 
+        if (empty($newUrl)) {
+            // Any logging and messaging of this are the responsibility of the event handlers.
+            return false;
+        }
+
         // Http transport throws an exception when there's no response.
         try {
             $http     = (new HttpFactory())->getHttp($httpOption);