Skip to content
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

Jump to bottom

Bump phpseclib/phpseclib from 2.0.25 to 2.0.30 #25214

Merged
merged 3 commits into from
Jan 21, 2021
Merged

Bump phpseclib/phpseclib from 2.0.25 to 2.0.30 #25214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4373afe
Bump phpseclib/phpseclib from 2.0.25 to 2.0.30
ChristophWurst Jan 19, 2021
d751fed
phpsec lib can't parse multiple certs in one go
rullzer Jan 20, 2021
fcbbcac
Also load CA properly in integrity check
rullzer Jan 20, 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
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 19 files
+1 −0 .gitignore
+1 −1 composer.json
+25 −8 composer.lock
+5 −5 composer/InstalledVersions.php
+25 −8 composer/installed.json
+5 −5 composer/installed.php
+2 −2 composer/package-versions-deprecated/src/PackageVersions/Versions.php
+4 −13 phpseclib/phpseclib/phpseclib/Crypt/Base.php
+0 −1 phpseclib/phpseclib/phpseclib/Crypt/Hash.php
+18 −12 phpseclib/phpseclib/phpseclib/Crypt/RSA.php
+1 −1 phpseclib/phpseclib/phpseclib/Crypt/Random.php
+25 −25 phpseclib/phpseclib/phpseclib/File/ANSI.php
+7 −2 phpseclib/phpseclib/phpseclib/File/ASN1.php
+18 −16 phpseclib/phpseclib/phpseclib/File/X509.php
+11 −11 phpseclib/phpseclib/phpseclib/Math/BigInteger.php
+86 −24 phpseclib/phpseclib/phpseclib/Net/SFTP.php
+2 −3 phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php
+3 −2 phpseclib/phpseclib/phpseclib/Net/SSH1.php
+151 −80 phpseclib/phpseclib/phpseclib/Net/SSH2.php
1 change: 1 addition & 0 deletions apps/files_external/lib/Lib/Storage/SFTP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ public function getConnection() {

$login = false;
foreach ($this->auth as $auth) {
/** @psalm-suppress TooManyArguments */
$login = $this->client->login($this->user, $auth);
if ($login === true) {
break;
Expand Down
22 changes: 20 additions & 2 deletions lib/private/Installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,18 @@ public function updateAppstoreApp($appId, $allowUnstable = false) {
return false;
}

/**
* Split the certificate file in individual certs
*
* @param string $cert
* @return string[]
*/
private function splitCerts(string $cert): array {
preg_match_all('([\-]{3,}[\S\ ]+?[\-]{3,}[\S\s]+?[\-]{3,}[\S\ ]+?[\-]{3,})', $cert, $matches);
Copy link
Member

Choose a reason for hiding this comment

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

Luckily we have tests that confirm this 🙈


return $matches[0];
}

/**
* Downloads an app and puts it into the app directory
*
Expand All @@ -231,12 +243,18 @@ public function downloadApp($appId, $allowUnstable = false) {
if ($app['id'] === $appId) {
// Load the certificate
$certificate = new X509();
$certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
$rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
$rootCrts = $this->splitCerts($rootCrt);
foreach ($rootCrts as $rootCrt) {
$certificate->loadCA($rootCrt);
}
$loadedCertificate = $certificate->loadX509($app['certificate']);

// Verify if the certificate has been revoked
$crl = new X509();
$crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
foreach ($rootCrts as $rootCrt) {
$crl->loadCA($rootCrt);
}
$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
if ($crl->validateSignature() !== true) {
throw new \Exception('Could not validate CRL signature');
Expand Down
18 changes: 17 additions & 1 deletion lib/private/IntegrityCheck/Checker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,18 @@ public function writeCoreSignature(X509 $certificate,
}
}

/**
* Split the certificate file in individual certs
*
* @param string $cert
* @return string[]
*/
private function splitCerts(string $cert): array {
preg_match_all('([\-]{3,}[\S\ ]+?[\-]{3,}[\S\s]+?[\-]{3,}[\S\ ]+?[\-]{3,})', $cert, $matches);

return $matches[0];
}

/**
* Verifies the signature for the specified path.
*
Expand Down Expand Up @@ -333,7 +345,11 @@ private function verify(string $signaturePath, string $basePath, string $certifi
// Check if certificate is signed by Nextcloud Root Authority
$x509 = new \phpseclib\File\X509();
$rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/root.crt');
$x509->loadCA($rootCertificatePublicKey);

$rootCerts = $this->splitCerts($rootCertificatePublicKey);
foreach ($rootCerts as $rootCert) {
$x509->loadCA($rootCert);
}
$x509->loadX509($certificate);
if (!$x509->validateSignature()) {
throw new InvalidSignatureException('Certificate is not valid.');
Expand Down