From 41d6a71d2ffda1242cd28df2a9fd44ed50646133 Mon Sep 17 00:00:00 2001 From: philipp lang Date: Mon, 30 Oct 2023 22:58:25 +0100 Subject: [PATCH] Fix rawurldecode --- app/Contribution/Actions/GenerateAction.php | 2 +- app/Rules/JsonBase64Rule.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Contribution/Actions/GenerateAction.php b/app/Contribution/Actions/GenerateAction.php index 41333bcc..f26caa60 100644 --- a/app/Contribution/Actions/GenerateAction.php +++ b/app/Contribution/Actions/GenerateAction.php @@ -49,6 +49,6 @@ class GenerateAction */ private function payload(ActionRequest $request): array { - return json_decode(urldecode(base64_decode($request->input('payload', ''))), true); + return json_decode(rawurldecode(base64_decode($request->input('payload', ''))), true); } } diff --git a/app/Rules/JsonBase64Rule.php b/app/Rules/JsonBase64Rule.php index ddf5a281..fe796db1 100644 --- a/app/Rules/JsonBase64Rule.php +++ b/app/Rules/JsonBase64Rule.php @@ -33,9 +33,9 @@ class JsonBase64Rule implements Rule return false; } - $decoded = urldecode(base64_decode($value, true)); + $decoded = rawurldecode(base64_decode($value, true)); - if (base64_encode(urlencode($decoded)) !== $value) { + if (base64_encode(rawurlencode($decoded)) !== $value) { return false; }