Fix latest libsodium compatibility (#388)

* fix #384

* bypass password-argon2 micro sanity check

* ignore funding yaml schema [skip ci]

* test linux compatibility for libargon2 and libsodium

* update composer.json to prevent smart-aleck composer [skip ci]

.github/FUNDING.yml

@@ -10,4 +10,6 @@ liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+# noinspection YAMLSchemaValidation
+buy_me_a_coffee: crazywhalecc
 custom: 'https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md' # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

composer.json

@@ -54,5 +54,11 @@
         },
         "optimize-autoloader": true,
         "sort-packages": true
-    }
+    },
+    "funding": [
+        {
+            "type": "other",
+            "url": "https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md"
+        }
+    ]
 }

config/ext.json

@@ -317,6 +317,15 @@
             "sqlite"
         ]
     },
+    "pdo_sqlsrv": {
+        "type": "external",
+        "source": "pdo_sqlsrv",
+        "arg-type": "with",
+        "ext-depends": [
+            "pdo",
+            "sqlsrv"
+        ]
+    },
     "pgsql": {
         "type": "builtin",
         "arg-type": "with-prefix",

config/source.json

@@ -224,7 +224,7 @@
     "libargon2": {
         "type": "git",
         "rev": "master",
-        "url": "https://github.com/mpociot/phc-winner-argon2",
+        "url": "https://github.com/static-php/phc-winner-argon2",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -495,6 +495,16 @@
             "path": "LICENSE.txt"
         }
     },
+    "pdo_sqlsrv": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/pdo_sqlsrv",
+        "path": "php-src/ext/pdo_sqlsrv",
+        "filename": "pdo_sqlsrv.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "pkg-config": {
         "type": "url",
         "url": "https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz",

src/SPC/ConsoleApplication.php

@@ -25,7 +25,7 @@ use Symfony\Component\Console\Command\ListCommand;
  */
 final class ConsoleApplication extends Application
 {
-    public const VERSION = '2.1.4';
+    public const VERSION = '2.1.5';
 
     public function __construct()
     {

src/SPC/builder/extension/password_argon2.php

@@ -11,6 +11,11 @@ use SPC\util\CustomExt;
 #[CustomExt('password-argon2')]
 class password_argon2 extends Extension
 {
+    public function getDistName(): string
+    {
+        return '';
+    }
+
     public function runCliCheckUnix(): void
     {
         [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -r "assert(defined(\'PASSWORD_ARGON2I\'));"');

src/SPC/builder/linux/library/libargon2.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
-use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 
 class libargon2 extends LinuxLibraryBase
@@ -15,10 +14,6 @@ class libargon2 extends LinuxLibraryBase
 
     public function patchBeforeBuild(): bool
     {
-        // detect libsodium (The libargon2 conflicts with the libsodium library.)
-        if ($this->builder->getLib('libsodium') !== null) {
-            throw new WrongUsageException('libargon2 (required by password-argon2) conflicts with the libsodium library !');
-        }
         FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'LIBRARY_REL ?= lib/x86_64-linux-gnu', 'LIBRARY_REL ?= lib');
         return true;
     }

src/SPC/command/DownloadCommand.php

@@ -39,6 +39,7 @@ class DownloadCommand extends BaseCommand
         $this->addOption('for-libs', 'l', InputOption::VALUE_REQUIRED, 'Fetch by libraries, e.g "libcares,openssl,onig"');
         $this->addOption('without-suggestions', null, null, 'Do not fetch suggested sources when using --for-extensions');
         $this->addOption('ignore-cache-sources', null, InputOption::VALUE_REQUIRED, 'Ignore some source caches, comma separated, e.g "php-src,curl,openssl"', '');
+        $this->addOption('retry', 'R', InputOption::VALUE_REQUIRED, 'Set retry time when downloading failed (default: 0)', '0');
     }
 
     /**
@@ -127,6 +128,10 @@ class DownloadCommand extends BaseCommand
                 return static::FAILURE;
             }
 
+            // retry
+            $retry = intval($this->getOption('retry'));
+            f_putenv('SPC_RETRY_TIME=' . $retry);
+
             // Use shallow-clone can reduce git resource download
             if ($this->getOption('shallow-clone')) {
                 define('GIT_SHALLOW_CLONE', true);

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -40,6 +40,10 @@ class LinuxToolCheckList
         'xz',
     ];
 
+    private const PROVIDED_COMMAND = [
+        'binutils-gold' => 'ld.gold',
+    ];
+
     /** @noinspection PhpUnused */
     #[AsCheckItem('if necessary tools are installed', limit_os: 'Linux', level: 999)]
     public function checkCliTools(): ?CheckResult
@@ -52,9 +56,9 @@ class LinuxToolCheckList
             default => self::TOOLS_DEBIAN,
         };
         $missing = [];
-        foreach ($required as $cmd) {
-            if ($this->findCommand($cmd) === null) {
-                $missing[] = $cmd;
+        foreach ($required as $package) {
+            if ($this->findCommand(self::PROVIDED_COMMAND[$package] ?? $package) === null) {
+                $missing[] = $package;
             }
         }
         if (!empty($missing)) {

src/SPC/store/Downloader.php

@@ -7,6 +7,7 @@ namespace SPC\store;
 use SPC\exception\DownloaderException;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
 use SPC\store\source\CustomSourceBase;
 
 /**
@@ -26,7 +27,8 @@ class Downloader
     {
         logger()->debug("finding {$name} source from bitbucket tag");
         $data = json_decode(self::curlExec(
-            url: "https://api.bitbucket.org/2.0/repositories/{$source['repo']}/refs/tags"
+            url: "https://api.bitbucket.org/2.0/repositories/{$source['repo']}/refs/tags",
+            retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0)
         ), true);
         $ver = $data['values'][0]['name'];
         if (!$ver) {
@@ -35,7 +37,8 @@ class Downloader
         $url = "https://bitbucket.org/{$source['repo']}/get/{$ver}.tar.gz";
         $headers = self::curlExec(
             url: $url,
-            method: 'HEAD'
+            method: 'HEAD',
+            retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0)
         );
         preg_match('/^content-disposition:\s+attachment;\s*filename=("?)(?<filename>.+\.tar\.gz)\1/im', $headers, $matches);
         if ($matches) {
@@ -62,7 +65,8 @@ class Downloader
         logger()->debug("finding {$name} source from github {$type} tarball");
         $data = json_decode(self::curlExec(
             url: "https://api.github.com/repos/{$source['repo']}/{$type}",
-            hooks: [[CurlHook::class, 'setupGithubToken']]
+            hooks: [[CurlHook::class, 'setupGithubToken']],
+            retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0)
         ), true);
         $url = $data[0]['tarball_url'];
         if (!$url) {
@@ -72,6 +76,7 @@ class Downloader
             url: $url,
             method: 'HEAD',
             hooks: [[CurlHook::class, 'setupGithubToken']],
+            retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0)
         );
         preg_match('/^content-disposition:\s+attachment;\s*filename=("?)(?<filename>.+\.tar\.gz)\1/im', $headers, $matches);
         if ($matches) {
@@ -97,6 +102,7 @@ class Downloader
         $data = json_decode(self::curlExec(
             url: "https://api.github.com/repos/{$source['repo']}/releases",
             hooks: [[CurlHook::class, 'setupGithubToken']],
+            retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0)
         ), true);
         $url = null;
         foreach ($data as $release) {
@@ -130,7 +136,7 @@ class Downloader
     public static function getFromFileList(string $name, array $source): array
     {
         logger()->debug("finding {$name} source from file list");
-        $page = self::curlExec($source['url']);
+        $page = self::curlExec($source['url'], retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0));
         preg_match_all($source['regex'], $page, $matches);
         if (!$matches) {
             throw new DownloaderException("Failed to get {$name} version");
@@ -175,7 +181,7 @@ class Downloader
             }
         };
         self::registerCancelEvent($cancel_func);
-        self::curlDown(url: $url, path: FileSystem::convertPath(DOWNLOAD_PATH . "/{$filename}"));
+        self::curlDown(url: $url, path: FileSystem::convertPath(DOWNLOAD_PATH . "/{$filename}"), retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0));
         self::unregisterCancelEvent();
         logger()->debug("Locking {$filename}");
         self::lockSource($name, ['source_type' => 'archive', 'filename' => $filename, 'move_path' => $move_path]);
@@ -203,7 +209,7 @@ class Downloader
      * @throws FileSystemException
      * @throws RuntimeException
      */
-    public static function downloadGit(string $name, string $url, string $branch, ?string $move_path = null): void
+    public static function downloadGit(string $name, string $url, string $branch, ?string $move_path = null, int $retry = 0): void
     {
         $download_path = FileSystem::convertPath(DOWNLOAD_PATH . "/{$name}");
         if (file_exists($download_path)) {
@@ -217,14 +223,25 @@ class Downloader
                 FileSystem::removeDir($download_path);
             }
         };
-        self::registerCancelEvent($cancel_func);
-        f_passthru(
-            SPC_GIT_EXEC . ' clone' . $check .
-            ' --config core.autocrlf=false ' .
-            "--branch \"{$branch}\" " . (defined('GIT_SHALLOW_CLONE') ? '--depth 1 --single-branch' : '') . " --recursive \"{$url}\" \"{$download_path}\""
-        );
-        self::unregisterCancelEvent();
-
+        try {
+            self::registerCancelEvent($cancel_func);
+            f_passthru(
+                SPC_GIT_EXEC . ' clone' . $check .
+                ' --config core.autocrlf=false ' .
+                "--branch \"{$branch}\" " . (defined('GIT_SHALLOW_CLONE') ? '--depth 1 --single-branch' : '') . " --recursive \"{$url}\" \"{$download_path}\""
+            );
+        } catch (RuntimeException $e) {
+            if ($e->getCode() === 2 || $e->getCode() === -1073741510) {
+                throw new WrongUsageException('Keyboard interrupted, download failed !');
+            }
+            if ($retry > 0) {
+                self::downloadGit($name, $url, $branch, $move_path, $retry - 1);
+                return;
+            }
+            throw $e;
+        } finally {
+            self::unregisterCancelEvent();
+        }
         // Lock
         logger()->debug("Locking git source {$name}");
         self::lockSource($name, ['source_type' => 'dir', 'dirname' => $name, 'move_path' => $move_path]);
@@ -311,7 +328,13 @@ class Downloader
                     self::downloadFile($name, $url, $filename, $pkg['extract'] ?? null);
                     break;
                 case 'git':             // Git repo
-                    self::downloadGit($name, $pkg['url'], $pkg['rev'], $pkg['extract'] ?? null);
+                    self::downloadGit(
+                        $name,
+                        $pkg['url'],
+                        $pkg['rev'],
+                        $pkg['extract'] ?? null,
+                        intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0)
+                    );
                     break;
                 case 'custom':          // Custom download method, like API-based download or other
                     $classes = FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/store/source', 'SPC\\store\\source');
@@ -405,7 +428,13 @@ class Downloader
                     self::downloadFile($name, $url, $filename, $source['path'] ?? null);
                     break;
                 case 'git':             // Git repo
-                    self::downloadGit($name, $source['url'], $source['rev'], $source['path'] ?? null);
+                    self::downloadGit(
+                        $name,
+                        $source['url'],
+                        $source['rev'],
+                        $source['path'] ?? null,
+                        intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0)
+                    );
                     break;
                 case 'custom':          // Custom download method, like API-based download or other
                     $classes = FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/store/source', 'SPC\\store\\source');
@@ -435,57 +464,71 @@ class Downloader
      *
      * @throws DownloaderException
      */
-    public static function curlExec(string $url, string $method = 'GET', array $headers = [], array $hooks = []): string
+    public static function curlExec(string $url, string $method = 'GET', array $headers = [], array $hooks = [], int $retry = 0): string
     {
         foreach ($hooks as $hook) {
             $hook($method, $url, $headers);
         }
 
-        FileSystem::findCommandPath('curl');
+        try {
+            FileSystem::findCommandPath('curl');
 
-        $methodArg = match ($method) {
-            'GET' => '',
-            'HEAD' => '-I',
-            default => "-X \"{$method}\"",
-        };
-        $headerArg = implode(' ', array_map(fn ($v) => '"-H' . $v . '"', $headers));
+            $methodArg = match ($method) {
+                'GET' => '',
+                'HEAD' => '-I',
+                default => "-X \"{$method}\"",
+            };
+            $headerArg = implode(' ', array_map(fn ($v) => '"-H' . $v . '"', $headers));
 
-        $cmd = SPC_CURL_EXEC . " -sfSL {$methodArg} {$headerArg} \"{$url}\"";
-        if (getenv('CACHE_API_EXEC') === 'yes') {
-            if (!file_exists(FileSystem::convertPath(DOWNLOAD_PATH . '/.curl_exec_cache'))) {
-                $cache = [];
-            } else {
-                $cache = json_decode(file_get_contents(FileSystem::convertPath(DOWNLOAD_PATH . '/.curl_exec_cache')), true);
-            }
-            if (isset($cache[$cmd]) && $cache[$cmd]['expire'] >= time()) {
+            $cmd = SPC_CURL_EXEC . " -sfSL {$methodArg} {$headerArg} \"{$url}\"";
+            if (getenv('CACHE_API_EXEC') === 'yes') {
+                if (!file_exists(FileSystem::convertPath(DOWNLOAD_PATH . '/.curl_exec_cache'))) {
+                    $cache = [];
+                } else {
+                    $cache = json_decode(file_get_contents(FileSystem::convertPath(DOWNLOAD_PATH . '/.curl_exec_cache')), true);
+                }
+                if (isset($cache[$cmd]) && $cache[$cmd]['expire'] >= time()) {
+                    return $cache[$cmd]['cache'];
+                }
+                f_exec($cmd, $output, $ret);
+                if ($ret === 2 || $ret === -1073741510) {
+                    throw new RuntimeException('failed http fetch');
+                }
+                if ($ret !== 0) {
+                    throw new DownloaderException('failed http fetch');
+                }
+                $cache[$cmd]['cache'] = implode("\n", $output);
+                $cache[$cmd]['expire'] = time() + 3600;
+                file_put_contents(FileSystem::convertPath(DOWNLOAD_PATH . '/.curl_exec_cache'), json_encode($cache));
                 return $cache[$cmd]['cache'];
             }
             f_exec($cmd, $output, $ret);
+            if ($ret === 2 || $ret === -1073741510) {
+                throw new RuntimeException('failed http fetch');
+            }
             if ($ret !== 0) {
                 throw new DownloaderException('failed http fetch');
             }
-            $cache[$cmd]['cache'] = implode("\n", $output);
-            $cache[$cmd]['expire'] = time() + 3600;
-            file_put_contents(FileSystem::convertPath(DOWNLOAD_PATH . '/.curl_exec_cache'), json_encode($cache));
-            return $cache[$cmd]['cache'];
+            return implode("\n", $output);
+        } catch (DownloaderException $e) {
+            if ($retry > 0) {
+                logger()->notice('Retrying curl exec ...');
+                return self::curlExec($url, $method, $headers, $hooks, $retry - 1);
+            }
+            throw $e;
         }
-        f_exec($cmd, $output, $ret);
-        if ($ret !== 0) {
-            throw new DownloaderException('failed http fetch');
-        }
-        return implode("\n", $output);
     }
 
     /**
      * Use curl to download sources from url
      *
-     * @throws DownloaderException
      * @throws RuntimeException
      */
-    public static function curlDown(string $url, string $path, string $method = 'GET', array $headers = [], array $hooks = []): void
+    public static function curlDown(string $url, string $path, string $method = 'GET', array $headers = [], array $hooks = [], int $retry = 0): void
     {
+        $used_headers = $headers;
         foreach ($hooks as $hook) {
-            $hook($method, $url, $headers);
+            $hook($method, $url, $used_headers);
         }
 
         $methodArg = match ($method) {
@@ -493,10 +536,23 @@ class Downloader
             'HEAD' => '-I',
             default => "-X \"{$method}\"",
         };
-        $headerArg = implode(' ', array_map(fn ($v) => '"-H' . $v . '"', $headers));
+        $headerArg = implode(' ', array_map(fn ($v) => '"-H' . $v . '"', $used_headers));
         $check = !defined('DEBUG_MODE') ? 's' : '#';
         $cmd = SPC_CURL_EXEC . " -{$check}fSL -o \"{$path}\" {$methodArg} {$headerArg} \"{$url}\"";
-        f_passthru($cmd);
+        try {
+            f_passthru($cmd);
+        } catch (RuntimeException $e) {
+            var_dump($e->getCode());
+            if ($e->getCode() === 2 || $e->getCode() === -1073741510) {
+                throw new WrongUsageException('Keyboard interrupted, download failed !');
+            }
+            if ($retry > 0) {
+                logger()->notice('Retrying curl download ...');
+                self::curlDown($url, $path, $method, $used_headers, retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0));
+                return;
+            }
+            throw $e;
+        }
     }
 
     /**
@@ -509,7 +565,7 @@ class Downloader
         if (PHP_OS_FAMILY === 'Windows') {
             sapi_windows_set_ctrl_handler($callback);
         } elseif (extension_loaded('pcntl')) {
-            pcntl_signal(SIGINT, $callback);
+            pcntl_signal(2, $callback);
         } else {
             logger()->debug('You have not enabled `pcntl` extension, cannot prevent download file corruption when Ctrl+C');
         }
@@ -523,7 +579,7 @@ class Downloader
         if (PHP_OS_FAMILY === 'Windows') {
             sapi_windows_set_ctrl_handler(null);
         } elseif (extension_loaded('pcntl')) {
-            pcntl_signal(SIGINT, SIG_IGN);
+            pcntl_signal(2, SIG_IGN);
         }
     }
 }

src/SPC/store/PackageManager.php

@@ -24,6 +24,7 @@ class PackageManager
                 default => throw new WrongUsageException('Unsupported OS!'),
             };
             $config = Config::getPkg("{$pkg_name}-{$arch}-{$os}");
+            $pkg_name = "{$pkg_name}-{$arch}-{$os}";
         }
         if ($config === null) {
             throw new WrongUsageException("Package [{$pkg_name}] does not exist, please check the name and correct it !");

src/SPC/store/source/PhpSource.php

@@ -32,7 +32,10 @@ class PhpSource extends CustomSourceBase
     public function getLatestPHPInfo(string $major_version): array
     {
         // 查找最新的小版本号
-        $info = json_decode(Downloader::curlExec(url: "https://www.php.net/releases/index.php?json&version={$major_version}"), true);
+        $info = json_decode(Downloader::curlExec(
+            url: "https://www.php.net/releases/index.php?json&version={$major_version}",
+            retry: intval(getenv('SPC_RETRY_TIME') ? getenv('SPC_RETRY_TIME') : 0)
+        ), true);
         if (!isset($info['version'])) {
             throw new DownloaderException("Version {$major_version} not found.");
         }

src/globals/test-extensions.php

@@ -13,13 +13,13 @@ declare(strict_types=1);
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'zlib,openssl,curl,pcntl,posix,mbstring,tokenizer,phar',
+    'Linux', 'Darwin' => 'intl,pdo_sqlite,sqlite3,curl,openssl,tokenizer,bcmath,bz2,calendar,dba,ftp,iconv,mysqli,mbstring,mbregex,xml,simplexml,ctype,dom,pdo,filter,session,zlib,fileinfo,pdo_mysql,posix,sockets,shmop,sodium,sysvmsg,sysvsem,sysvshm,gd,zip,gmp,redis,xmlwriter,phar,exif,xmlreader,readline,pcntl,soap,imagick,ffi,password-argon2,pgsql,pdo_pgsql,imap,ldap,xsl',
     'Windows' => 'mbstring,pdo_sqlite,mbregex,ffi',
 };
 
 // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).
 $with_libs = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => '',
+    'Linux', 'Darwin' => 'nghttp2',
     'Windows' => '',
 };