Merge pull request #24 from iMattPro/bug-asterix

Fix masked private key trick
phpbb-extensions · Jan 19, 2024 · 676c29c · 676c29c
2 parents 979065d + 887dc2b
commit 676c29c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/acp/wpn_acp_module.php b/acp/wpn_acp_module.php
@@ -44,6 +44,9 @@ class wpn_acp_module
 	/** @var array $errors */
 	protected $errors = [];
 
+	/** @var string Hide/replace private key with asterisks */
+	public const MASKED_PRIVATE_KEY = '********';
+
 	/**
 	 * Main ACP module
 	 *
@@ -97,7 +100,7 @@ public function display_settings()
 		$this->template->assign_vars([
 			'S_WEBPUSH_ENABLE'		=> $this->config['wpn_webpush_enable'],
 			'WEBPUSH_VAPID_PUBLIC'	=> $this->config['wpn_webpush_vapid_public'],
-			'WEBPUSH_VAPID_PRIVATE'	=> !$this->config['wpn_webpush_vapid_private'] ?: '********', // Replace private key with asterixes
+			'WEBPUSH_VAPID_PRIVATE'	=> $this->config['wpn_webpush_vapid_private'] ? self::MASKED_PRIVATE_KEY : '',
 			'U_ACTION'				=> $this->u_action,
 		]);
 	}
@@ -117,7 +120,7 @@ public function save_settings()
 		];
 
 		// Do not validate and update private key field if the content is ******** and the key was already set
-		if ($config_array['wpn_webpush_vapid_private'] == '********' && $this->config['wpn_webpush_vapid_private'])
+		if ($config_array['wpn_webpush_vapid_private'] === self::MASKED_PRIVATE_KEY && $this->config['wpn_webpush_vapid_private'])
 		{
 			unset($display_settings['wpn_webpush_vapid_private'], $config_array['wpn_webpush_vapid_private']);
 		}

diff --git a/tests/functional/functional_test.php b/tests/functional/functional_test.php
@@ -57,7 +57,7 @@ public function test_acp_module()
 
 		foreach ($form_data as $config_name => $config_value)
 		{
-			$config_value = ($config_name === 'config[wpn_webpush_vapid_private]') ? '********' : $config_value;
+			$config_value = ($config_name === 'config[wpn_webpush_vapid_private]') ? \phpbb\webpushnotifications\acp\wpn_acp_module::MASKED_PRIVATE_KEY : $config_value;
 			$this->assertEquals($config_value, $crawler->filter('input[name="' . $config_name . '"]')->attr('value'));
 		}
 	}