Beautiful Open-Source Form Builder
Remove Vapor Core and update vulnerable dependencies (#1365)
Julien Nahum412dd90af518
diff --git a/api/app/Http/Controllers/Content/SignedStorageUrlController.php b/api/app/Http/Controllers/Content/SignedStorageUrlController.phpindex d646ef9f2..c49e2f948 100644--- a/api/app/Http/Controllers/Content/SignedStorageUrlController.php+++ b/api/app/Http/Controllers/Content/SignedStorageUrlController.php@@ -8,7 +8,7 @@ use Illuminate\Http\Request;use Illuminate\Support\Str;use Illuminate\Support\Facades\Storage;use Illuminate\Validation\Rule;-use Laravel\Vapor\Http\Controllers\SignedStorageUrlController as Controller;+use App\Http\Controllers\Controller;use Psr\Http\Message\RequestInterface;class SignedStorageUrlController extends Controller@@ -28,7 +28,7 @@ class SignedStorageUrlController extends Controller$uuid = (string) Str::uuid();- $expiresAfter = config('vapor.signed_storage_url_expires_after', 5);+ $expiresAfter = config('filesystems.signed_storage_url_expires_after', 5);$signedRequest = $client->createPresignedRequest($this->createCommand($request, $client, $bucket, $key = ('tmp/'.$uuid)),@@ -55,7 +55,14 @@ class SignedStorageUrlController extends Controllerprotected function createCommand(Request $request, S3Client $client, $bucket, $key){- $command = parent::createCommand($request, $client, $bucket, $key);+ $command = $client->getCommand('putObject', array_filter([+ 'Bucket' => $bucket,+ 'Key' => $key,+ 'ACL' => $request->input('visibility') ?: 'private',+ 'ContentType' => $request->input('content_type') ?: 'application/octet-stream',+ 'CacheControl' => $request->input('cache_control') ?: null,+ 'Expires' => $request->input('expires') ?: null,+ ]));// The locked SDK builds SignedHeaders in request order but sorts the// canonical request. Sort this command only, before it is presigned.@@ -79,7 +86,9 @@ class SignedStorageUrlController extends Controllerprotected function headers(Request $request, $signedRequest){- $headers = parent::headers($request, $signedRequest);+ $headers = array_merge($signedRequest->getHeaders(), [+ 'Content-Type' => $request->input('content_type') ?: 'application/octet-stream',+ ]);// Cache-Control is deliberately not signed by the SDK and is stripped// from its request. The browser must still send the requested metadata.diff --git a/api/composer.json b/api/composer.jsonindex a58e97a93..cf1f02b88 100644--- a/api/composer.json+++ b/api/composer.json@@ -35,7 +35,6 @@"laravel/tinker": "^2.9","laravel/ui": "*","laravel/vapor-cli": "*",- "laravel/vapor-core": "*","league/flysystem-aws-s3-v3": "*","maatwebsite/excel": "^4.0.5","mpociot/versionable": "^4.4",diff --git a/api/composer.lock b/api/composer.lockindex 1d0d75d8e..ca7fc009c 100644--- a/api/composer.lock+++ b/api/composer.lock@@ -4,7 +4,7 @@"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies","This file is @generated automatically"],- "content-hash": "c081c20bda708c7fa901599595493f48",+ "content-hash": "404e440959ad25212e192dd8fce51a63","packages": [{"name": "aws/aws-crt-php",@@ -2504,56 +2504,6 @@},"time": "2023-02-23T15:00:54+00:00"},- {- "name": "hollodotme/fast-cgi-client",- "version": "v3.1.7",- "source": {- "type": "git",- "url": "https://github.com/hollodotme/fast-cgi-client.git",- "reference": "062182d4eda73c161cc2839783acc83096ec0f37"- },- "dist": {- "type": "zip",- "url": "https://api.github.com/repos/hollodotme/fast-cgi-client/zipball/062182d4eda73c161cc2839783acc83096ec0f37",- "reference": "062182d4eda73c161cc2839783acc83096ec0f37",- "shasum": ""- },- "require": {- "ext-json": "*",- "php": ">=7.1"- },- "require-dev": {- "ext-xdebug": ">=2.6.0"- },- "type": "library",- "autoload": {- "psr-4": {- "hollodotme\\FastCGI\\": "src/"- }- },- "notification-url": "https://packagist.org/downloads/",- "license": [- "MIT"- ],- "authors": [- {- "name": "Holger Woltersdorf",- "email": "[email protected]"- }- ],- "description": "A PHP fast CGI client to send requests (a)synchronously to PHP-FPM.",- "keywords": [- "Socket",- "async",- "fastcgi",- "php-fpm"- ],- "support": {- "issues": "https://github.com/hollodotme/fast-cgi-client/issues",- "source": "https://github.com/hollodotme/fast-cgi-client/tree/v3.1.7"- },- "time": "2021-12-07T10:10:20+00:00"- },{"name": "jane-php/json-schema-runtime","version": "v7.10.4",@@ -4164,86 +4114,6 @@},"time": "2026-09-03T14:11:01+00:00"},- {- "name": "laravel/vapor-core",- "version": "v2.47.0",- "source": {- "type": "git",- "url": "https://github.com/laravel/vapor-core.git",- "reference": "09a267e54650ea2c4cc8e0fa18357c207934db7c"- },- "dist": {- "type": "zip",- "url": "https://api.github.com/repos/laravel/vapor-core/zipball/09a267e54650ea2c4cc8e0fa18357c207934db7c",- "reference": "09a267e54650ea2c4cc8e0fa18357c207934db7c",- "shasum": ""- },- "require": {- "aws/aws-sdk-php": "^3.80",- "guzzlehttp/guzzle": "^6.3|^7.0|^8.0",- "guzzlehttp/promises": "^1.4|^2.0",- "hollodotme/fast-cgi-client": "^3.0",- "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",- "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",- "illuminate/queue": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",- "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0|^13.0",- "monolog/monolog": "^1.12|^2.0|^3.2",- "nyholm/psr7": "^1.0",- "php": "^7.2|^8.0",- "riverline/multipart-parser": "^2.0.9",- "symfony/process": "^4.3|^5.0|^6.0|^7.0|^8.0",- "symfony/psr-http-message-bridge": "^1.0|^2.0|^6.4|^7.0|^8.0"- },- "require-dev": {- "laravel/octane": "*",- "mockery/mockery": "^1.2",- "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",- "phpstan/phpstan": "^1.10|^2.1",- "phpunit/phpunit": "^8.0|^9.0|^10.4|^11.5.3|^12.5.12"- },- "type": "library",- "extra": {- "laravel": {- "aliases": {- "Vapor": "Laravel\\Vapor\\Vapor"- },- "providers": [- "Laravel\\Vapor\\VaporServiceProvider"- ]- },- "branch-alias": {- "dev-master": "2.0-dev"- }- },- "autoload": {- "files": [- "src/debug.php"- ],- "psr-4": {- "Laravel\\Vapor\\": "src"- }- },- "notification-url": "https://packagist.org/downloads/",- "license": [- "MIT"- ],- "authors": [- {- "name": "Taylor Otwell",- "email": "[email protected]"- }- ],- "description": "The kernel and invocation handlers for Laravel Vapor",- "homepage": "https://github.com/laravel/vapor-core",- "keywords": [- "laravel",- "vapor"- ],- "support": {- "source": "https://github.com/laravel/vapor-core/tree/v2.47.0"- },- "time": "2026-08-26T13:30:07+00:00"- },{"name": "lcobucci/clock","version": "3.3.1",@@ -8398,62 +8268,6 @@},"time": "2025-12-14T04:43:48+00:00"},- {- "name": "riverline/multipart-parser",- "version": "2.2.2",- "source": {- "type": "git",- "url": "https://github.com/Riverline/multipart-parser.git",- "reference": "fadbb1c1f8e66f96eaa36ab8ed13cbc451c6ded7"- },- "dist": {- "type": "zip",- "url": "https://api.github.com/repos/Riverline/multipart-parser/zipball/fadbb1c1f8e66f96eaa36ab8ed13cbc451c6ded7",- "reference": "fadbb1c1f8e66f96eaa36ab8ed13cbc451c6ded7",- "shasum": ""- },- "require": {- "ext-mbstring": "*",- "php": ">=7.0"- },- "require-dev": {- "laminas/laminas-diactoros": "*",- "phpunit/phpunit": "*",- "psr/http-message": "*",- "symfony/psr-http-message-bridge": "*"- },- "type": "library",- "autoload": {- "psr-4": {- "Riverline\\MultiPartParser\\": "src/"- }- },- "notification-url": "https://packagist.org/downloads/",- "license": [- "MIT"- ],- "authors": [- {- "name": "Romain Cambien",- "email": "[email protected]"- },- {- "name": "Riverline",- "homepage": "http://www.riverline.fr"- }- ],- "description": "One class library to parse multipart content with encoding and charset support.",- "keywords": [- "http",- "multipart",- "parser"- ],- "support": {- "issues": "https://github.com/Riverline/multipart-parser/issues",- "source": "https://github.com/Riverline/multipart-parser/tree/2.2.2"- },- "time": "2026-01-15T11:08:16+00:00"- },{"name": "sabberworm/php-css-parser","version": "v9.5.0",@@ -10745,16 +10559,16 @@},{"name": "symfony/mime",- "version": "v7.4.19",+ "version": "v7.4.22","source": {"type": "git","url": "https://github.com/symfony/mime.git",- "reference": "f8ac7d0a800bcabbcd1f7de56594cf05e6cd5693"+ "reference": "94a4c017435bc515f5ac80421a2c555fb9ca3676"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/symfony/mime/zipball/f8ac7d0a800bcabbcd1f7de56594cf05e6cd5693",- "reference": "f8ac7d0a800bcabbcd1f7de56594cf05e6cd5693",+ "url": "https://api.github.com/repos/symfony/mime/zipball/94a4c017435bc515f5ac80421a2c555fb9ca3676",+ "reference": "94a4c017435bc515f5ac80421a2c555fb9ca3676","shasum": ""},"require": {@@ -10810,7 +10624,7 @@"mime-type"],"support": {- "source": "https://github.com/symfony/mime/tree/v7.4.19"+ "source": "https://github.com/symfony/mime/tree/v7.4.22"},"funding": [{@@ -10830,7 +10644,7 @@"type": "tidelift"}],- "time": "2026-09-04T10:45:44+00:00"+ "time": "2026-10-28T17:57:58+00:00"},{"name": "symfony/options-resolver",diff --git a/api/config/filesystems.php b/api/config/filesystems.phpindex 507f6963b..7346dbb75 100644--- a/api/config/filesystems.php+++ b/api/config/filesystems.php@@ -28,6 +28,8 @@ return ['cloud' => env('FILESYSTEM_CLOUD', 's3'),+ 'signed_storage_url_expires_after' => 5,+/*|--------------------------------------------------------------------------| Filesystem Disksdiff --git a/api/tests/Feature/Forms/SignedStorageBackendTest.php b/api/tests/Feature/Forms/SignedStorageBackendTest.phpindex 281cc4597..dd6817922 100644--- a/api/tests/Feature/Forms/SignedStorageBackendTest.php+++ b/api/tests/Feature/Forms/SignedStorageBackendTest.php@@ -92,3 +92,14 @@ it('preserves explicit public assets and default private upload headers', functi->and($private['headers'])->not->toHaveKey('Cache-Control')->and($private['headers'])->not->toHaveKey('Expires');});++it('uses the application signing expiry independently of object expiration', function () {+ config(['filesystems.signed_storage_url_expires_after' => 2]);+ $data = app(SignedStorageUrlController::class)->store(new Request([+ 'expires' => '2030-01-01T00:00:00Z',+ ]))->getData(true);+ parse_str(parse_url($data['url'], PHP_URL_QUERY), $query);++ expect($query['X-Amz-Expires'])->toBe('120')+ ->and($data['headers']['Expires'])->toBe(['Tue, 01 Jan 2030 00:00:00 GMT']);+});diff --git a/client/package-lock.json b/client/package-lock.jsonindex ebf83e837..0cb35d8cb 100644--- a/client/package-lock.json+++ b/client/package-lock.json@@ -1386,6 +1386,23 @@"node": ">=18"}},+ "node_modules/@esbuild/netbsd-arm64": {+ "version": "0.25.12",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",+ "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "license": "MIT",+ "optional": true,+ "os": [+ "netbsd"+ ],+ "engines": {+ "node": ">=18"+ }+ },"node_modules/@esbuild/netbsd-x64": {"version": "0.28.2","resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz",@@ -1434,6 +1451,23 @@"node": ">=18"}},+ "node_modules/@esbuild/openharmony-arm64": {+ "version": "0.25.12",+ "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",+ "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "license": "MIT",+ "optional": true,+ "os": [+ "openharmony"+ ],+ "engines": {+ "node": ">=18"+ }+ },"node_modules/@esbuild/sunos-x64": {"version": "0.28.2","resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz",@@ -2034,9 +2068,9 @@}},"node_modules/@intlify/bundle-utils": {- "version": "11.2.7",- "resolved": "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-11.2.7.tgz",- "integrity": "sha512-N1u1ZG553SkFxiQ3AEx2Fc7QuGxATjPCHDveHkSP93Imgz8VhHJUZZHEA9pat6oPZC/VcYbP0953EBtPWd+LEA==",+ "version": "11.2.8",+ "resolved": "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-11.2.8.tgz",+ "integrity": "sha512-8p7MeoNlcVISGcwAT8rLqQdli78bQXK3dRRcbZhheD0YkWchRnH70B5mA5Rt1xrK1+ApZ0o7V2lDxjUV1zQbDw==","dev": true,"license": "MIT","dependencies": {@@ -2349,23 +2383,6 @@"node": ">=18"}},- "node_modules/@intlify/bundle-utils/node_modules/@esbuild/netbsd-arm64": {- "version": "0.25.12",- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",- "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",- "cpu": [- "arm64"- ],- "dev": true,- "license": "MIT",- "optional": true,- "os": [- "netbsd"- ],- "engines": {- "node": ">=18"- }- },"node_modules/@intlify/bundle-utils/node_modules/@esbuild/netbsd-x64": {"version": "0.25.12","resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",@@ -2417,23 +2434,6 @@"node": ">=18"}},- "node_modules/@intlify/bundle-utils/node_modules/@esbuild/openharmony-arm64": {- "version": "0.25.12",- "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",- "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",- "cpu": [- "arm64"- ],- "dev": true,- "license": "MIT",- "optional": true,- "os": [- "openharmony"- ],- "engines": {- "node": ">=18"- }- },"node_modules/@intlify/bundle-utils/node_modules/@esbuild/sunos-x64": {"version": "0.25.12","resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",@@ -2657,15 +2657,15 @@}},"node_modules/@intlify/unplugin-vue-i18n": {- "version": "11.2.7",- "resolved": "https://registry.npmjs.org/@intlify/unplugin-vue-i18n/-/unplugin-vue-i18n-11.2.7.tgz",- "integrity": "sha512-S+kF2s8tve3GZ93C6Y9K7HtS2NGQrXkbUPO0g7e7Fz2xf1kjurk4cnu7G3hsfy9GPckRSGtUYrgB+54/fRgHUA==",+ "version": "11.2.8",+ "resolved": "https://registry.npmjs.org/@intlify/unplugin-vue-i18n/-/unplugin-vue-i18n-11.2.8.tgz",+ "integrity": "sha512-5jZnxlx9kLziDfORa2ESMdWohl4T24hf7KvgktsoTfYXvdLknbCIwMjQQch9XCMTOSnPeepmH5PCEW8ivM5OoQ==","dev": true,"license": "MIT","dependencies": {- "@intlify/bundle-utils": "11.2.7",+ "@intlify/bundle-utils": "11.2.8","@intlify/shared": "~11.4.15",- "@intlify/vue-i18n-extensions": "^8.0.0",+ "@intlify/vue-i18n-extensions": "^9.0.0","@rollup/pluginutils": "^5.1.0","@typescript-eslint/scope-manager": "^8.13.0","@typescript-eslint/typescript-estree": "^8.13.0",@@ -2727,19 +2727,17 @@}},"node_modules/@intlify/vue-i18n-extensions": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/@intlify/vue-i18n-extensions/-/vue-i18n-extensions-8.0.0.tgz",- "integrity": "sha512-w0+70CvTmuqbskWfzeYhn0IXxllr6mU+IeM2MU0M+j9OW64jkrvqY+pYFWrUnIIC9bEdij3NICruicwd5EgUuQ==",+ "version": "9.0.0",+ "resolved": "https://registry.npmjs.org/@intlify/vue-i18n-extensions/-/vue-i18n-extensions-9.0.0.tgz",+ "integrity": "sha512-Du+4FQiLiwP7OxvHYuglCTkRRIuA5oaYhVpL+ptaEy/wwGxz6EB0Bk99gV6BP2FfVwsDCnP1Pc72a1EU8cGX1w==","dev": true,"license": "MIT","dependencies": {"@babel/parser": "^7.24.6",- "@intlify/shared": "^10.0.0",- "@vue/compiler-dom": "^3.2.45",- "vue-i18n": "^10.0.0"+ "@vue/compiler-dom": "^3.2.45"},"engines": {- "node": ">= 18"+ "node": ">= 22"},"peerDependencies": {"@intlify/shared": "^9.0.0 || ^10.0.0 || ^11.0.0",@@ -2762,75 +2760,6 @@}}},- "node_modules/@intlify/vue-i18n-extensions/node_modules/@intlify/core-base": {- "version": "10.0.8",- "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-10.0.8.tgz",- "integrity": "sha512-FoHslNWSoHjdUBLy35bpm9PV/0LVI/DSv9L6Km6J2ad8r/mm0VaGg06C40FqlE8u2ADcGUM60lyoU7Myo4WNZQ==",- "dev": true,- "license": "MIT",- "dependencies": {- "@intlify/message-compiler": "10.0.8",- "@intlify/shared": "10.0.8"- },- "engines": {- "node": ">= 16"- },- "funding": {- "url": "https://github.com/sponsors/kazupon"- }- },- "node_modules/@intlify/vue-i18n-extensions/node_modules/@intlify/message-compiler": {- "version": "10.0.8",- "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-10.0.8.tgz",- "integrity": "sha512-DV+sYXIkHVd5yVb2mL7br/NEUwzUoLBsMkV3H0InefWgmYa34NLZUvMCGi5oWX+Hqr2Y2qUxnVrnOWF4aBlgWg==",- "dev": true,- "license": "MIT",- "dependencies": {- "@intlify/shared": "10.0.8",- "source-map-js": "^1.0.2"- },- "engines": {- "node": ">= 16"- },- "funding": {- "url": "https://github.com/sponsors/kazupon"- }- },- "node_modules/@intlify/vue-i18n-extensions/node_modules/@intlify/shared": {- "version": "10.0.8",- "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-10.0.8.tgz",- "integrity": "sha512-BcmHpb5bQyeVNrptC3UhzpBZB/YHHDoEREOUERrmF2BRxsyOEuRrq+Z96C/D4+2KJb8kuHiouzAei7BXlG0YYw==",- "dev": true,- "license": "MIT",- "engines": {- "node": ">= 16"- },- "funding": {- "url": "https://github.com/sponsors/kazupon"- }- },- "node_modules/@intlify/vue-i18n-extensions/node_modules/vue-i18n": {- "version": "10.0.8",- "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-10.0.8.tgz",- "integrity": "sha512-mIjy4utxMz9lMMo6G9vYePv7gUFt4ztOMhY9/4czDJxZ26xPeJ49MAGa9wBAE3XuXbYCrtVPmPxNjej7JJJkZQ==",- "deprecated": "v9 and v10 no longer supported. please migrate to v11. about maintenance status, see https://vue-i18n.intlify.dev/guide/maintenance.html",- "dev": true,- "license": "MIT",- "dependencies": {- "@intlify/core-base": "10.0.8",- "@intlify/shared": "10.0.8",- "@vue/devtools-api": "^6.5.0"- },- "engines": {- "node": ">= 16"- },- "funding": {- "url": "https://github.com/sponsors/kazupon"- },- "peerDependencies": {- "vue": "^3.0.0"- }- },"node_modules/@ioredis/commands": {"version": "1.10.0","resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.10.0.tgz",@@ -23188,7 +23117,6 @@"resolved": "https://registry.npmjs.org/zod/-/zod-4.6.7.tgz","integrity": "sha512-g8W2D2kU6a8untc053fX1uVBKzM7yqAxW/3zwk83+6RyF2+SKOuV+c0wBDhUwzV1PaGapmZH+rmcUzPf+3CGwg==","license": "MIT",- "peer": true,"funding": {"url": "https://github.com/sponsors/colinhacks"}diff --git a/docs/deployment/docker.mdx b/docs/deployment/docker.mdxindex 8db3c53b9..78ce34bf7 100644--- a/docs/deployment/docker.mdx+++ b/docs/deployment/docker.mdx@@ -359,3 +359,15 @@ ingress port mapping from `80:80` to another host port, such as `8800:80`.See [GitHub issue #1005](https://github.com/OpnForm/OpnForm/issues/1005) for aworking Synology Container Manager configuration and its troubleshootinghistory.++## Direct object-storage uploads++S3-compatible uploads use the application's AWS SDK without `laravel/vapor-core`.+The compatibility endpoint `POST /vapor/signed-storage-url` is unchanged, including+temporary keys, ACLs, upload metadata and response headers. Signatures expire+after five minutes by default; adjust+`filesystems.signed_storage_url_expires_after` in `api/config/filesystems.php`+if needed. Local-disk uploads continue to use `/upload-file`.++The old `api/vapor.yml` configurations require restoring the Vapor runtime+dependency before they can be used for deployments.