Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix realpath #24

Merged
merged 3 commits into from
Jun 1, 2024
Merged

Fix realpath #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97ad7f9
run cs fix
miladrahimi Jun 1, 2024
fd24ca5
use realpath to check files that be loaded through realpath
miladrahimi Jun 1, 2024
cb71a37
change resource key type from resource to mixed to support both resou…
miladrahimi Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Cryptography/Keys/EcdsaPrivateKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class EcdsaPrivateKey
{
/**
* @var resource Key resource handler
* @var mixed Key resource handler
*/
protected $resource;

Expand All @@ -24,7 +24,7 @@ class EcdsaPrivateKey
*/
public function __construct(string $key, string $passphrase = '', ?string $id = null)
{
$content = file_exists($key) ? file_get_contents(realpath($key)) : $key;
$content = realpath($key) ? file_get_contents(realpath($key)) : $key;

$this->resource = openssl_pkey_get_private($content, $passphrase);
if ($this->resource === false) {
Expand All @@ -35,7 +35,7 @@ public function __construct(string $key, string $passphrase = '', ?string $id =
}

/**
* @return resource
* @return mixed
*/
public function getResource()
{
Expand Down
6 changes: 3 additions & 3 deletions src/Cryptography/Keys/EcdsaPublicKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class EcdsaPublicKey
{
/**
* @var resource Key resource handler
* @var mixed Key resource handler
*/
protected $resource;

Expand All @@ -23,7 +23,7 @@ class EcdsaPublicKey
*/
public function __construct(string $key, ?string $id = null)
{
$content = file_exists($key) ? file_get_contents(realpath($key)) : $key;
$content = realpath($key) ? file_get_contents(realpath($key)) : $key;

$this->resource = openssl_pkey_get_public($content);
if ($this->resource === false) {
Expand All @@ -34,7 +34,7 @@ public function __construct(string $key, ?string $id = null)
}

/**
* @return resource
* @return mixed
*/
public function getResource()
{
Expand Down
6 changes: 3 additions & 3 deletions src/Cryptography/Keys/RsaPrivateKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class RsaPrivateKey
{
/**
* @var resource Key resource handler
* @var mixed Key resource handler
*/
protected $resource;

Expand All @@ -24,7 +24,7 @@ class RsaPrivateKey
*/
public function __construct(string $key, string $passphrase = '', ?string $id = null)
{
$content = file_exists($key) ? file_get_contents(realpath($key)) : $key;
$content = realpath($key) ? file_get_contents(realpath($key)) : $key;

$this->resource = openssl_pkey_get_private($content, $passphrase);
if ($this->resource === false) {
Expand All @@ -35,7 +35,7 @@ public function __construct(string $key, string $passphrase = '', ?string $id =
}

/**
* @return resource
* @return mixed
*/
public function getResource()
{
Expand Down
6 changes: 3 additions & 3 deletions src/Cryptography/Keys/RsaPublicKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class RsaPublicKey
{
/**
* @var resource Key resource handler
* @var mixed Key resource handler
*/
protected $resource;

Expand All @@ -23,7 +23,7 @@ class RsaPublicKey
*/
public function __construct(string $key, ?string $id = null)
{
$content = file_exists($key) ? file_get_contents(realpath($key)) : $key;
$content = realpath($key) ? file_get_contents(realpath($key)) : $key;

$this->resource = openssl_pkey_get_public($content);
if ($this->resource === false) {
Expand All @@ -34,7 +34,7 @@ public function __construct(string $key, ?string $id = null)
}

/**
* @return resource
* @return mixed
*/
public function getResource()
{
Expand Down
8 changes: 6 additions & 2 deletions tests/ExamplesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,16 @@ public function test_eddsa_algorithms()
public function test_multiple_keys()
{
$privateKey1 = new RsaPrivateKey(
__DIR__ . '/../assets/keys/rsa-private.pem', '', 'key-1'
__DIR__ . '/../assets/keys/rsa-private.pem',
'',
'key-1'
);
$publicKey1 = new RsaPublicKey(__DIR__ . '/../assets/keys/rsa-public.pem', 'key-1');

$privateKey2 = new EcdsaPrivateKey(
__DIR__ . '/../assets/keys/ecdsa384-private.pem', '', 'key-2'
__DIR__ . '/../assets/keys/ecdsa384-private.pem',
'',
'key-2'
);
$publicKey2 = new EcdsaPublicKey(__DIR__ . '/../assets/keys/ecdsa384-public.pem', 'key-2');

Expand Down
4 changes: 3 additions & 1 deletion tests/VerifierFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ class VerifierFactoryTest extends TestCase
public function test_getVerifier_it_should_return_the_right_verifier()
{
$privateKey = new RsaPrivateKey(
__DIR__ . '/../assets/keys/rsa-private.pem', '', 'key-1'
__DIR__ . '/../assets/keys/rsa-private.pem',
'',
'key-1'
);
$publicKey = new RsaPublicKey(__DIR__ . '/../assets/keys/rsa-public.pem', 'key-1');

Expand Down