2011-10-11 13:02:57 +00:00
|
|
|
<?php
|
|
|
|
/**
|
2013-07-13 02:26:21 +00:00
|
|
|
* @package PatchTester
|
|
|
|
*
|
2014-01-03 02:48:28 +00:00
|
|
|
* @copyright Copyright (C) 2011 - 2012 Ian MacLennan, Copyright (C) 2013 - 2014 Open Source Matters, Inc. All rights reserved.
|
2013-07-13 02:26:21 +00:00
|
|
|
* @license GNU General Public License version 2 or later
|
2011-10-11 13:02:57 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
defined('_JEXEC') or die;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Methods supporting pull requests.
|
|
|
|
*
|
2013-07-13 02:26:21 +00:00
|
|
|
* @package PatchTester
|
|
|
|
* @since 1.0
|
2011-10-11 13:02:57 +00:00
|
|
|
*/
|
2012-09-09 01:53:44 +00:00
|
|
|
class PatchtesterModelPull extends JModelLegacy
|
2011-10-11 13:02:57 +00:00
|
|
|
{
|
2013-07-12 02:03:26 +00:00
|
|
|
/**
|
2013-07-13 02:26:21 +00:00
|
|
|
* @var JHttp
|
|
|
|
* @since 2.0
|
2013-07-12 02:03:26 +00:00
|
|
|
*/
|
|
|
|
protected $transport;
|
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
/**
|
|
|
|
* Github object
|
|
|
|
*
|
2014-05-01 12:47:10 +00:00
|
|
|
* @var JGithub
|
2013-07-13 02:26:21 +00:00
|
|
|
* @since 2.0
|
2013-07-13 00:31:00 +00:00
|
|
|
*/
|
|
|
|
protected $github;
|
|
|
|
|
2013-07-28 17:44:05 +00:00
|
|
|
/**
|
|
|
|
* Array containing top level non-production folders
|
|
|
|
*
|
|
|
|
* @var array
|
|
|
|
* @since 2.0
|
|
|
|
*/
|
|
|
|
protected $nonProductionFolders = array('build', 'docs', 'installation', 'tests');
|
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
/**
|
|
|
|
* Object containing the rate limit data
|
|
|
|
*
|
2013-07-13 02:26:21 +00:00
|
|
|
* @var object
|
|
|
|
* @since 2.0
|
2013-07-13 00:31:00 +00:00
|
|
|
*/
|
|
|
|
protected $rate;
|
|
|
|
|
2013-07-12 02:03:26 +00:00
|
|
|
/**
|
|
|
|
* Constructor
|
|
|
|
*
|
|
|
|
* @param array $config An array of configuration options (name, state, dbo, table_path, ignore_request).
|
|
|
|
*
|
2013-07-13 02:26:21 +00:00
|
|
|
* @since 2.0
|
2013-09-29 00:02:04 +00:00
|
|
|
* @throws RuntimeException
|
2013-07-12 02:03:26 +00:00
|
|
|
*/
|
|
|
|
public function __construct($config = array())
|
|
|
|
{
|
|
|
|
parent::__construct($config);
|
|
|
|
|
|
|
|
// Set up the JHttp object
|
|
|
|
$options = new JRegistry;
|
2013-07-28 17:44:05 +00:00
|
|
|
$options->set('userAgent', 'JPatchTester/2.0');
|
2013-07-12 02:03:26 +00:00
|
|
|
$options->set('timeout', 120);
|
|
|
|
|
2013-09-29 00:02:04 +00:00
|
|
|
// Make sure we can use the cURL driver
|
|
|
|
$driver = JHttpFactory::getAvailableDriver($options, 'curl');
|
|
|
|
|
|
|
|
if (!($driver instanceof JHttpTransportCurl))
|
|
|
|
{
|
|
|
|
throw new RuntimeException('Cannot use the PHP cURL adapter in this environment, cannot use patchtester', 500);
|
|
|
|
}
|
|
|
|
|
|
|
|
$this->transport = new JHttp($options, $driver);
|
2013-07-13 00:31:00 +00:00
|
|
|
|
|
|
|
// Set up the Github object
|
2013-07-13 01:06:39 +00:00
|
|
|
$params = JComponentHelper::getParams('com_patchtester');
|
|
|
|
|
|
|
|
$options = new JRegistry;
|
|
|
|
|
|
|
|
// Set the username and password if set in the params
|
|
|
|
if ($params->get('gh_user', '') && $params->get('gh_password'))
|
|
|
|
{
|
|
|
|
$options->set('api.username', $params->get('gh_user', ''));
|
|
|
|
$options->set('api.password', $params->get('gh_password', ''));
|
|
|
|
}
|
|
|
|
|
2014-05-01 12:47:10 +00:00
|
|
|
$this->github = new JGithub($options);
|
2013-07-13 00:31:00 +00:00
|
|
|
|
|
|
|
// Store the rate data for reuse during this request cycle
|
|
|
|
$this->rate = $this->github->account->getRateLimit()->rate;
|
2013-07-12 02:03:26 +00:00
|
|
|
}
|
|
|
|
|
2011-10-13 16:44:25 +00:00
|
|
|
/**
|
|
|
|
* Method to auto-populate the model state.
|
|
|
|
*
|
2013-07-13 02:26:21 +00:00
|
|
|
* @return void
|
2011-10-13 16:44:25 +00:00
|
|
|
*
|
2013-07-13 02:26:21 +00:00
|
|
|
* @note Calling getState() in this method will result in recursion.
|
|
|
|
* @since 1.0
|
2011-10-13 16:44:25 +00:00
|
|
|
*/
|
|
|
|
protected function populateState()
|
|
|
|
{
|
|
|
|
// Load the parameters.
|
|
|
|
$params = JComponentHelper::getParams('com_patchtester');
|
|
|
|
$this->setState('params', $params);
|
2011-10-15 18:47:02 +00:00
|
|
|
$this->setState('github_user', $params->get('org', 'joomla'));
|
|
|
|
$this->setState('github_repo', $params->get('repo', 'joomla-cms'));
|
2011-10-11 13:02:57 +00:00
|
|
|
|
2011-10-13 16:44:25 +00:00
|
|
|
parent::populateState();
|
|
|
|
}
|
2011-10-11 13:02:57 +00:00
|
|
|
|
2013-07-13 02:26:21 +00:00
|
|
|
/**
|
|
|
|
* Method to parse a patch and extract the affected files
|
|
|
|
*
|
|
|
|
* @param string $patch Patch file to parse
|
|
|
|
*
|
|
|
|
* @return array Array of files within a patch
|
|
|
|
*
|
|
|
|
* @since 1.0
|
|
|
|
*/
|
2011-10-11 20:51:12 +00:00
|
|
|
protected function parsePatch($patch)
|
|
|
|
{
|
|
|
|
$state = 0;
|
|
|
|
$files = array();
|
|
|
|
|
2011-10-15 01:13:59 +00:00
|
|
|
$lines = explode("\n", $patch);
|
|
|
|
|
2012-06-12 18:42:45 +00:00
|
|
|
foreach ($lines AS $line)
|
|
|
|
{
|
2011-10-11 20:51:12 +00:00
|
|
|
switch ($state)
|
|
|
|
{
|
|
|
|
case 0:
|
2012-06-12 18:42:45 +00:00
|
|
|
if (strpos($line, 'diff --git') === 0)
|
|
|
|
{
|
2011-10-11 20:51:12 +00:00
|
|
|
$state = 1;
|
|
|
|
}
|
2013-07-13 02:26:21 +00:00
|
|
|
|
|
|
|
$file = new stdClass;
|
2011-10-11 20:51:12 +00:00
|
|
|
$file->action = 'modified';
|
2013-07-13 02:26:21 +00:00
|
|
|
|
2011-10-11 20:51:12 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 1:
|
2012-06-12 18:42:45 +00:00
|
|
|
if (strpos($line, 'index') === 0)
|
|
|
|
{
|
2011-10-11 20:51:12 +00:00
|
|
|
$file->index = substr($line, 6);
|
|
|
|
}
|
|
|
|
|
2012-06-12 18:42:45 +00:00
|
|
|
if (strpos($line, '---') === 0)
|
|
|
|
{
|
2011-10-11 20:51:12 +00:00
|
|
|
$file->old = substr($line, 6);
|
|
|
|
}
|
|
|
|
|
2012-06-12 18:42:45 +00:00
|
|
|
if (strpos($line, '+++') === 0)
|
|
|
|
{
|
2011-10-11 20:51:12 +00:00
|
|
|
$file->new = substr($line, 6);
|
|
|
|
}
|
|
|
|
|
2012-06-12 18:42:45 +00:00
|
|
|
if (strpos($line, 'new file mode') === 0)
|
|
|
|
{
|
2011-10-11 20:51:12 +00:00
|
|
|
$file->action = 'added';
|
|
|
|
}
|
|
|
|
|
2012-06-12 18:42:45 +00:00
|
|
|
if (strpos($line, 'deleted file mode') === 0)
|
|
|
|
{
|
2011-10-11 20:51:12 +00:00
|
|
|
$file->action = 'deleted';
|
|
|
|
}
|
|
|
|
|
2012-06-12 18:42:45 +00:00
|
|
|
if (strpos($line, '@@') === 0)
|
|
|
|
{
|
2013-07-13 02:26:21 +00:00
|
|
|
$state = 0;
|
2013-07-28 17:44:05 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if the patch tester is running in a production environment
|
|
|
|
* If so, do not patch certain files as errors will be thrown
|
|
|
|
*/
|
|
|
|
if (!file_exists(JPATH_ROOT . '/installation/CHANGELOG'))
|
|
|
|
{
|
|
|
|
$filePath = explode('/', $file->new);
|
|
|
|
|
|
|
|
if (in_array($filePath[0], $this->nonProductionFolders))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-10-11 20:51:12 +00:00
|
|
|
$files[] = $file;
|
|
|
|
}
|
2013-07-13 02:26:21 +00:00
|
|
|
|
2011-10-11 20:51:12 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-07-13 02:26:21 +00:00
|
|
|
|
2011-10-11 20:51:12 +00:00
|
|
|
return $files;
|
|
|
|
}
|
|
|
|
|
2013-07-13 02:26:21 +00:00
|
|
|
/**
|
|
|
|
* Patches the code with the supplied pull request
|
|
|
|
*
|
|
|
|
* @param integer $id ID of the pull request to apply
|
|
|
|
*
|
|
|
|
* @return boolean
|
|
|
|
*
|
|
|
|
* @since 1.0
|
|
|
|
* @throws Exception
|
|
|
|
*/
|
2011-10-11 13:02:57 +00:00
|
|
|
public function apply($id)
|
|
|
|
{
|
2013-07-13 00:31:00 +00:00
|
|
|
// Only act if there are API hits remaining
|
|
|
|
if ($this->rate->remaining > 0)
|
2012-06-12 18:42:45 +00:00
|
|
|
{
|
2013-07-13 00:31:00 +00:00
|
|
|
$pull = $this->github->pulls->get($this->getState('github_user'), $this->getState('github_repo'), $id);
|
2011-10-11 20:51:12 +00:00
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
if (is_null($pull->head->repo))
|
2012-06-12 18:42:45 +00:00
|
|
|
{
|
2013-07-13 00:31:00 +00:00
|
|
|
throw new Exception(JText::_('COM_PATCHTESTER_REPO_IS_GONE'));
|
2011-10-15 01:13:59 +00:00
|
|
|
}
|
2011-10-11 13:02:57 +00:00
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
$patch = $this->transport->get($pull->diff_url)->body;
|
2011-10-11 20:51:12 +00:00
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
$files = $this->parsePatch($patch);
|
|
|
|
|
2013-07-28 17:44:05 +00:00
|
|
|
if (!$files)
|
|
|
|
{
|
|
|
|
JFactory::getApplication()->enqueueMessage(JText::_('COM_PATCHTESTER_NO_FILES_TO_PATCH', 'message'));
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
foreach ($files as $file)
|
|
|
|
{
|
|
|
|
if ($file->action == 'deleted' && !file_exists(JPATH_ROOT . '/' . $file->old))
|
2012-06-12 18:42:45 +00:00
|
|
|
{
|
2013-07-13 00:31:00 +00:00
|
|
|
throw new Exception(sprintf(JText::_('COM_PATCHTESTER_FILE_DELETED_DOES_NOT_EXIST_S'), $file->old));
|
2011-10-11 20:51:12 +00:00
|
|
|
}
|
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
if ($file->action == 'added' || $file->action == 'modified')
|
|
|
|
{
|
|
|
|
// If the backup file already exists, we can't apply the patch
|
|
|
|
if (file_exists(JPATH_COMPONENT . '/backups/' . md5($file->new) . '.txt'))
|
|
|
|
{
|
|
|
|
throw new Exception(sprintf(JText::_('COM_PATCHTESTER_CONFLICT_S'), $file->new));
|
|
|
|
}
|
2011-10-15 01:09:27 +00:00
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
if ($file->action == 'modified' && !file_exists(JPATH_ROOT . '/' . $file->old))
|
|
|
|
{
|
|
|
|
throw new Exception(sprintf(JText::_('COM_PATCHTESTER_FILE_MODIFIED_DOES_NOT_EXIST_S'), $file->old));
|
|
|
|
}
|
2011-10-11 20:51:12 +00:00
|
|
|
|
2013-07-13 02:26:21 +00:00
|
|
|
$url = 'https://raw.github.com/' . $pull->head->user->login . '/' . $pull->head->repo->name . '/' . $pull->head->ref . '/' . $file->new;
|
2011-10-11 20:51:12 +00:00
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
$file->body = $this->transport->get($url)->body;
|
2011-10-15 01:13:59 +00:00
|
|
|
}
|
2011-10-11 13:02:57 +00:00
|
|
|
}
|
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
jimport('joomla.filesystem.file');
|
|
|
|
|
|
|
|
// At this point, we have ensured that we have all the new files and there are no conflicts
|
|
|
|
foreach ($files as $file)
|
2011-10-11 20:51:12 +00:00
|
|
|
{
|
2013-07-13 00:31:00 +00:00
|
|
|
// We only create a backup if the file already exists
|
|
|
|
if ($file->action == 'deleted' || (file_exists(JPATH_ROOT . '/' . $file->new) && $file->action == 'modified'))
|
|
|
|
{
|
|
|
|
if (!JFile::copy(JPath::clean(JPATH_ROOT . '/' . $file->old), JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt'))
|
2012-06-12 18:42:45 +00:00
|
|
|
{
|
2013-07-13 02:26:21 +00:00
|
|
|
throw new Exception(
|
|
|
|
sprintf('Can not copy file %s to %s', JPATH_ROOT . '/' . $file->old, JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt')
|
|
|
|
);
|
2011-10-15 01:13:59 +00:00
|
|
|
}
|
2013-07-13 00:31:00 +00:00
|
|
|
}
|
2011-10-11 20:51:12 +00:00
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
switch ($file->action)
|
|
|
|
{
|
|
|
|
case 'modified':
|
|
|
|
case 'added':
|
|
|
|
if (!JFile::write(JPath::clean(JPATH_ROOT . '/' . $file->new), $file->body))
|
|
|
|
{
|
|
|
|
throw new Exception(sprintf('Can not write the file: %s', JPATH_ROOT . '/' . $file->new));
|
|
|
|
}
|
2013-07-13 02:26:21 +00:00
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'deleted':
|
|
|
|
if (!JFile::delete(JPATH::clean(JPATH_ROOT . '/' . $file->old)))
|
|
|
|
{
|
|
|
|
throw new Exception(sprintf('Can not delete the file: %s', JPATH_ROOT . '/' . $file->old));
|
|
|
|
}
|
2013-07-13 02:26:21 +00:00
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-10-11 16:04:33 +00:00
|
|
|
}
|
2011-10-15 01:13:59 +00:00
|
|
|
|
2013-07-13 02:26:21 +00:00
|
|
|
$table = JTable::getInstance('tests', 'PatchTesterTable');
|
|
|
|
$table->pull_id = $pull->number;
|
|
|
|
$table->data = json_encode($files);
|
|
|
|
$table->patched_by = JFactory::getUser()->id;
|
|
|
|
$table->applied = 1;
|
2013-07-13 00:31:00 +00:00
|
|
|
$table->applied_version = JVERSION;
|
2011-10-11 13:02:57 +00:00
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
if (!$table->store())
|
|
|
|
{
|
|
|
|
throw new Exception($table->getError());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2012-06-12 18:42:45 +00:00
|
|
|
{
|
2013-07-13 00:31:00 +00:00
|
|
|
throw new Exception(JText::sprintf('COM_PATCHTESTER_API_LIMIT_ACTION', JFactory::getDate($this->rate->reset)));
|
2011-10-11 13:02:57 +00:00
|
|
|
}
|
2011-10-15 01:13:59 +00:00
|
|
|
|
|
|
|
return true;
|
2011-10-11 13:02:57 +00:00
|
|
|
}
|
|
|
|
|
2013-07-13 02:26:21 +00:00
|
|
|
/**
|
|
|
|
* Reverts the specified pull request
|
|
|
|
*
|
|
|
|
* @param integer $id ID of the pull request to Reverts
|
|
|
|
*
|
|
|
|
* @return boolean
|
|
|
|
*
|
|
|
|
* @since 1.0
|
|
|
|
* @throws Exception
|
|
|
|
*/
|
2011-10-11 13:02:57 +00:00
|
|
|
public function revert($id)
|
|
|
|
{
|
|
|
|
$table = JTable::getInstance('tests', 'PatchTesterTable');
|
|
|
|
$table->load($id);
|
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
// We don't want to restore files from an older version
|
|
|
|
if ($table->applied_version != JVERSION)
|
2012-06-12 18:42:45 +00:00
|
|
|
{
|
|
|
|
$table->delete();
|
2012-06-12 20:07:26 +00:00
|
|
|
|
|
|
|
return $this;
|
2011-10-11 13:02:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
$files = json_decode($table->data);
|
|
|
|
|
2012-06-12 18:42:45 +00:00
|
|
|
if (!$files)
|
|
|
|
{
|
2013-07-13 02:26:21 +00:00
|
|
|
throw new Exception(sprintf(JText::_('%s - Error retrieving table data (%s)'), __METHOD__, htmlentities($table->data)));
|
2012-06-12 18:42:45 +00:00
|
|
|
}
|
|
|
|
|
2013-07-13 00:31:00 +00:00
|
|
|
jimport('joomla.filesystem.file');
|
|
|
|
|
2012-06-12 18:42:45 +00:00
|
|
|
foreach ($files as $file)
|
|
|
|
{
|
|
|
|
switch ($file->action)
|
|
|
|
{
|
2011-10-11 20:51:12 +00:00
|
|
|
case 'deleted':
|
|
|
|
case 'modified':
|
2013-07-13 02:26:21 +00:00
|
|
|
if (!JFile::copy(JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt', JPATH_ROOT . '/' . $file->old))
|
2012-06-12 18:42:45 +00:00
|
|
|
{
|
2013-07-13 02:26:21 +00:00
|
|
|
throw new Exception(
|
|
|
|
sprintf(
|
|
|
|
JText::_('Can not copy file %s to %s'),
|
|
|
|
JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt',
|
|
|
|
JPATH_ROOT . '/' . $file->old
|
|
|
|
)
|
|
|
|
);
|
2011-10-15 01:13:59 +00:00
|
|
|
}
|
2012-06-12 18:42:45 +00:00
|
|
|
|
|
|
|
if (!JFile::delete(JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt'))
|
|
|
|
{
|
2013-07-13 02:26:21 +00:00
|
|
|
throw new Exception(sprintf(JText::_('Can not delete the file: %s'), JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt'));
|
2011-10-15 01:13:59 +00:00
|
|
|
}
|
2013-07-13 02:26:21 +00:00
|
|
|
|
2011-10-11 20:51:12 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'added':
|
2012-06-12 18:42:45 +00:00
|
|
|
if (!JFile::delete(JPath::clean(JPATH_ROOT . '/' . $file->new)))
|
|
|
|
{
|
2013-07-13 02:26:21 +00:00
|
|
|
throw new Exception(sprintf(JText::_('Can not delete the file: %s'), JPATH_ROOT . '/' . $file->new));
|
2011-10-15 01:13:59 +00:00
|
|
|
}
|
2013-07-13 02:26:21 +00:00
|
|
|
|
2011-10-11 20:51:12 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-10-11 13:02:57 +00:00
|
|
|
}
|
|
|
|
|
2012-06-12 18:42:45 +00:00
|
|
|
$table->delete();
|
2011-10-11 13:02:57 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|