From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 16 Feb 2021 11:54:29 +0000 (+0100)
Subject: Merge branch '5.3'
X-Git-Tag: 5.4.0_Alpha_1~267
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=37b99ea35a0739525a91bc45a9498f7eec186d16;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.3'
---

37b99ea35a0739525a91bc45a9498f7eec186d16
diff --cc wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
index db446d747d,ea80352a9b..669c05633c
--- a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
@@@ -19,217 -17,230 +19,242 @@@ use wcf\util\FileUtil
  
  /**
   * Shows the package install and update form.
 - * 
 - * @author	Marcel Werk
 - * @copyright	2001-2019 WoltLab GmbH
 - * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
 - * @package	WoltLabSuite\Core\Acp\Form
 + *
 + * @author  Marcel Werk
 + * @copyright   2001-2019 WoltLab GmbH
 + * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
 + * @package WoltLabSuite\Core\Acp\Form
   */
 -class PackageStartInstallForm extends AbstractForm {
 -	/**
 -	 * @inheritDoc
 -	 */
 -	public $activeMenuItem = 'wcf.acp.menu.link.package.install';
 -	
 -	/**
 -	 * updated package object
 -	 * @var	Package
 -	 */
 -	public $package;
 -	
 -	/**
 -	 * data of the uploaded package
 -	 * @var	string[]
 -	 */
 -	public $uploadPackage = '';
 -	
 -	/**
 -	 * archive of the installation/update package
 -	 * @var	PackageArchive
 -	 */
 -	public $archive;
 -	
 -	/**
 -	 * package installation/update queue
 -	 * @var	PackageInstallationQueue
 -	 */
 -	public $queue;
 -	
 -	/**
 -	 * location of the package uploaded via style import
 -	 * @var	string
 -	 */
 -	public $stylePackageImportLocation = '';
 -	
 -	/**
 -	 * @inheritDoc
 -	 */
 -	public function readParameters() {
 -		parent::readParameters();
 -		
 -		$this->stylePackageImportLocation = WCF::getSession()->getVar('stylePackageImportLocation');
 -		if ($this->stylePackageImportLocation) {
 -			$_POST['t'] = WCF::getSession()->getSecurityToken();
 -		}
 -	}
 -	
 -	/**
 -	 * @inheritDoc
 -	 */
 -	public function readFormParameters() {
 -		parent::readFormParameters();
 -		
 -		if (!$this->stylePackageImportLocation) {
 -			if (isset($_FILES['uploadPackage'])) $this->uploadPackage = $_FILES['uploadPackage'];
 -		}
 -	}
 -	
 -	/**
 -	 * @inheritDoc
 -	 */
 -	public function validate() {
 -		parent::validate();
 -		
 -		if ($this->stylePackageImportLocation) {
 -			if (ENABLE_ENTERPRISE_MODE && !WCF::getUser()->hasOwnerAccess()) {
 -				throw new IllegalLinkException();
 -			}
 -			
 -			try {
 -				$this->validateUploadPackage($this->stylePackageImportLocation);
 -			}
 -			catch (UserInputException $e) {
 -				WCF::getSession()->unregister('stylePackageImportLocation');
 -				
 -				throw $e;
 -			}
 -		}
 -		else if (!empty($this->uploadPackage['name'])) {
 -			if (ENABLE_ENTERPRISE_MODE && !WCF::getUser()->hasOwnerAccess()) {
 -				throw new IllegalLinkException();
 -			}
 -			
 -			$this->validateUploadPackage();
 -		}
 -		else {
 -			throw new UserInputException('uploadPackage');
 -		}
 -	}
 -	
 -	/**
 -	 * Validates the upload package input.
 -	 * 
 -	 * @param	string		$filename
 -	 * @throws	UserInputException
 -	 */
 -	protected function validateUploadPackage($filename = '') {
 -		$this->activeTabMenuItem = 'upload';
 -		
 -		if (empty($filename)) {
 -			if (empty($this->uploadPackage['tmp_name'])) {
 -				if (isset($_FILES['uploadPackage']) && $_FILES['uploadPackage']['error'] === UPLOAD_ERR_INI_SIZE) {
 -					throw new UserInputException('uploadPackage', 'exceedsPhpLimit');
 -				}
 -				
 -				throw new UserInputException('uploadPackage', 'uploadFailed');
 -			}
 -			
 -			// get filename
 -			$this->uploadPackage['name'] = FileUtil::getTemporaryFilename('package_', preg_replace('!^.*(?=\.(?:tar\.gz|tgz|tar)$)!i', '', basename($this->uploadPackage['name'])));
 -			
 -			if (!@move_uploaded_file($this->uploadPackage['tmp_name'], $this->uploadPackage['name'])) {
 -				throw new UserInputException('uploadPackage', 'uploadFailed');
 -			}
 -			
 -			$filename = $this->uploadPackage['name'];
 -		}
 -		
 -		if (!PackageValidationManager::getInstance()->validate($filename, false)) {
 -			$exception = PackageValidationManager::getInstance()->getException();
 -			if ($exception instanceof PackageValidationException) {
 -				switch ($exception->getCode()) {
 -					case PackageValidationException::INVALID_PACKAGE_NAME:
 -					case PackageValidationException::MISSING_PACKAGE_XML:
 -						throw new UserInputException('uploadPackage', 'noValidPackage');
 -					break;
 -				}
 -			}
 -		}
 -		
 -		$requirements = PackageValidationManager::getInstance()->getPackageValidationArchive()->getArchive()->getOpenRequirements();
 -		foreach ($requirements as $requirement) {
 -			if ($requirement['name'] !== 'com.woltlab.wcf') {
 -				continue;
 -			}
 -			if ($requirement['action'] !== 'update') {
 -				continue;
 -			}
 -			if (!isset($requirement['file'])) {
 -				continue;
 -			}
 -
 -			$existingVersion = explode('.', $requirement['existingVersion']);
 -			$minversion = explode('.', $requirement['minversion']);
 -			if (
 -				$existingVersion[0] !== $minversion[0]
 -				|| $existingVersion[1] !== $minversion[1]
 -			) {
 -				throw new UserInputException('uploadPackage', 'majorUpgrade');
 -			}
 -		}
 -
 -		$this->package = PackageValidationManager::getInstance()->getPackageValidationArchive()->getPackage();
 -	}
 -	
 -	/**
 -	 * @inheritDoc
 -	 */
 -	public function save() {
 -		parent::save();
 -		
 -		// get new process no
 -		$processNo = PackageInstallationQueue::getNewProcessNo();
 -		
 -		// obey foreign key
 -		$packageID = $this->package ? $this->package->packageID : null;
 -		
 -		$archive = null;
 -		if ($this->stylePackageImportLocation) {
 -			$archive = $this->stylePackageImportLocation;
 -		}
 -		else if (!empty($this->uploadPackage['tmp_name'])) {
 -			$archive = $this->uploadPackage['name'];
 -		}
 -		
 -		// insert queue
 -		$isApplication = PackageValidationManager::getInstance()->getPackageValidationArchive()->getArchive()->getPackageInfo('isApplication');
 -		$this->queue = PackageInstallationQueueEditor::create([
 -			'processNo' => $processNo,
 -			'userID' => WCF::getUser()->userID,
 -			'package' => PackageValidationManager::getInstance()->getPackageValidationArchive()->getArchive()->getPackageInfo('name'),
 -			'packageName' => PackageValidationManager::getInstance()->getPackageValidationArchive()->getArchive()->getLocalizedPackageInfo('packageName'),
 -			'packageID' => $packageID,
 -			'archive' => $archive,
 -			'action' => $this->package != null ? 'update' : 'install',
 -			'isApplication' => !$isApplication ? '0' : '1'
 -		]);
 -		
 -		$this->saved();
 -		
 -		// open queue
 -		PackageInstallationDispatcher::openQueue(0, $processNo);
 -	}
 -	
 -	/**
 -	 * @inheritDoc
 -	 */
 -	public function assignVariables() {
 -		parent::assignVariables();
 -		
 -		WCF::getTPL()->assign([
 -			'package' => $this->package,
 -			'installingImportedStyle' => $this->stylePackageImportLocation != ''
 -		]);
 -	}
 -	
 -	/**
 -	 * @inheritDoc
 -	 */
 -	public function show() {
 -		if (!WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage') && !WCF::getSession()->getPermission('admin.configuration.package.canUpdatePackage')) {
 -			throw new PermissionDeniedException();
 -		}
 -		
 -		// check master password
 -		WCFACP::checkMasterPassword();
 -		
 -		parent::show();
 -	}
 +class PackageStartInstallForm extends AbstractForm
 +{
 +    /**
 +     * @inheritDoc
 +     */
 +    public $activeMenuItem = 'wcf.acp.menu.link.package.install';
 +
 +    /**
 +     * updated package object
 +     * @var Package
 +     */
 +    public $package;
 +
 +    /**
 +     * data of the uploaded package
 +     * @var string[]
 +     */
 +    public $uploadPackage = '';
 +
 +    /**
 +     * archive of the installation/update package
 +     * @var PackageArchive
 +     */
 +    public $archive;
 +
 +    /**
 +     * package installation/update queue
 +     * @var PackageInstallationQueue
 +     */
 +    public $queue;
 +
 +    /**
 +     * location of the package uploaded via style import
 +     * @var string
 +     */
 +    public $stylePackageImportLocation = '';
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function readParameters()
 +    {
 +        parent::readParameters();
 +
 +        $this->stylePackageImportLocation = WCF::getSession()->getVar('stylePackageImportLocation');
 +        if ($this->stylePackageImportLocation) {
 +            $_POST['t'] = WCF::getSession()->getSecurityToken();
 +        }
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function readFormParameters()
 +    {
 +        parent::readFormParameters();
 +
 +        if (!$this->stylePackageImportLocation) {
 +            if (isset($_FILES['uploadPackage'])) {
 +                $this->uploadPackage = $_FILES['uploadPackage'];
 +            }
 +        }
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function validate()
 +    {
 +        parent::validate();
 +
 +        if ($this->stylePackageImportLocation) {
 +            if (ENABLE_ENTERPRISE_MODE && !WCF::getUser()->hasOwnerAccess()) {
 +                throw new IllegalLinkException();
 +            }
 +
 +            try {
 +                $this->validateUploadPackage($this->stylePackageImportLocation);
 +            } catch (UserInputException $e) {
 +                WCF::getSession()->unregister('stylePackageImportLocation');
 +
 +                throw $e;
 +            }
 +        } elseif (!empty($this->uploadPackage['name'])) {
 +            if (ENABLE_ENTERPRISE_MODE && !WCF::getUser()->hasOwnerAccess()) {
 +                throw new IllegalLinkException();
 +            }
 +
 +            $this->validateUploadPackage();
 +        } else {
 +            throw new UserInputException('uploadPackage');
 +        }
 +    }
 +
 +    /**
 +     * Validates the upload package input.
 +     *
 +     * @param string $filename
 +     * @throws  UserInputException
 +     */
 +    protected function validateUploadPackage($filename = '')
 +    {
 +        $this->activeTabMenuItem = 'upload';
 +
 +        if (empty($filename)) {
 +            if (empty($this->uploadPackage['tmp_name'])) {
 +                if (isset($_FILES['uploadPackage']) && $_FILES['uploadPackage']['error'] === \UPLOAD_ERR_INI_SIZE) {
 +                    throw new UserInputException('uploadPackage', 'exceedsPhpLimit');
 +                }
 +
 +                throw new UserInputException('uploadPackage', 'uploadFailed');
 +            }
 +
 +            // get filename
 +            $this->uploadPackage['name'] = FileUtil::getTemporaryFilename(
 +                'package_',
 +                \preg_replace('!^.*(?=\.(?:tar\.gz|tgz|tar)$)!i', '', \basename($this->uploadPackage['name']))
 +            );
 +
 +            if (!@\move_uploaded_file($this->uploadPackage['tmp_name'], $this->uploadPackage['name'])) {
 +                throw new UserInputException('uploadPackage', 'uploadFailed');
 +            }
 +
 +            $filename = $this->uploadPackage['name'];
 +        }
 +
 +        if (!PackageValidationManager::getInstance()->validate($filename, false)) {
 +            $exception = PackageValidationManager::getInstance()->getException();
 +            if ($exception instanceof PackageValidationException) {
 +                switch ($exception->getCode()) {
 +                    case PackageValidationException::INVALID_PACKAGE_NAME:
 +                    case PackageValidationException::MISSING_PACKAGE_XML:
 +                        throw new UserInputException('uploadPackage', 'noValidPackage');
 +                        break;
 +                }
 +            }
 +        }
 +
++        $requirements = PackageValidationManager::getInstance()
++            ->getPackageValidationArchive()
++            ->getArchive()
++            ->getOpenRequirements();
++        foreach ($requirements as $requirement) {
++            if ($requirement['name'] !== 'com.woltlab.wcf') {
++                continue;
++            }
++            if ($requirement['action'] !== 'update') {
++                continue;
++            }
++            if (!isset($requirement['file'])) {
++                continue;
++            }
++
++            $existingVersion = \explode('.', $requirement['existingVersion']);
++            $minversion = \explode('.', $requirement['minversion']);
++            if (
++                $existingVersion[0] !== $minversion[0]
++                || $existingVersion[1] !== $minversion[1]
++            ) {
++                throw new UserInputException('uploadPackage', 'majorUpgrade');
++            }
++        }
++
 +        $this->package = PackageValidationManager::getInstance()->getPackageValidationArchive()->getPackage();
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function save()
 +    {
 +        parent::save();
 +
 +        // get new process no
 +        $processNo = PackageInstallationQueue::getNewProcessNo();
 +
 +        // obey foreign key
 +        $packageID = $this->package ? $this->package->packageID : null;
 +
 +        $archive = null;
 +        if ($this->stylePackageImportLocation) {
 +            $archive = $this->stylePackageImportLocation;
 +        } elseif (!empty($this->uploadPackage['tmp_name'])) {
 +            $archive = $this->uploadPackage['name'];
 +        }
 +
 +        // insert queue
 +        $isApplication = PackageValidationManager::getInstance()->getPackageValidationArchive()->getArchive()->getPackageInfo('isApplication');
 +        $this->queue = PackageInstallationQueueEditor::create([
 +            'processNo' => $processNo,
 +            'userID' => WCF::getUser()->userID,
 +            'package' => PackageValidationManager::getInstance()->getPackageValidationArchive()->getArchive()->getPackageInfo('name'),
 +            'packageName' => PackageValidationManager::getInstance()->getPackageValidationArchive()->getArchive()->getLocalizedPackageInfo('packageName'),
 +            'packageID' => $packageID,
 +            'archive' => $archive,
 +            'action' => $this->package != null ? 'update' : 'install',
 +            'isApplication' => !$isApplication ? '0' : '1',
 +        ]);
 +
 +        $this->saved();
 +
 +        // open queue
 +        PackageInstallationDispatcher::openQueue(0, $processNo);
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function assignVariables()
 +    {
 +        parent::assignVariables();
 +
 +        WCF::getTPL()->assign([
 +            'package' => $this->package,
 +            'installingImportedStyle' => $this->stylePackageImportLocation != '',
 +        ]);
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function show()
 +    {
 +        if (!WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage') && !WCF::getSession()->getPermission('admin.configuration.package.canUpdatePackage')) {
 +            throw new PermissionDeniedException();
 +        }
 +
 +        // check master password
 +        WCFACP::checkMasterPassword();
 +
 +        parent::show();
 +    }
  }