mirror of
https://github.com/nextcloud/server.git
synced 2024-07-31 08:15:55 +02:00
feat: add switch to disable dns pinning
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
parent
6f520f2304
commit
eab46bdfe6
@ -27,8 +27,8 @@ declare(strict_types=1);
|
|||||||
namespace OC\Http\Client;
|
namespace OC\Http\Client;
|
||||||
|
|
||||||
use GuzzleHttp\Client as GuzzleClient;
|
use GuzzleHttp\Client as GuzzleClient;
|
||||||
use GuzzleHttp\HandlerStack;
|
|
||||||
use GuzzleHttp\Handler\CurlHandler;
|
use GuzzleHttp\Handler\CurlHandler;
|
||||||
|
use GuzzleHttp\HandlerStack;
|
||||||
use GuzzleHttp\Middleware;
|
use GuzzleHttp\Middleware;
|
||||||
use OCP\Diagnostics\IEventLogger;
|
use OCP\Diagnostics\IEventLogger;
|
||||||
use OCP\Http\Client\IClient;
|
use OCP\Http\Client\IClient;
|
||||||
@ -75,7 +75,9 @@ class ClientService implements IClientService {
|
|||||||
public function newClient(): IClient {
|
public function newClient(): IClient {
|
||||||
$handler = new CurlHandler();
|
$handler = new CurlHandler();
|
||||||
$stack = HandlerStack::create($handler);
|
$stack = HandlerStack::create($handler);
|
||||||
$stack->push($this->dnsPinMiddleware->addDnsPinning());
|
if ($this->config->getSystemValueBool('dns_pinning', true)) {
|
||||||
|
$stack->push($this->dnsPinMiddleware->addDnsPinning());
|
||||||
|
}
|
||||||
$stack->push(Middleware::tap(function (RequestInterface $request) {
|
$stack->push(Middleware::tap(function (RequestInterface $request) {
|
||||||
$this->eventLogger->start('http:request', $request->getMethod() . " request to " . $request->getRequestTarget());
|
$this->eventLogger->start('http:request', $request->getMethod() . " request to " . $request->getRequestTarget());
|
||||||
}, function () {
|
}, function () {
|
||||||
|
@ -12,8 +12,8 @@ declare(strict_types=1);
|
|||||||
namespace Test\Http\Client;
|
namespace Test\Http\Client;
|
||||||
|
|
||||||
use GuzzleHttp\Client as GuzzleClient;
|
use GuzzleHttp\Client as GuzzleClient;
|
||||||
use GuzzleHttp\HandlerStack;
|
|
||||||
use GuzzleHttp\Handler\CurlHandler;
|
use GuzzleHttp\Handler\CurlHandler;
|
||||||
|
use GuzzleHttp\HandlerStack;
|
||||||
use GuzzleHttp\Middleware;
|
use GuzzleHttp\Middleware;
|
||||||
use OC\Http\Client\Client;
|
use OC\Http\Client\Client;
|
||||||
use OC\Http\Client\ClientService;
|
use OC\Http\Client\ClientService;
|
||||||
@ -32,6 +32,9 @@ class ClientServiceTest extends \Test\TestCase {
|
|||||||
public function testNewClient(): void {
|
public function testNewClient(): void {
|
||||||
/** @var IConfig $config */
|
/** @var IConfig $config */
|
||||||
$config = $this->createMock(IConfig::class);
|
$config = $this->createMock(IConfig::class);
|
||||||
|
$config->method('getSystemValueBool')
|
||||||
|
->with('dns_pinning', true)
|
||||||
|
->willReturn(true);
|
||||||
/** @var ICertificateManager $certificateManager */
|
/** @var ICertificateManager $certificateManager */
|
||||||
$certificateManager = $this->createMock(ICertificateManager::class);
|
$certificateManager = $this->createMock(ICertificateManager::class);
|
||||||
$dnsPinMiddleware = $this->createMock(DnsPinMiddleware::class);
|
$dnsPinMiddleware = $this->createMock(DnsPinMiddleware::class);
|
||||||
@ -74,4 +77,52 @@ class ClientServiceTest extends \Test\TestCase {
|
|||||||
$clientService->newClient()
|
$clientService->newClient()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testDisableDnsPinning(): void {
|
||||||
|
/** @var IConfig $config */
|
||||||
|
$config = $this->createMock(IConfig::class);
|
||||||
|
$config->method('getSystemValueBool')
|
||||||
|
->with('dns_pinning', true)
|
||||||
|
->willReturn(false);
|
||||||
|
/** @var ICertificateManager $certificateManager */
|
||||||
|
$certificateManager = $this->createMock(ICertificateManager::class);
|
||||||
|
$dnsPinMiddleware = $this->createMock(DnsPinMiddleware::class);
|
||||||
|
$dnsPinMiddleware
|
||||||
|
->expects($this->never())
|
||||||
|
->method('addDnsPinning')
|
||||||
|
->willReturn(function () {
|
||||||
|
});
|
||||||
|
$remoteHostValidator = $this->createMock(IRemoteHostValidator::class);
|
||||||
|
$eventLogger = $this->createMock(IEventLogger::class);
|
||||||
|
$logger = $this->createMock(LoggerInterface::class);
|
||||||
|
|
||||||
|
$clientService = new ClientService(
|
||||||
|
$config,
|
||||||
|
$certificateManager,
|
||||||
|
$dnsPinMiddleware,
|
||||||
|
$remoteHostValidator,
|
||||||
|
$eventLogger,
|
||||||
|
$logger,
|
||||||
|
);
|
||||||
|
|
||||||
|
$handler = new CurlHandler();
|
||||||
|
$stack = HandlerStack::create($handler);
|
||||||
|
$stack->push(Middleware::tap(function (RequestInterface $request) use ($eventLogger) {
|
||||||
|
$eventLogger->start('http:request', $request->getMethod() . " request to " . $request->getRequestTarget());
|
||||||
|
}, function () use ($eventLogger) {
|
||||||
|
$eventLogger->end('http:request');
|
||||||
|
}), 'event logger');
|
||||||
|
$guzzleClient = new GuzzleClient(['handler' => $stack]);
|
||||||
|
|
||||||
|
$this->assertEquals(
|
||||||
|
new Client(
|
||||||
|
$config,
|
||||||
|
$certificateManager,
|
||||||
|
$guzzleClient,
|
||||||
|
$remoteHostValidator,
|
||||||
|
$logger,
|
||||||
|
),
|
||||||
|
$clientService->newClient()
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user