Skip to content

Commit 49415a8

Browse files
vitormattosvitormattos
authored
Merge pull request #7803 from LibreSign/backport/7801/stable32
[stable32] refactor(deps): move phpseclib to 3rdparty scoped vendor
2 parents 5bdd81d + 87bc8f9 commit 49415a8

13 files changed

Lines changed: 28 additions & 257 deletions

File tree

‎.github/workflows/playwright.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ jobs:
8484
- name: Install system dependencies
8585
run: |
8686
apt-get update
87-
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends poppler-utils
87+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
88+
poppler-utils \
89+
libgd3 \
90+
libc-client2007e
8891
8992
- name: Checkout server
9093
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
@@ -111,7 +114,7 @@ jobs:
111114
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # 2.37.1
112115
with:
113116
php-version: ${{ steps.php_versions.outputs.php-min }}
114-
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, sqlite, pdo_sqlite, xmlreader, xmlwriter, zip, zlib
117+
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imap, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, sqlite, pdo_sqlite, xmlreader, xmlwriter, zip, zlib
115118
coverage: none
116119
ini-file: development
117120
ini-values: disable_functions=

‎3rdparty‎

Submodule 3rdparty updated 375 files

‎composer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
}
6161
},
6262
"require": {
63-
"cweagans/composer-patches": "^2.0",
64-
"phpseclib/phpseclib": "^3.0"
63+
"cweagans/composer-patches": "^2.0"
6564
}
6665
}

‎composer.lock‎

Lines changed: 0 additions & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/Command/Developer/SignSetup.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
use OC\Core\Command\Base;
1313
use OCA\Libresign\Service\Install\InstallService;
1414
use OCA\Libresign\Service\Install\SignSetupService;
15+
use OCA\Libresign\Vendor\phpseclib3\Crypt\RSA;
16+
use OCA\Libresign\Vendor\phpseclib3\Exception\NoKeyLoadedException;
17+
use OCA\Libresign\Vendor\phpseclib3\File\X509;
1518
use OCP\IConfig;
16-
use phpseclib3\Crypt\RSA;
17-
use phpseclib3\Exception\NoKeyLoadedException;
18-
use phpseclib3\File\X509;
1919
use Symfony\Component\Console\Input\InputInterface;
2020
use Symfony\Component\Console\Input\InputOption;
2121
use Symfony\Component\Console\Output\OutputInterface;

‎lib/Handler/CertificateEngine/AEngineHandler.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ public function generateCrlDer(array $revokedCertificates, string $instanceId, i
812812
return $crlDerData;
813813
}
814814

815-
private function loadCaIssuer(string $configPath): \phpseclib3\File\X509 {
815+
private function loadCaIssuer(string $configPath): \OCA\Libresign\Vendor\phpseclib3\File\X509 {
816816
$caCertPath = $configPath . DIRECTORY_SEPARATOR . 'ca.pem';
817817
$caKeyPath = $configPath . DIRECTORY_SEPARATOR . 'ca-key.pem';
818818

@@ -829,11 +829,11 @@ private function loadCaIssuer(string $configPath): \phpseclib3\File\X509 {
829829
throw new \RuntimeException('Failed to read CA certificate or private key');
830830
}
831831

832-
$issuer = new \phpseclib3\File\X509();
832+
$issuer = new \OCA\Libresign\Vendor\phpseclib3\File\X509();
833833
$issuer->loadX509($caCert);
834-
$caPrivateKey = \phpseclib3\Crypt\PublicKeyLoader::load($caKey);
834+
$caPrivateKey = \OCA\Libresign\Vendor\phpseclib3\Crypt\PublicKeyLoader::load($caKey);
835835

836-
if (!$caPrivateKey instanceof \phpseclib3\Crypt\Common\PrivateKey) {
836+
if (!$caPrivateKey instanceof \OCA\Libresign\Vendor\phpseclib3\Crypt\Common\PrivateKey) {
837837
$this->logger->error('Loaded key is not a private key', ['keyType' => get_class($caPrivateKey)]);
838838
throw new \RuntimeException('Loaded key is not a private key');
839839
}
@@ -842,9 +842,9 @@ private function loadCaIssuer(string $configPath): \phpseclib3\File\X509 {
842842
return $issuer;
843843
}
844844

845-
private function createAndSignCrl(\phpseclib3\File\X509 $issuer, array $revokedCertificates, int $crlNumber): array {
845+
private function createAndSignCrl(\OCA\Libresign\Vendor\phpseclib3\File\X509 $issuer, array $revokedCertificates, int $crlNumber): array {
846846
$utcZone = new \DateTimeZone('UTC');
847-
$crlToSign = new \phpseclib3\File\X509();
847+
$crlToSign = new \OCA\Libresign\Vendor\phpseclib3\File\X509();
848848
$crlToSign->setSerialNumber((string)$crlNumber, 10);
849849
$crlToSign->setStartDate(new \DateTime('now', $utcZone));
850850
$crlToSign->setEndDate(new \DateTime('+7 days', $utcZone));
@@ -869,7 +869,7 @@ private function createAndSignCrl(\phpseclib3\File\X509 $issuer, array $revokedC
869869
$serialNumber = $cert->getSerialNumber();
870870
$normalizedSerial = ltrim($serialNumber, '0') ?: '0';
871871
$crlToSign->revoke(
872-
new \phpseclib3\Math\BigInteger($normalizedSerial, 16),
872+
new \OCA\Libresign\Vendor\phpseclib3\Math\BigInteger($normalizedSerial, 16),
873873
$cert->getRevokedAt()->format($dateFormat)
874874
);
875875
}
@@ -893,9 +893,9 @@ private function createAndSignCrl(\phpseclib3\File\X509 $issuer, array $revokedC
893893

894894
private function saveCrlToDer(array $signedCrl, string $configPath): string {
895895
$crlDerPath = $configPath . DIRECTORY_SEPARATOR . 'crl.der';
896-
$crlToSign = new \phpseclib3\File\X509();
896+
$crlToSign = new \OCA\Libresign\Vendor\phpseclib3\File\X509();
897897

898-
$crlDerData = $crlToSign->saveCRL($signedCrl, \phpseclib3\File\X509::FORMAT_DER);
898+
$crlDerData = $crlToSign->saveCRL($signedCrl, \OCA\Libresign\Vendor\phpseclib3\File\X509::FORMAT_DER);
899899

900900
if ($crlDerData === false) {
901901
$this->logger->error('Failed to save CRL in DER format');

‎lib/Handler/SignEngine/Pkcs12Handler.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
use OCA\Libresign\Service\CaIdentifierService;
2020
use OCA\Libresign\Service\Crl\CrlService;
2121
use OCA\Libresign\Service\FolderService;
22+
use OCA\Libresign\Vendor\phpseclib3\File\ASN1;
2223
use OCP\Files\File;
2324
use OCP\IAppConfig;
2425
use OCP\IL10N;
2526
use OCP\ITempManager;
26-
use phpseclib3\File\ASN1;
2727
use Psr\Log\LoggerInterface;
2828

2929
class Pkcs12Handler extends SignEngineHandler {

‎lib/Handler/SignEngine/TSA.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
namespace OCA\Libresign\Handler\SignEngine;
1010

11-
use phpseclib3\File\ASN1;
12-
use phpseclib3\File\ASN1\Element;
13-
use phpseclib3\Math\BigInteger;
11+
use OCA\Libresign\Vendor\phpseclib3\File\ASN1;
12+
use OCA\Libresign\Vendor\phpseclib3\File\ASN1\Element;
13+
use OCA\Libresign\Vendor\phpseclib3\Math\BigInteger;
1414

1515
class TSA {
1616
private static bool $areOidsInitialized = false;

‎lib/Service/Install/SignSetupService.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
use OCA\Libresign\Exception\SignatureDataNotFoundException;
1818
use OCA\Libresign\Handler\CertificateEngine\CertificateHelper;
1919
use OCA\Libresign\Vendor\LibreSign\WhatOSAmI\OperatingSystem;
20+
use OCA\Libresign\Vendor\phpseclib3\Crypt\PublicKeyLoader;
21+
use OCA\Libresign\Vendor\phpseclib3\Crypt\RSA;
22+
use OCA\Libresign\Vendor\phpseclib3\Crypt\RSA\PrivateKey;
23+
use OCA\Libresign\Vendor\phpseclib3\File\X509;
2024
use OCP\App\IAppManager;
2125
use OCP\Files\AppData\IAppDataFactory;
2226
use OCP\Files\IAppData;
@@ -25,10 +29,6 @@
2529
use OCP\IAppConfig;
2630
use OCP\IConfig;
2731
use OCP\ITempManager;
28-
use phpseclib3\Crypt\PublicKeyLoader;
29-
use phpseclib3\Crypt\RSA;
30-
use phpseclib3\Crypt\RSA\PrivateKey;
31-
use phpseclib3\File\X509;
3232

3333
class SignSetupService {
3434
private array $exclude = [

‎scoper.inc.php‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

0 commit comments

Comments
 (0)