makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15851] Improve validate checks and change visibility for unit testing

Browse source 
PHPBB-15851
This commit is contained in:
Marc Alexander 2024-10-30 20:57:34 +01:00
parent 3506883c75
commit 525924b2fc
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/phpbb/update/get_updates.php
View file

@ -23,20 +23,20 @@ use ZipArchive;
class get_updates class get_updates
{ {
/** @var filesystem_interface Filesystem manager */ /** @var filesystem_interface Filesystem manager */
private filesystem_interface $filesystem; protected filesystem_interface $filesystem;
/** @var Client HTTP client */ /** @var Client HTTP client */
private Client $http_client; protected Client $http_client;
/** @var ZipArchive Zip extractor */
protected ZipArchive $zipper;
/** @var string Public key to verify package */ /** @var string Public key to verify package */
private string $public_key; protected string $public_key;
/** @var string phpBB root path */ /** @var string phpBB root path */
private string $phpbb_root_path; private string $phpbb_root_path;
/** @var ZipArchive Zip extractor */
private ZipArchive $zipper;
/** /**
* Constructor * Constructor
* *
@ -51,9 +51,9 @@ class get_updates
{ {
$this->filesystem = $filesystem; $this->filesystem = $filesystem;
$this->http_client = new Client(); $this->http_client = new Client();
$this->zipper = new ZipArchive();
$this->public_key = base64_decode($public_key); $this->public_key = base64_decode($public_key);
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->zipper = new ZipArchive();
} }
/** /**
@ -91,12 +91,12 @@ class get_updates
*/ */
public function validate(string $file_path, string $signature_path): bool public function validate(string $file_path, string $signature_path): bool
{ {
if (file_exists($file_path) === false) if (file_exists($file_path) === false || !is_readable($file_path))
{ {
return false; return false;
} }
if (file_exists($signature_path) === false) if (file_exists($signature_path) === false || !is_readable($signature_path))
{ {
return false; return false;
} }
@ -109,13 +109,13 @@ class get_updates
return false; return false;
} }
$raw_signature = base64_decode($signature); $raw_signature = base64_decode($signature, true);
if ($raw_signature === false) if ($raw_signature === false)
{ {
return false; return false;
} }
$raw_public_key = base64_decode($this->public_key); $raw_public_key = base64_decode($this->public_key, true);
if ($raw_public_key === false) if ($raw_public_key === false)
{ {
return false; return false;