1. User a human-readable header parser error message when user wants to use a : character in header values.

roquie · roquie · commit 225629ee704d · 2022-09-06T13:58:48.000+03:00
2. Fixed image building for M1 processor
3. Add a normal compatibility with PHP 8.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ None.
 ### Fixed
 
 * Fixes prerender host proxy (add nginx option `proxy_ssl_server_name on`).
+* User a human-readable header parser error message when user wants to use a `:` character in header values.
 
 ## [4.0.0] - 2020-01-03
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,16 @@
-FROM composer/composer:2 AS deps
+FROM --platform=amd64 composer/composer:2 AS deps
 
 COPY . /app
 
 RUN composer install --no-ansi --no-interaction --no-progress --no-scripts --ignore-platform-reqs
 
-FROM spacetabio/box-php:1.0.0 AS build
+FROM --platform=amd64 spacetabio/box-php:1.1.0 AS build
 
 WORKDIR /app
 COPY --from=deps /app /app
 RUN box compile
 
-FROM php:8.1-cli-alpine
+FROM --platform=amd64 php:8.1-cli-alpine
 
 ENV NGINX_VERSION 1.21.1
 ENV NGX_BROTLI_COMMIT 9aec15e2aa6feea2113119ba06460af70ab3ea62
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ FILE = Dockerfile
 
 image:
 	sed "s/{{ version }}/$(VERSION)/g" $(FILE) > /tmp/$(FILE)
-	docker build -f /tmp/$(FILE) -t $(IMAGE):$(VERSION) .
+	docker build --platform linux/amd64 -f /tmp/$(FILE) -t $(IMAGE):$(VERSION) .
 
 push:
 	docker push $(IMAGE):$(VERSION)
@@ -17,13 +17,13 @@ test:
 		$(IMAGE):4.1.0-xdebug -c "vendor/bin/phpunit"
 
 image_test:
-	docker build -t $(IMAGE):4.1.0-xdebug -f test.dockerfile .
+	docker build --platform linux/amd64 -t $(IMAGE):4.1.0-xdebug -f test.dockerfile .
 
 push_test:
 	docker push $(IMAGE):4.1.0-xdebug
 
 image_box:
-	docker build -t spacetabio/box-php:1.0.0 -f box.dockerfile .
+	docker build --platform linux/amd64 -t spacetabio/box-php:1.1.0 -f box.dockerfile .
 
 push_box:
-	docker push spacetabio/box-php:1.0.0
+	docker push spacetabio/box-php:1.1.0
diff --git a/box.dockerfile b/box.dockerfile
@@ -1,6 +1,6 @@
-FROM php:8.0-cli-alpine
+FROM --platform=amd64 php:8.1-cli-alpine
 
-RUN wget https://github.com/box-project/box/releases/download/3.11.1/box.phar \
+RUN wget https://github.com/box-project/box/releases/download/4.0.2/box.phar \
     && mv box.phar /usr/local/bin/box \
     && chmod +x /usr/local/bin/box
 
diff --git a/src/Header/ConvertsHeader.php b/src/Header/ConvertsHeader.php
@@ -4,8 +4,10 @@
 
 namespace Spacetab\Server\Header;
 
+use InvalidArgumentException;
 use Spacetab\Configuration\ConfigurationInterface;
 use Spacetab\Server\Exception\HeaderException;
+use Throwable;
 
 final class ConvertsHeader implements HeaderInterface
 {
@@ -42,7 +44,11 @@ public function convert(): array
 
             // Backward compatibility.
             if (!isset($values[0]['value'])) {
-                $results[$item] = join('; ', (array) $values);
+                try {
+                    $results[$item] = implode('; ', (array) $values);
+                } catch (Throwable) {
+                    throw new InvalidArgumentException('Headers parse error. Check : symbol or indentation (use "" for escaping :).');
+                }
             }
 
             // Checks new extended format for sent headers from yaml values.
@@ -53,10 +59,10 @@ public function convert(): array
                         throw HeaderException::invalidHeaderFormat();
                     }
 
-                    $array[] = join('; ', (array) $value['value']);
+                    $array[] = implode('; ', (array) $value['value']);
                 }
 
-                $results[$item] = join(', ', $array);
+                $results[$item] = implode(', ', $array);
             }
         }
 
diff --git a/test.dockerfile b/test.dockerfile
@@ -1,16 +1,16 @@
-FROM composer/composer:2 AS deps
+FROM --platform=amd64 composer/composer:2 AS deps
 
 COPY . /app
 
 RUN composer install --no-ansi --no-interaction --no-progress --no-scripts --ignore-platform-reqs
 
-FROM spacetabio/box-php:1.0.0 AS build
+FROM --platform=amd64 spacetabio/box-php:1.0.0 AS build
 
 WORKDIR /app
 COPY --from=deps /app /app
 RUN box compile
 
-FROM php:8.1-cli-alpine
+FROM --platform=amd64 php:8.1-cli-alpine
 
 ENV NGINX_VERSION 1.21.1
 ENV NGX_BROTLI_COMMIT 9aec15e2aa6feea2113119ba06460af70ab3ea62
diff --git a/tests/Header/HeaderTest.php b/tests/Header/HeaderTest.php
@@ -4,6 +4,7 @@
 
 namespace Spacetab\Tests\Server\Header;
 
+use InvalidArgumentException;
 use Spacetab\Configuration\Configuration;
 use Spacetab\Server\Exception\HeaderException;
 use Spacetab\Server\Header\ConvertsHeader;
@@ -50,4 +51,15 @@ public function testHowInvalidHeaderValueCheckWorks()
         $h = new ConvertsHeader($conf);
         $h->convert();
     }
+
+    public function testInvalidToStringConversionWhenHeadersParsed()
+    {
+        $conf = new Configuration(__DIR__ . '/../configuration', 'headers_warning');
+        $conf->load();
+
+        $this->expectException(InvalidArgumentException::class);
+
+        $h = new ConvertsHeader($conf);
+        $h->convert();
+    }
 }
diff --git a/tests/configuration/headers_warning/server.yaml b/tests/configuration/headers_warning/server.yaml
@@ -0,0 +1,7 @@
+headers_warning:
+  server:
+    headers:
+      contentSecurityPolicy:
+        - "default-src 'self' data": 'https://*.teaworkshop.ru *.cdek.ru pickpoint.ru api-maps.yandex.ru maps.yandex.net https://*.jivosite.com https://*.dadata.ru sentry.io *.yandex.ru *.vk.com *.googletagmanager.com *.google-analytics.com https://*.facebook.net https://*.facebook.com'
+    port: 8081
+    root: ./tests/example_dist/simple
diff --git a/tests/example_dist/head_link_not_exists/index.html b/tests/example_dist/head_link_not_exists/index.html
@@ -5,10 +5,10 @@
   <meta content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" name="viewport">
   <meta content="ie=edge" http-equiv="X-UA-Compatible">
   <title>Document</title>
-<link rel="preload" href="/__config.js" as="script"></head>
+<link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"></head>
 <body>
 hello stranger!
-<script src="/__config.js"></script><script>
+<script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script>
 
 </script>
 </body>
diff --git a/tests/example_dist/vue/index.html b/tests/example_dist/vue/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1">
-  <link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="icon" href="/favicon.ico">
+  <link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="preload" href="/__config.js" as="script"><link rel="icon" href="/favicon.ico">
   <title>example_dist</title>
   <link href="/js/about.5273d30c.js" rel="prefetch">
   <link href="/css/app.e28d37a7.css" rel="preload" as="style">
@@ -16,7 +16,7 @@
 <noscript><strong>We're sorry but example_dist doesn't work properly without JavaScript enabled. Please enable it to
   continue.</strong></noscript>
 <div id="app"></div>
-<script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/js/chunk-vendors.a377004b.js"></script>
+<script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/__config.js"></script><script src="/js/chunk-vendors.a377004b.js"></script>
 <script src="/js/app.06433c76.js"></script>
 </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace Spacetab\Server\Header;`
`6`	`6`
	`7`	`+use InvalidArgumentException;`
`7`	`8`	`use Spacetab\Configuration\ConfigurationInterface;`
`8`	`9`	`use Spacetab\Server\Exception\HeaderException;`
	`10`	`+use Throwable;`
`9`	`11`
`10`	`12`	`final class ConvertsHeader implements HeaderInterface`
`11`	`13`	`{`
`@@ -42,7 +44,11 @@ public function convert(): array`
`42`	`44`
`43`	`45`	`// Backward compatibility.`
`44`	`46`	`if (!isset($values[0]['value'])) {`
`45`		`- $results[$item] = join('; ', (array) $values);`
	`47`	`+ try {`
	`48`	`+ $results[$item] = implode('; ', (array) $values);`
	`49`	`+ } catch (Throwable) {`
	`50`	`+ throw new InvalidArgumentException('Headers parse error. Check : symbol or indentation (use "" for escaping :).');`
	`51`	`+ }`
`46`	`52`	`}`
`47`	`53`
`48`	`54`	`// Checks new extended format for sent headers from yaml values.`
`@@ -53,10 +59,10 @@ public function convert(): array`
`53`	`59`	`throw HeaderException::invalidHeaderFormat();`
`54`	`60`	`}`
`55`	`61`
`56`		`- $array[] = join('; ', (array) $value['value']);`
	`62`	`+ $array[] = implode('; ', (array) $value['value']);`
`57`	`63`	`}`
`58`	`64`
`59`		`- $results[$item] = join(', ', $array);`
	`65`	`+ $results[$item] = implode(', ', $array);`
`60`	`66`	`}`
`61`	`67`	`}`
`62`	`68`