Skip to content

Fix/app fetcher php compat comparison #25335

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

Merged
rullzer merged 2 commits into from
Jan 27, 2021
Merged

Fix/app fetcher php compat comparison #25335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
652bf9d
Revert "Fix comparison of PHP versions"
ChristophWurst Jan 26, 2021
b4f71cc
Fix app fetcher php comparison to allow wider ranges
ChristophWurst Jan 26, 2021
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
4 changes: 2 additions & 2 deletions lib/private/App/AppStore/Fetcher/AppFetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ protected function fetch($ETag, $content, $allowUnstable = false) {
$phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
$minPhpVersion = $phpVersion->getMinimumVersion();
$maxPhpVersion = $phpVersion->getMaximumVersion();
$minPhpFulfilled = $minPhpVersion === '' || version_compare(
$minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
PHP_VERSION,
$minPhpVersion,
'>='
);
$maxPhpFulfilled = $maxPhpVersion === '' || version_compare(
$maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
PHP_VERSION,
$maxPhpVersion,
'<='
Expand Down
25 changes: 15 additions & 10 deletions lib/private/App/CompareVersion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* @copyright 2018 Christoph Wurst <[email protected]>
*
Expand All @@ -24,12 +27,13 @@
namespace OC\App;

use InvalidArgumentException;
use function explode;

class CompareVersion {
public const REGEX_MAJOR = '/^\d+$/';
public const REGEX_MAJOR_MINOR = '/^\d+.\d+$/';
public const REGEX_MAJOR_MINOR_PATCH = '/^\d+.\d+.\d+$/';
public const REGEX_SERVER = '/^\d+.\d+.\d+(.\d+)?$/';
private const REGEX_MAJOR = '/^\d+$/';
private const REGEX_MAJOR_MINOR = '/^\d+\.\d+$/';
private const REGEX_MAJOR_MINOR_PATCH = '/^\d+\.\d+\.\d+(?!\.\d+)/';
private const REGEX_ACTUAL = '/^\d+(\.\d+){1,2}/';

/**
* Checks if the given server version fulfills the given (app) version requirements.
Expand All @@ -45,18 +49,19 @@ class CompareVersion {
*/
public function isCompatible(string $actual, string $required,
string $comparator = '>='): bool {
if (!preg_match(self::REGEX_SERVER, $actual)) {
throw new InvalidArgumentException('server version is invalid');
if (!preg_match(self::REGEX_ACTUAL, $actual, $matches)) {
throw new InvalidArgumentException("version specification $actual is invalid");
}
$cleanActual = $matches[0];

if (preg_match(self::REGEX_MAJOR, $required) === 1) {
return $this->compareMajor($actual, $required, $comparator);
return $this->compareMajor($cleanActual, $required, $comparator);
} elseif (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
return $this->compareMajorMinor($actual, $required, $comparator);
return $this->compareMajorMinor($cleanActual, $required, $comparator);
} elseif (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
return $this->compareMajorMinorPatch($actual, $required, $comparator);
return $this->compareMajorMinorPatch($cleanActual, $required, $comparator);
} else {
throw new InvalidArgumentException('required version is invalid');
throw new InvalidArgumentException("required version $required is invalid");
}
}

Expand Down
8 changes: 8 additions & 0 deletions tests/lib/App/CompareVersionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* @copyright 2018 Christoph Wurst <[email protected]>
*
Expand Down Expand Up @@ -49,11 +51,17 @@ public function comparisonData() {
['13.0.0', '13', '>=', true],
['13.0.1', '13', '>=', true],
['13.0.1', '13', '<=', true],
['13.0.1.9', '13', '<=', true],
['13.0.1-beta.1', '13', '<=', true],
['7.4.14', '7.4', '<=', true],
['7.4.14-ubuntu', '7.4', '<=', true],
['7.4.14-ubuntu', '7.4.15', '<=', true],
Copy link
Member

@nickvergessen nickvergessen Jan 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also have a false test with Ubuntu

Copy link
Member Author

@ChristophWurst ChristophWurst Jan 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#25348

// Incompatible major versions
['13.0.0.3', '13.0.0', '<', false],
['12.0.0', '13.0.0', '>=', false],
['12.0.0', '13.0', '>=', false],
['12.0.0', '13', '>=', false],
['7.4.15-ubuntu', '7.4.15', '>=', true],
// Incompatible minor and patch versions
['13.0.0', '13.0.1', '>=', false],
['13.0.0', '13.1', '>=', false],
Expand Down