Skip to content

fix(transport): Re-download missing packages when zip or extracted folder is absent #16905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ibochkarev wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

fix(transport): Re-download missing packages when zip or extracted folder is absent #16905

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 91 additions & 6 deletions core/src/Revolution/Transport/modTransportPackage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,12 @@ public function getTransport($state = -1)
}
if ($transferred) {
if ($state < 0) {
/* if directory is missing but zip exists, and DB state value is incorrect, fix here */
/* if directory is missing or empty but zip exists, fix DB state */
$targetDir = basename($sourceFile, '.transport.zip');
$state = is_dir($packageDir . $targetDir) ? $this->get('state') : xPDOTransport::STATE_PACKED;
$packageTargetDirIsNotEmpty = (count(glob($packageDir . $targetDir . '/*')) !== 0);
$state = (is_dir($packageDir . $targetDir) && $packageTargetDirIsNotEmpty)
? $this->get('state')
: xPDOTransport::STATE_PACKED;
}
/* retrieve the package */
$this->package = xPDOTransport::retrieve($this->xpdo, $packageDir . $sourceFile, $packageDir, $state);
Expand All @@ -265,6 +268,48 @@ public function getTransport($state = -1)
return $this->package;
}

/**
* Get metadata for a package in a more usable format.
* Converts the raw metadata array (with numeric keys) into a keyed array
* accessible by metadata name. Handles both flat and nested structures recursively.
*
* @return array An array of metadata accessible by metadata name field.
*/
public function getMetadata()
{
$raw = $this->get('metadata');
if (empty($raw) || !is_array($raw)) {
return [];
}
/* Some packages return a flat one-dimensional array (e.g. MIGX, pThumb) */
if (isset($raw[0]) && !is_array($raw[0])) {
return $raw;
}
$metadata = array_reduce($raw, function ($result, $item) {
if (!is_array($item) || empty($item['name'])) {
return $result;
}
$key = $item['name'];
unset($item['name']);
$result[$key] = $item;
/* Recursively process nested children arrays */
if (!empty($item['children']) && is_array($item['children'])) {
$children = array_reduce($item['children'], function ($childResult, $childItem) {
if (is_array($childItem) && !empty($childItem['name'])) {
$childKey = $childItem['name'];
unset($childItem['name']);
$childResult[$childKey] = $childItem;
}
return $childResult;
}, []);
$result[$key]['children'] = $children;
}
return $result;
}, []);

return $metadata;
}

/**
* Removes and uninstalls the package.
*
Expand Down Expand Up @@ -423,8 +468,31 @@ public function transferPackage($sourceFile, $targetDir)
}
$productVersion = $this->xpdo->version['code_name'] . '-' . $this->xpdo->version['full_version'];

$source = $this->get('service_url') . $sourceFile . (
strpos($sourceFile, '?') !== false ? '&' : '?') . 'revolution_version=' . $productVersion;
/* make sure the package is downloaded, if not attempt re-download */
if (strpos($sourceFile, '//') === false && !file_exists($targetDir . $sourceFile)) {
$metadata = $this->getMetadata();
$locationUrl = null;
if (!empty($metadata)) {
if (!empty($metadata['location'])) {
$loc = $metadata['location'];
$locationUrl = (is_array($loc) && isset($loc['text']))
? $loc['text']
: (is_string($loc) ? $loc : null);
}
if ($locationUrl === null && !empty($metadata['file']['children']['location']['text'])) {
$locationUrl = $metadata['file']['children']['location']['text'];
}
}
if ($locationUrl === null) {
$this->xpdo->log(xPDO::LOG_LEVEL_ERROR, $this->xpdo->lexicon('package_err_source_nf'));

return false;
}
$source = $locationUrl;
} else {
$source = $this->get('service_url') . $sourceFile . (
strpos($sourceFile, '?') !== false ? '&' : '?') . 'revolution_version=' . $productVersion;
}

/* see if user has allow_url_fopen on and is not behind a proxy */
$proxyHost = $this->xpdo->getOption('proxy_host', null, '');
Expand Down Expand Up @@ -479,7 +547,12 @@ public function transferPackage($sourceFile, $targetDir)
}
}
$content = curl_exec($ch);
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
/* do not save 4xx/5xx error responses as zip */
if ($httpCode >= 400) {
$content = '';
}
}

/* and as last-ditch resort, try fsockopen */
Expand Down Expand Up @@ -776,15 +849,27 @@ protected function _getByFsockopen($url)
if (!$fp) {
$this->xpdo->log(xPDO::LOG_LEVEL_ERROR, 'Could not retrieve from ' . $url);
} else {
fwrite($fp, "GET $path " . $_SERVER['SERVER_PROTOCOL'] . "\r\n" .
$protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
$referer = $this->xpdo->getOption('url_scheme', null, 'http://') . $host;

fwrite($fp, "GET $path $protocol\r\n" .
"Host: $host\r\n" .
"User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.3) Gecko/20060426 Firefox/1.5.0.3\r\n" .
"Accept: */*\r\n" .
"Accept-Language: en-us,en;q=0.5\r\n" .
"Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7\r\n" .
"Keep-Alive: 300\r\n" .
"Connection: keep-alive\r\n" .
"Referer: http://$host\r\n\r\n");
"Referer: $referer\r\n\r\n");

$statusLine = fgets($fp, 32);
$statusParts = explode(' ', trim($statusLine), 3);
$statusCode = isset($statusParts[1]) ? (int) $statusParts[1] : 0;
if ($statusCode >= 400) {
fclose($fp);

return '';
}

while ($line = fread($fp, 4096)) {
$response .= $line;
Expand Down