From a98c6e88ba36f4c089ad4cd6f02af0bfa8ed82a0 Mon Sep 17 00:00:00 2001 From: Jasper Smet Date: Thu, 19 Nov 2026 14:51:29 +0100 Subject: [PATCH 1/2] Only unlock enabled submitting button names --- src/Form/FormLifecycle.php | 5 +- .../Form/NonSubmittingButtonSecurityTest.php | 52 +++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 tests/TestCase/Form/NonSubmittingButtonSecurityTest.php diff --git a/src/Form/FormLifecycle.php b/src/Form/FormLifecycle.php index 57003a0..f8e9d70 100644 --- a/src/Form/FormLifecycle.php +++ b/src/Form/FormLifecycle.php @@ -114,12 +114,13 @@ public function register(BoundField $field, array $submissions, array $ids = []) } /** - * Register a successfully rendered named button as an optional submitted control. + * Register an enabled submit button as an optional submitted control. */ public function button(Attributes $attributes): void { $this->assertOpen(); - if (isset($attributes->values['name'])) { + $type = strtolower((string)($attributes->values['type'] ?? 'submit')); + if (!$attributes->has('disabled') && !in_array($type, ['button', 'reset'], true) && $attributes->has('name')) { $this->protection->optional((string)$attributes->values['name']); } } diff --git a/tests/TestCase/Form/NonSubmittingButtonSecurityTest.php b/tests/TestCase/Form/NonSubmittingButtonSecurityTest.php new file mode 100644 index 0000000..dba6314 --- /dev/null +++ b/tests/TestCase/Form/NonSubmittingButtonSecurityTest.php @@ -0,0 +1,52 @@ +helper(attributes: ['formTokenData' => []]); + $form = $helper->form()->bind(); + $html = $form->open() . $form->control('record.id')->type('hidden')->value('42')->render(); + $html .= $form->submit('Save')->apply($config)->name('is_admin')->render() . $form->close(); + $xpath = $this->xpath($html); + $payload = [ + 'record' => ['id' => '42'], + '_Token' => [ + 'fields' => $xpath->evaluate('string(//input[@name="_Token[fields]"]/@value)'), + 'unlocked' => $xpath->evaluate('string(//input[@name="_Token[unlocked]"]/@value)'), + 'debug' => $xpath->evaluate('string(//input[@name="_Token[debug]"]/@value)'), + ], + ]; + $session = $helper->getView()->getRequest()->getSession()->id(); + static::assertTrue(new FormProtector()->validate($payload, '/articles/save', $session)); + static::assertSame( + $acceptance === 'optional', + new FormProtector()->validate($payload + ['is_admin' => '1'], '/articles/save', $session), + ); + $payload['record']['id'] = '999'; + static::assertFalse(new FormProtector()->validate($payload, '/articles/save', $session)); + } + + /** @return array Native button states. */ + public static function buttonConfigurations(): array + { + return [ + 'disabled submit' => [ButtonConfig::builder()->disabled(true), 'rejected'], + 'ordinary button' => [ButtonConfig::builder()->type('button'), 'rejected'], + 'reset' => [ButtonConfig::builder()->type('reset'), 'rejected'], + 'enabled submit' => [ButtonConfig::builder()->disabled(false), 'optional'], + 'invalid type defaults to submit' => [ButtonConfig::builder()->type('unknown'), 'optional'], + ]; + } +} From c630bf14eec17b9a78bda98958d8c981bff7f6e4 Mon Sep 17 00:00:00 2001 From: Jasper Smet Date: Thu, 19 Nov 2026 14:52:33 +0100 Subject: [PATCH 2/2] Keep button eligibility checks separate from registration --- src/Form/FormLifecycle.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Form/FormLifecycle.php b/src/Form/FormLifecycle.php index f8e9d70..9ee3c7b 100644 --- a/src/Form/FormLifecycle.php +++ b/src/Form/FormLifecycle.php @@ -114,13 +114,17 @@ public function register(BoundField $field, array $submissions, array $ids = []) } /** - * Register an enabled submit button as an optional submitted control. + * Register a successfully rendered named button as an optional submitted control. */ public function button(Attributes $attributes): void { $this->assertOpen(); $type = strtolower((string)($attributes->values['type'] ?? 'submit')); - if (!$attributes->has('disabled') && !in_array($type, ['button', 'reset'], true) && $attributes->has('name')) { + if ($attributes->has('disabled') || in_array($type, ['button', 'reset'], true)) { + return; + } + + if (isset($attributes->values['name'])) { $this->protection->optional((string)$attributes->values['name']); } }