Bump libcurl from 7.87.0 to 8.0.1 in /api (#2285)

chitoku-k · May 1, 2023 · 30a0b1c · 30a0b1c
1 parent bf2a7f8
commit 30a0b1c
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 493 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ HomoChecker はホモ（[@mpyw](https://twitter.com/mpyw)）にリダイレク
 ### 設定方法
 
 DNS を適切に設定したあと、お使いの Web サーバーに合わせて設定を行います。  
-HomoChecker は HTTP/1.1、HTTP/2、HTTP/3（Alt-Svc のみ）に対応しています。
+HomoChecker は HTTP/1.1、HTTP/2、HTTP/3 に対応しています。
 
 #### Apache
 

diff --git a/api/Dockerfile b/api/Dockerfile
@@ -41,7 +41,7 @@ FROM build-dependencies AS curl
 COPY --from=openssl /usr/local/ /usr/local/
 COPY --from=nghttp3 /usr/local/ /usr/local/
 COPY --from=ngtcp2 /usr/local/ /usr/local/
-RUN git clone --depth=1 -b curl-7_87_0 https://github.com/curl/curl && \
+RUN git clone --depth=1 -b curl-8_0_1 https://github.com/curl/curl && \
     cd curl && \
     autoreconf -fi && \
     ./configure --enable-alt-svc --with-openssl --with-nghttp2 --with-nghttp3 --with-ngtcp2 && \

diff --git a/api/phpunit.xml b/api/phpunit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" bootstrap="./vendor/autoload.php" cacheDirectory=".phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" bootstrap="./vendor/autoload.php" cacheDirectory=".phpunit.cache">
   <php>
     <const name="CURL_HTTP_VERSION_3" value="30"/>
   </php>
@@ -8,7 +8,7 @@
       <directory suffix="Test.php">./tests</directory>
     </testsuite>
   </testsuites>
-  <coverage>
+  <source>
     <include>
       <directory>./src</directory>
     </include>
@@ -17,6 +17,8 @@
       <file>./src/index.php</file>
       <directory>./src/Providers</directory>
     </exclude>
+  </source>
+  <coverage>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="build/coverage"/>

diff --git a/api/src/Contracts/Repository/AltsvcRepository.php b/api/src/Contracts/Repository/AltsvcRepository.php
diff --git a/api/src/Contracts/Service/Client/Altsvc.php b/api/src/Contracts/Service/Client/Altsvc.php
diff --git a/api/src/Providers/HomoAppProvider.php b/api/src/Providers/HomoAppProvider.php
@@ -8,14 +8,12 @@
 use HomoChecker\Action\HealthCheckAction;
 use HomoChecker\Action\ListAction;
 use HomoChecker\Action\MetricsAction;
-use HomoChecker\Contracts\Repository\AltsvcRepository as AltsvcRepositoryContract;
 use HomoChecker\Contracts\Repository\HomoRepository as HomoRepositoryContract;
 use HomoChecker\Contracts\Repository\ProfileRepository as ProfileRepositoryContract;
 use HomoChecker\Http\NonBufferedBody;
 use HomoChecker\Middleware\AccessLogMiddleware;
 use HomoChecker\Middleware\ErrorMiddleware;
 use HomoChecker\Middleware\MetricsMiddleware;
-use HomoChecker\Repository\AltsvcRepository;
 use HomoChecker\Repository\HomoRepository;
 use HomoChecker\Repository\ProfileRepository;
 use Illuminate\Config\Repository;
@@ -39,7 +37,6 @@ public function register()
         $this->app->singleton(ListAction::class);
         $this->app->singleton(BadgeAction::class);
 
-        $this->app->singleton(AltsvcRepositoryContract::class, AltsvcRepository::class);
         $this->app->singleton(HomoRepositoryContract::class, HomoRepository::class);
         $this->app->singleton(ProfileRepositoryContract::class, ProfileRepository::class);
 

diff --git a/api/src/Repository/AltsvcRepository.php b/api/src/Repository/AltsvcRepository.php
diff --git a/api/src/Service/ClientService.php b/api/src/Service/ClientService.php
@@ -8,42 +8,19 @@
 use GuzzleHttp\Psr7\Response as Psr7Response;
 use GuzzleHttp\RequestOptions;
 use GuzzleHttp\TransferStats;
-use HomoChecker\Contracts\Repository\AltsvcRepository as AltsvcRepositoryContract;
-use HomoChecker\Contracts\Service\Client\Altsvc;
 use HomoChecker\Contracts\Service\Client\Response;
 use HomoChecker\Contracts\Service\ClientService as ClientServiceContract;
-use Illuminate\Support\Collection;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 class ClientService implements ClientServiceContract
 {
-    protected ?Collection $altsvc = null;
-
     public function __construct(
         protected ClientInterface $client,
-        protected AltsvcRepositoryContract $altsvcRepository,
         protected int $redirect,
     ) {
     }
 
-    protected function getAltsvc(string $url): null|string
-    {
-        if (!$this->altsvc) {
-            $this->altsvc = collect($this->altsvcRepository->findAll());
-        }
-        return $this->altsvc->where('url', $url)->pluck('protocol')->first();
-    }
-
-    protected function saveAltsvc(string $url, string $protocolId, float $maxAge): void
-    {
-        $this->altsvcRepository->save(
-            $url,
-            $protocolId,
-            (new \DateTimeImmutable("{$maxAge} seconds"))->format(\DateTimeInterface::ATOM),
-        );
-    }
-
     /**
      * Get the responses for URL.
      * @param  string                                 $url The URL.
@@ -52,39 +29,7 @@ protected function saveAltsvc(string $url, string $protocolId, float $maxAge): v
     public function getAsync(string $url): \Generator
     {
         for ($i = 0; $i < $this->redirect; ++$i) {
-            $options = [];
-
-            if (str_starts_with($this->getAltsvc($url) ?? '', 'h3')) {
-                $options['curl'] = [
-                    CURLOPT_CERTINFO => true,
-                    CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_3,
-                ];
-                $options['headers']['Alt-Used'] = parse_url($url, PHP_URL_HOST);
-                $url = str($url)->replaceFirst('http://', 'https://')->toString();
-            }
-
-            yield $url => $this->client->requestAsync('GET', $url, $options + [
-                RequestOptions::ON_HEADERS => function (ResponseInterface|\Throwable $response) use ($url) {
-                    if ($response instanceof \Throwable) {
-                        return;
-                    }
-
-                    $altsvc = $response->getHeaderLine('Alt-Svc');
-                    if (!$altsvc) {
-                        return;
-                    }
-
-                    /** @var ?Altsvc $h3 */
-                    $h3 = str($altsvc)
-                        ->split('/\s*,\s*/')
-                        ->mapInto(Altsvc::class)
-                        ->first(fn (Altsvc $item) => str_starts_with($item->getProtocolId(), 'h3'));
-                    if (!$h3) {
-                        return;
-                    }
-
-                    $this->saveAltsvc($url, $h3->getProtocolId(), $h3->getMaxAge());
-                },
+            yield $url => $this->client->requestAsync('GET', $url, [
                 RequestOptions::ON_STATS => function (TransferStats $stats) use (&$result) {
                     $response = $stats->getResponse();
                     if (!$response) {

diff --git a/api/src/config.php b/api/src/config.php
@@ -45,7 +45,7 @@
         'allow_redirects' => false,
         'curl' => [
             CURLOPT_CERTINFO => true,
-            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_2,
+            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_3,
         ],
         'headers' => [
             'User-Agent' => 'Homozilla/5.0 (Checker/1.14.514; homOSeX 8.10)',

diff --git a/api/tests/Case/Repository/AltsvcRepositoryTest.php b/api/tests/Case/Repository/AltsvcRepositoryTest.php
diff --git a/api/tests/Case/Repository/ProfileRepositoryTest.php b/api/tests/Case/Repository/ProfileRepositoryTest.php
@@ -43,7 +43,7 @@ public function testSave(): void
           ->with('profiles')
           ->andReturn($builder);
 
-        $altsvc = new ProfileRepository();
-        $altsvc->save('foo', 'https://img.example.com/foo', '2022-12-31 23:59:59');
+        $profile = new ProfileRepository();
+        $profile->save('foo', 'https://img.example.com/foo', '2022-12-31 23:59:59');
     }
 }