Skip to content

Commit

Permalink
Merge branch 'laminas:2.9.x' into redis-user
Browse files Browse the repository at this point in the history
  • Loading branch information
vcg-development committed Apr 19, 2024
2 parents 95718b9 + 82c636c commit 2efcb78
Show file tree
Hide file tree
Showing 8 changed files with 385 additions and 7 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"license": "BSD-3-Clause",
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"ext-redis": "^5.0.2 || ^6.0",
"ext-redis": "^5.3.2 || ^6.0",
"laminas/laminas-cache": "^3.10"
},
"provide": {
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
<code>setReadTimeout</code>
<code>setSeeds</code>
<code>setTimeout</code>
<code>setSslContext</code>
</PossiblyUnusedMethod>
</file>
<file src="src/RedisOptions.php">
Expand Down
42 changes: 42 additions & 0 deletions src/RedisClusterOptions.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

use Laminas\Cache\Exception\RuntimeException;
use Laminas\Cache\Storage\Adapter\Exception\InvalidRedisClusterConfigurationException;
use Laminas\Stdlib\AbstractOptions;
use Traversable;

use function is_array;
use function iterator_to_array;

final class RedisClusterOptions extends AdapterOptions
{
Expand Down Expand Up @@ -53,6 +58,8 @@ final class RedisClusterOptions extends AdapterOptions

private string $password = '';

private ?SslContext $sslContext = null;

/**
* @param iterable|null|AdapterOptions $options
* @psalm-param iterable<string,mixed>|null|AdapterOptions $options
Expand All @@ -76,6 +83,31 @@ public function __construct($options = null)
}
}

/**
* {@inheritDoc}
*/
public function setFromArray($options)
{
if ($options instanceof AbstractOptions) {
$options = $options->toArray();
} elseif ($options instanceof Traversable) {
$options = iterator_to_array($options);
}

$sslContext = $options['sslContext'] ?? $options['ssl_context'] ?? null;
unset($options['sslContext'], $options['ssl_context']);
if (is_array($sslContext)) {
/** @psalm-suppress MixedArgumentTypeCoercion Trust upstream that they verify the array beforehand. */
$sslContext = SslContext::fromSslContextArray($sslContext);
}

if ($sslContext instanceof SslContext) {
$options['ssl_context'] = $sslContext;
}

return parent::setFromArray($options);
}

public function setTimeout(float $timeout): void
{
$this->timeout = $timeout;
Expand Down Expand Up @@ -222,4 +254,14 @@ public function setPassword(string $password): void
{
$this->password = $password;
}

public function getSslContext(): ?SslContext
{
return $this->sslContext;
}

public function setSslContext(SslContext|null $sslContext): void
{
$this->sslContext = $sslContext;
}
}
24 changes: 20 additions & 4 deletions src/RedisClusterResourceManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ private function createRedisResource(RedisClusterOptions $options): RedisCluster
$options->getTimeout(),
$options->getReadTimeout(),
$options->isPersistent(),
$options->getPassword()
$options->getPassword(),
$options->getSslContext()
);
}

Expand All @@ -90,13 +91,20 @@ private function createRedisResource(RedisClusterOptions $options): RedisCluster
$password = null;
}

/**
* Psalm currently (<= 5.23.1) uses an outdated (phpredis < 5.3.2) constructor signature for the RedisCluster
* class in the phpredis extension.
*
* @psalm-suppress TooManyArguments https://github.com/vimeo/psalm/pull/10862
*/
return new RedisClusterFromExtension(
null,
$options->getSeeds(),
$options->getTimeout(),
$options->getReadTimeout(),
$options->isPersistent(),
$password
$password,
$options->getSslContext()?->toSslContextArray()
);
}

Expand All @@ -108,21 +116,29 @@ private function createRedisResourceFromName(
float $fallbackTimeout,
float $fallbackReadTimeout,
bool $persistent,
string $fallbackPassword
string $fallbackPassword,
?SslContext $sslContext
): RedisClusterFromExtension {
$options = new RedisClusterOptionsFromIni();
$seeds = $options->getSeeds($name);
$timeout = $options->getTimeout($name, $fallbackTimeout);
$readTimeout = $options->getReadTimeout($name, $fallbackReadTimeout);
$password = $options->getPasswordByName($name, $fallbackPassword);

/**
* Psalm currently (<= 5.23.1) uses an outdated (phpredis < 5.3.2) constructor signature for the RedisCluster
* class in the phpredis extension.
*
* @psalm-suppress TooManyArguments https://github.com/vimeo/psalm/pull/10862
*/
return new RedisClusterFromExtension(
null,
$seeds,
$timeout,
$readTimeout,
$persistent,
$password
$password,
$sslContext?->toSslContextArray()
);
}

Expand Down
220 changes: 220 additions & 0 deletions src/SslContext.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
<?php

declare(strict_types=1);

namespace Laminas\Cache\Storage\Adapter;

use SensitiveParameter;

/**
* Class containing the SSL context options in its fields.
*
* @link https://www.php.net/manual/en/context.ssl.php
*
* @psalm-type SSLContextArrayShape = array{
* peer_name?: non-empty-string,
* verify_peer?: bool,
* verify_peer_name?: bool,
* allow_self_signed?: bool,
* cafile?: non-empty-string,
* capath?: non-empty-string,
* local_cert?: non-empty-string,
* local_pk?: non-empty-string,
* passphrase?: non-empty-string,
* verify_depth?: non-negative-int,
* ciphers?: non-empty-string,
* SNI_enabled?: bool,
* disable_compression?: bool,
* peer_fingerprint?: non-empty-string|array<non-empty-string,non-empty-string>,
* security_level?: non-negative-int
* }
*/
final class SslContext
{
/**
* @param non-empty-string|null $expectedPeerName
* @param non-empty-string|null $certificateAuthorityFile
* @param non-empty-string|null $certificateAuthorityPath
* @param non-empty-string|null $localCertificatePath
* @param non-empty-string|null $localPrivateKeyPath
* @param non-empty-string|null $passphrase
* @param non-negative-int|null $verifyDepth
* @param non-empty-string|null $ciphers
* @param non-empty-string|array<non-empty-string,non-empty-string>|null $peerFingerprint
* @param non-negative-int|null $securityLevel
*/
public function __construct(
/**
* Peer name to be used.
* If this value is not set, then the name is guessed based on the hostname used when opening the stream.
*/
public readonly ?string $expectedPeerName = null,
/**
* Require verification of SSL certificate used.
*/
public readonly ?bool $verifyPeer = null,
/**
* Require verification of peer name.
*/
public readonly ?bool $verifyPeerName = null,
/**
* Allow self-signed certificates. Requires verifyPeer.
*/
public readonly ?bool $allowSelfSignedCertificates = null,
/**
* Location of Certificate Authority file on local filesystem which should be used with the verifyPeer
* context option to authenticate the identity of the remote peer.
*/
public readonly ?string $certificateAuthorityFile = null,
/**
* If cafile is not specified or if the certificate is not found there, the directory pointed to by capath is
* searched for a suitable certificate. capath must be a correctly hashed certificate directory.
*/
public readonly ?string $certificateAuthorityPath = null,
/**
* Path to local certificate file on filesystem. It must be a PEM encoded file which contains your certificate
* and private key. It can optionally contain the certificate chain of issuers.
* The private key also may be contained in a separate file specified by localPk.
*/
public readonly ?string $localCertificatePath = null,
/**
* Path to local private key file on filesystem in case of separate files for certificate (localCert)
* and private key.
*/
public readonly ?string $localPrivateKeyPath = null,
/**
* Passphrase with which your localCert file was encoded.
*/
#[SensitiveParameter]
public readonly ?string $passphrase = null,
/**
* Abort if the certificate chain is too deep.
* If not set, defaults to no verification.
*/
public readonly ?int $verifyDepth = null,
/**
* Sets the list of available ciphers. The format of the string is described in
* https://www.openssl.org/docs/manmaster/man1/ciphers.html#CIPHER-LIST-FORMAT
*/
public readonly ?string $ciphers = null,
/**
* If set to true server name indication will be enabled. Enabling SNI allows multiple certificates on the same
* IP address.
* If not set, will automatically be enabled if SNI support is available.
*/
public readonly ?bool $serverNameIndicationEnabled = null,
/**
* If set, disable TLS compression. This can help mitigate the CRIME attack vector.
*/
public readonly ?bool $disableCompression = null,
/**
* Aborts when the remote certificate digest doesn't match the specified hash.
*
* When a string is used, the length will determine which hashing algorithm is applied,
* either "md5" (32) or "sha1" (40).
*
* When an array is used, the keys indicate the hashing algorithm name and each corresponding
* value is the expected digest.
*/
public readonly array|string|null $peerFingerprint = null,
/**
* Sets the security level. If not specified the library default security level is used. The security levels are
* described in https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_get_security_level.html.
*/
public readonly ?int $securityLevel = null,
) {
}

/**
* @param SSLContextArrayShape $context
*/
public static function fromSslContextArray(array $context): self
{
return new self(
$context['peer_name'] ?? null,
$context['verify_peer'] ?? null,
$context['verify_peer_name'] ?? null,
$context['allow_self_signed'] ?? null,
$context['cafile'] ?? null,
$context['capath'] ?? null,
$context['local_cert'] ?? null,
$context['local_pk'] ?? null,
$context['passphrase'] ?? null,
$context['verify_depth'] ?? null,
$context['ciphers'] ?? null,
$context['SNI_enabled'] ?? null,
$context['disable_compression'] ?? null,
$context['peer_fingerprint'] ?? null,
$context['security_level'] ?? null,
);
}

/**
* @return SSLContextArrayShape
*/
public function toSslContextArray(): array
{
$context = [];
if ($this->expectedPeerName !== null) {
$context['peer_name'] = $this->expectedPeerName;
}

if ($this->verifyPeer !== null) {
$context['verify_peer'] = $this->verifyPeer;
}

if ($this->verifyPeerName !== null) {
$context['verify_peer_name'] = $this->verifyPeerName;
}

if ($this->allowSelfSignedCertificates !== null) {
$context['allow_self_signed'] = $this->allowSelfSignedCertificates;
}

if ($this->certificateAuthorityFile !== null) {
$context['cafile'] = $this->certificateAuthorityFile;
}

if ($this->certificateAuthorityPath !== null) {
$context['capath'] = $this->certificateAuthorityPath;
}

if ($this->localCertificatePath !== null) {
$context['local_cert'] = $this->localCertificatePath;
}

if ($this->localPrivateKeyPath !== null) {
$context['local_pk'] = $this->localPrivateKeyPath;
}

if ($this->passphrase !== null) {
$context['passphrase'] = $this->passphrase;
}

if ($this->verifyDepth !== null) {
$context['verify_depth'] = $this->verifyDepth;
}

if ($this->ciphers !== null) {
$context['ciphers'] = $this->ciphers;
}

if ($this->serverNameIndicationEnabled !== null) {
$context['SNI_enabled'] = $this->serverNameIndicationEnabled;
}

if ($this->disableCompression !== null) {
$context['disable_compression'] = $this->disableCompression;
}

if ($this->peerFingerprint !== null) {
$context['peer_fingerprint'] = $this->peerFingerprint;
}

if ($this->securityLevel !== null) {
$context['security_level'] = $this->securityLevel;
}

return $context;
}
}
Loading

0 comments on commit 2efcb78

Please sign in to comment.