Merge pull request #4452 from marc1706/ticket/14789

[ticket/14789] Further harden ACP link and form checks

* marc1706/ticket/14789:
  [ticket/14789] Add form tokens to tests and uncomment add_form_key
  [ticket/14789] Add link hashes and form tokens to all acp links/buttons

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php
index 1d37d748df..d41e3ec925 100644
--- a/tests/functional/search/base.php
+++ b/tests/functional/search/base.php
@@ -75,6 +75,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
 	protected function create_search_index()
 	{
 		$this->add_lang('acp/search');
+		$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid);
+		$form_values = $crawler->selectButton('Delete index')->form()->getValues();
 		$crawler = self::request(
 			'POST',
 			'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid,
@@ -82,6 +84,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
 				'search_type'	=> $this->search_backend,
 				'action'		=> 'create',
 				'submit'		=> true,
+				'form_token'	=> $form_values['form_token'],
+				'creation_time'	=> $form_values['creation_time'],
 			)
 		);
 		$this->assertContainsLang('SEARCH_INDEX_CREATED', $crawler->text());
@@ -90,6 +94,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
 	protected function delete_search_index()
 	{
 		$this->add_lang('acp/search');
+		$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid);
+		$form_values = $crawler->selectButton('Delete index')->form()->getValues();
 		$crawler = self::request(
 			'POST',
 			'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid,
@@ -97,6 +103,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
 				'search_type'	=> $this->search_backend,
 				'action'		=> 'delete',
 				'submit'		=> true,
+				'form_token'	=> $form_values['form_token'],
+				'creation_time'	=> $form_values['creation_time'],
 			)
 		);
 		$this->assertContainsLang('SEARCH_INDEX_REMOVED', $crawler->text());