Fixes to ssl/tls, misc improvements
* Use the PHP context options to configure tls rather than reinventing the wheel. * Properly setup the SocketServer for ssl * Added generic getter for config values
This commit is contained in:
@ -41,6 +41,24 @@ class Configuration
|
||||
return $config;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve a key from the configuration. If the key ends with a dot, all values
|
||||
* with keys starting with the requested key are returned. If the key is a single
|
||||
* dot, all keys are matched and all values returned.
|
||||
*
|
||||
* @param string $key
|
||||
* @param mixed $default Default value
|
||||
* @return mixed
|
||||
*/
|
||||
public function get(string $key, $default = null): mixed
|
||||
{
|
||||
if ($key === '.')
|
||||
return $this->config;
|
||||
if (str_ends_with($key, "."))
|
||||
return array_filter($this->config, fn($k)=>str_starts_with($k,$key), ARRAY_FILTER_USE_KEY);
|
||||
return $this->config[$key] ?? $default;
|
||||
}
|
||||
|
||||
public function setPublicUrl(string $publicUrl): self
|
||||
{
|
||||
$this->config['server.public_url'] = $publicUrl;
|
||||
|
@ -9,6 +9,7 @@ use NoccyLabs\Mercureact\Http\Server;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use React\EventLoop\Loop;
|
||||
use React\EventLoop\LoopInterface;
|
||||
use React\Socket\SecureServer;
|
||||
use React\Socket\SocketServer;
|
||||
|
||||
class Daemon
|
||||
@ -48,7 +49,21 @@ class Daemon
|
||||
$this->logger->warning("Empty listening address. You won't make it far.");
|
||||
return;
|
||||
}
|
||||
$socket = new SocketServer("tcp://".$listenAddress);
|
||||
|
||||
$certificate = $this->config->get("server.encryption.local_cert");
|
||||
|
||||
if ($certificate) {
|
||||
$this->logger->info("Using local cert: {$certificate}");
|
||||
$context = [
|
||||
'tls' => $this->config->get("server.encryption.")
|
||||
];
|
||||
$uri = 'tls://' . $listenAddress;
|
||||
} else {
|
||||
$uri = 'tcp://' . $listenAddress;
|
||||
}
|
||||
|
||||
$socket = new SocketServer($uri, $context??[]);
|
||||
|
||||
$this->server->listen($socket);
|
||||
}
|
||||
|
||||
|
@ -80,7 +80,7 @@ class Server
|
||||
$this->server->listen($socket);
|
||||
$this->logger->info(sprintf(
|
||||
"Listening on %s",
|
||||
str_replace("tcp://",($socket instanceof SecureServer?"https://":"http://"),$socket->getAddress())
|
||||
strtr($socket->getAddress(), [ "tcp://"=>"http://", "tls://"=>"https://"])
|
||||
));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user