From 8a80b9c4dc9173a75d88a7c44b0bc84f86544ce6 Mon Sep 17 00:00:00 2001
From: Michal Haltuf <haltuf@imagineo.cz>
Date: Tue, 15 Nov 2022 10:02:42 +0100
Subject: [PATCH] add Secured as attribute for PHP >= 8.0

---
 src/Secured.php                             | 12 +++
 src/SecuredLinksControlTrait.php            |  2 +-
 src/SecuredLinksPresenterTrait.php          |  2 +-
 tests/cases/SecuredLinksTest.attribute.phpt | 95 +++++++++++++++++++++
 4 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 src/Secured.php
 create mode 100644 tests/cases/SecuredLinksTest.attribute.phpt

diff --git a/src/Secured.php b/src/Secured.php
new file mode 100644
index 0000000..00ddb49
--- /dev/null
+++ b/src/Secured.php
@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+
+namespace Nextras\Application\UI;
+
+use Attribute;
+
+
+#[Attribute(Attribute::TARGET_METHOD)]
+class Secured
+{
+
+}
\ No newline at end of file
diff --git a/src/SecuredLinksControlTrait.php b/src/SecuredLinksControlTrait.php
index 198afed..1371c89 100644
--- a/src/SecuredLinksControlTrait.php
+++ b/src/SecuredLinksControlTrait.php
@@ -41,7 +41,7 @@ public function signalReceived(string $signal): void
 
 		if (method_exists($this, $method)) {
 			$reflection = new \ReflectionMethod($this, $method);
-			$secured = Nette\Application\UI\ComponentReflection::parseAnnotation($reflection, 'secured') !== NULL;
+			$secured = Nette\Application\UI\ComponentReflection::parseAnnotation($reflection, 'secured') !== NULL || count($reflection->getAttributes(Secured::class)) > 0;
 			if ($secured) {
 				$params = array($this->getUniqueId());
 				if ($this->params) {
diff --git a/src/SecuredLinksPresenterTrait.php b/src/SecuredLinksPresenterTrait.php
index be2e052..0becac6 100644
--- a/src/SecuredLinksPresenterTrait.php
+++ b/src/SecuredLinksPresenterTrait.php
@@ -68,7 +68,7 @@ public function createSecuredLink(Component $component, string $link, string $de
 			$method = $component->formatSignalMethod($signal);
 			$signalReflection = $reflection->getMethod($method);
 
-			if (!$signalReflection->hasAnnotation('secured')) {
+			if (!$signalReflection->hasAnnotation('secured') && count($signalReflection->getAttributes(Secured::class)) === 0) {
 				break;
 			}
 
diff --git a/tests/cases/SecuredLinksTest.attribute.phpt b/tests/cases/SecuredLinksTest.attribute.phpt
new file mode 100644
index 0000000..307baf1
--- /dev/null
+++ b/tests/cases/SecuredLinksTest.attribute.phpt
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @phpVersion >= 8.0.0
+ */
+
+use Nette\Application\Request;
+use Nette\Application\Routers\SimpleRouter;
+use Nette\Application\UI\Control;
+use Nette\Application\UI\Presenter;
+use Nette\Http\Request as HttpRequest;
+use Nette\Http\Response;
+use Nette\Http\UrlScript;
+use Nextras\Application\UI\Secured;
+use Nextras\Application\UI\SecuredLinksControlTrait;
+use Nextras\Application\UI\SecuredLinksPresenterTrait;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class TestControl extends Control
+{
+	use SecuredLinksControlTrait;
+	#[Secured]
+	public function handlePay($amount = 0)
+	{
+	}
+}
+
+
+class TestPresenter extends Presenter
+{
+	use SecuredLinksPresenterTrait;
+	protected function startup()
+	{
+		parent::startup();
+		$this['mycontrol'] = new TestControl;
+	}
+	public function renderDefault()
+	{
+		$this->terminate();
+	}
+	#[Secured]
+	public function handlePay($amount = 0)
+	{
+	}
+	#[Secured]
+	public function handlePay2($amount)
+	{
+	}
+	#[Secured]
+	public function handleList(array $sections)
+	{
+	}
+}
+
+
+$url = new UrlScript('http://localhost/index.php', '/index.php');
+
+$httpRequest = new HttpRequest($url);
+$httpResponse = new Response();
+
+$router = new SimpleRouter();
+$request = new Request('Test', HttpRequest::GET, array());
+
+$sessionSection = Mockery::mock('alias:Nette\Http\SessionSection');
+$sessionSection->token = 'abcd';
+
+$session = Mockery::mock('Nette\Http\Session');
+$session->shouldReceive('getSection')->with('Nextras.Application.UI.SecuredLinksPresenterTrait')->andReturn($sessionSection);
+$session->shouldReceive('getId')->times(8)->andReturn('session_id_1');
+
+$presenter = new TestPresenter();
+$presenter->autoCanonicalize = FALSE;
+$presenter->injectPrimary(NULL, NULL, $router, $httpRequest, $httpResponse, $session, NULL);
+$presenter->run($request);
+
+
+Assert::same( '/index.php?action=default&do=pay&presenter=Test&_sec=7VNmMotk', $presenter->link('pay!') );
+Assert::same( '/index.php?amount=200&action=default&do=pay&presenter=Test&_sec=7VNmMotk', $presenter->link('pay!', [200]) );
+Assert::same( '/index.php?amount=100&action=default&do=pay2&presenter=Test&_sec=JtQFHCP3', $presenter->link('pay2!', [100]) );
+Assert::same( '/index.php?amount=200&action=default&do=pay2&presenter=Test&_sec=S2PM9nnh', $presenter->link('pay2!', [200]) );
+Assert::same( '/index.php?sections[0]=a&sections[1]=b&action=default&do=list&presenter=Test&_sec=btNfK0zF', urldecode($presenter->link('list!', [['a', 'b']])) );
+Assert::same( '/index.php?sections[0]=a&sections[1]=c&action=default&do=list&presenter=Test&_sec=2oGtxq6E', urldecode($presenter->link('list!', [['a', 'c']])) );
+
+Assert::same( '/index.php?action=default&do=mycontrol-pay&presenter=Test&mycontrol-_sec=_eyaqc4b', $presenter['mycontrol']->link('pay') );
+Assert::same( '/index.php?mycontrol-amount=200&action=default&do=mycontrol-pay&presenter=Test&mycontrol-_sec=_eyaqc4b', $presenter['mycontrol']->link('pay', [200]) );
+
+
+$session->shouldReceive('getId')->times(2)->andReturn('session_id_2');
+
+Assert::same( '/index.php?sections[0]=a&sections[1]=b&action=default&do=list&presenter=Test&_sec=Y3v1C1cr', urldecode($presenter->link('list!', [['a', 'b']])) );
+Assert::same( '/index.php?sections[0]=a&sections[1]=c&action=default&do=list&presenter=Test&_sec=kfY-zsLy', urldecode($presenter->link('list!', [['a', 'c']])) );
+
+Mockery::close();