Skip to content

[4.0] Fix Update Joomla Using FTP #33281

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

Closed
wants to merge 1 commit into from
Closed

[4.0] Fix Update Joomla Using FTP #33281

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion administrator/components/com_joomlaupdate/restore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1824,7 +1824,7 @@ public function connect()
}

// Try to download ourselves
$testFilename = defined('KSSELFNAME') ? KSSELFNAME : basename(__FILE__);
$testFilename = defined('KSSELFNAME') ? KSSELFNAME : 'index.php';
$tempHandle = fopen('php://temp', 'r+');
if (@ftp_fget($this->handle, $tempHandle, $testFilename, FTP_ASCII, 0) === false)
{
Expand Down
12 changes: 12 additions & 0 deletions administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,18 @@ public function upload()
// Did a non Super User tried to upload something (a.k.a. pathetic hacking attempt)?
Factory::getUser()->authorise('core.admin') or jexit(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'));

$method = $this->app->getUserStateFromRequest('com_joomlaupdate.method', 'method', 'direct', 'cmd');

if ($method !== 'direct')
{
// Get and store FTP Credentials into session to write to restoration.php in later steps
$this->app->getUserStateFromRequest('com_joomlaupdate.ftp_host', 'ftp_host', '', 'cmd');
$this->app->getUserStateFromRequest('com_joomlaupdate.ftp_port', 'ftp_port', '21', 'cmd');
$this->app->getUserStateFromRequest('com_joomlaupdate.ftp_user', 'ftp_user', '', 'string');
$this->app->getUserStateFromRequest('com_joomlaupdate.ftp_pass', 'ftp_pass', '', 'raw');
$this->app->getUserStateFromRequest('com_joomlaupdate.ftp_root', 'ftp_root', '', 'path');
}

$this->_applyCredentials();

/** @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $model */
Expand Down
15 changes: 8 additions & 7 deletions administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ public function createRestorationFile($basename = null)
$method = Factory::getApplication()->getUserStateFromRequest('com_joomlaupdate.method', 'method', 'direct', 'cmd');

// Get the absolute path to site's root.
$siteroot = JPATH_SITE;
$siteroot = Path::clean(JPATH_SITE, '/');

// If the package name is not specified, get it from the update info.
if (empty($basename))
Expand All @@ -515,7 +515,7 @@ public function createRestorationFile($basename = null)

// Get the package name.
$config = $app->getConfig();
$tempdir = $config->get('tmp_path');
$tempdir = Path::clean($config->get('tmp_path'), '/');
$file = $tempdir . '/' . $basename;

$filesize = @filesize($file);
Expand Down Expand Up @@ -546,11 +546,12 @@ public function createRestorationFile($basename = null)
* allowed as raw mode, otherwise something like !@<sdf34>43H% would be
* sanitised to !@43H% which is just plain wrong.
*/
$ftp_host = $app->input->get('ftp_host', '');
$ftp_port = $app->input->get('ftp_port', '21');
$ftp_user = $app->input->get('ftp_user', '');
$ftp_pass = addcslashes($app->input->get('ftp_pass', '', 'raw'), "'\\");
$ftp_root = $app->input->get('ftp_root', '');

$ftp_host = $app->getUserStateFromRequest('com_joomlaupdate.ftp_host', 'ftp_host', '', 'cmd');
$ftp_port = $app->getUserStateFromRequest('com_joomlaupdate.ftp_port', 'ftp_port', '21', 'cmd');
$ftp_user = $app->getUserStateFromRequest('com_joomlaupdate.ftp_user', 'ftp_user', '', 'string');
$ftp_pass = addcslashes($app->getUserStateFromRequest('com_joomlaupdate.ftp_pass', 'ftp_pass', '', 'raw'), "'\\");
$ftp_root = $app->getUserStateFromRequest('com_joomlaupdate.ftp_root', 'ftp_root', '', 'path');

// Is the tempdir really writable?
$writable = @is_writable($tempdir);
Expand Down