[#5086] Fix issues with Package Management when open_basedir is in ef…

…fect

core/docs/changelog.txt

@@ -2,6 +2,7 @@
 This file shows the changes in recent releases of MODX. The most current release is usually the
 development release, and is only shown to give an idea of what's currently in the pipeline.
 
+- [#5086] Fix issues with Package Management when open_basedir is in effect
 - [#4947] Adjust ensuring of admin access to context to only needed policies
 - [#5078] Have default resource field context settings, such as default_template, respected in Quick create
 - [#5909] Allow blank extensions in Add Content Type window

core/model/modx/modx.class.php

@@ -241,6 +241,10 @@ class modX extends xPDO {
      * @var modMail $mail
      */
     public $mail;
+    /**
+     * @var modRestClient $rest
+     */
+    public $rest;
     /**
      * @var array An array of regex patterns regulary cleansed from content.
      */

core/model/modx/processors/workspace/packages/rest/download.php

@@ -2,6 +2,8 @@
 /**
  * Download a package by passing in its location
  *
+ * @var modX $modx
+ *
  * @package modx
  * @subpackage processors.workspace.packages.rest
  */
@@ -29,6 +31,7 @@
 $_package_cache = $modx->getOption('core_path').'packages/';
 
 /* create transport package object */
+/** @var modTransportPackage $package */
 $package = $modx->newObject('transport.modTransportPackage');
 $package->set('signature',$signature);
 $package->set('state',1);
@@ -37,6 +40,7 @@
 $package->set('provider',$scriptProperties['provider']);
 
 /* get provider and metadata */
+/** @var modTransportProvider $provider */
 $provider = $modx->getObject('transport.modTransportProvider',$scriptProperties['provider']);
 if (empty($provider)) return $modx->error->failure($modx->lexicon('provider_err_nf'));
 
@@ -45,6 +49,7 @@
 if (!$loaded) return $modx->error->failure($modx->lexicon('provider_err_no_client'));
 
 /* send request to provider and handle response */
+/** @var modRestResponse $response */
 $response = $provider->request('package','GET',array(
     'signature' => $signature,
 ));
@@ -79,6 +84,18 @@
     }
 }
 
+/* get file url */
+if (!is_array($modx->version)) { $modx->getVersionData(); }
+$productVersion = $modx->version['code_name'].'-'.$modx->version['full_version'];
+$response = $modx->rest->request($location,'','GET',array(
+    'revolution_version' => $productVersion,
+    'getUrl' => true,
+));
+if (empty($response) || empty($response->response)) {
+    return $modx->error->failure($modx->lexicon('provider_err_connect',array('error' => $response->getError())));
+}
+$location = $response->response;
+
 /* download package */
 if (!$package->transferPackage($location,$_package_cache)) {
     $msg = $modx->lexicon('package_download_err',array('location' => $location));

core/model/modx/rest/modrestcurlclient.class.php

@@ -65,7 +65,7 @@ public function setUrl($ch,$host,$path,$method = 'GET',array $params = array(),a
         $q = http_build_query($params);
         switch ($method) {
             case 'GET':
-                $path .= '?'.$q;
+                $path .= (strpos($host,'?') === false ? '?' : '&').$q;
                 break;
             case 'POST':
                 curl_setopt($ch,CURLOPT_POST,1);