Skip to content

Commit ee9f2e8

Browse files
authored
Add SSL certificate configuration keys to database connections (#579)
1 parent 71eb6ed commit ee9f2e8

File tree

4 files changed

+30
-0
lines changed

4 files changed

+30
-0
lines changed

src/Configuration/Connections/MysqlConnection.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ public function resolve(array $settings = [])
2222
'charset' => Arr::get($settings, 'charset'),
2323
'port' => Arr::get($settings, 'port'),
2424
'unix_socket' => Arr::get($settings, 'unix_socket'),
25+
'ssl_key' => Arr::get($settings, 'ssl_key'),
26+
'ssl_cert' => Arr::get($settings, 'ssl_cert'),
27+
'ssl_ca' => Arr::get($settings, 'ssl_ca'),
28+
'ssl_capath' => Arr::get($settings, 'ssl_capath'),
29+
'ssl_cipher' => Arr::get($settings, 'ssl_cipher'),
2530
'prefix' => Arr::get($settings, 'prefix'),
2631
'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []),
2732
'serverVersion' => Arr::get($settings, 'serverVersion'),

src/Configuration/Connections/PgsqlConnection.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ public function resolve(array $settings = [])
2222
'charset' => Arr::get($settings, 'charset'),
2323
'port' => Arr::get($settings, 'port'),
2424
'sslmode' => Arr::get($settings, 'sslmode'),
25+
'sslkey' => Arr::get($settings, 'sslkey'),
26+
'sslcert' => Arr::get($settings, 'sslcert'),
27+
'sslrootcert' => Arr::get($settings, 'sslrootcert'),
28+
'sslcrl' => Arr::get($settings, 'sslcrl'),
29+
'gssencmode' => Arr::get($settings, 'gssencmode'),
2530
'prefix' => Arr::get($settings, 'prefix'),
2631
'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []),
2732
'serverVersion' => Arr::get($settings, 'serverVersion'),

tests/Configuration/Connections/MysqlConnectionTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ public function test_can_resolve()
3636
'charset' => 'charset',
3737
'port' => 'port',
3838
'unix_socket' => 'unix_socket',
39+
'ssl_key' => 'ssl_key',
40+
'ssl_cert' => 'ssl_cert',
41+
'ssl_ca' => 'ssl_ca',
42+
'ssl_capath' => 'ssl_capath',
43+
'ssl_cipher' => 'ssl_cipher',
3944
'prefix' => 'prefix',
4045
'defaultTableOptions' => [],
4146
'driverOptions' => [],
@@ -49,6 +54,11 @@ public function test_can_resolve()
4954
$this->assertEquals('charset', $resolved['charset']);
5055
$this->assertEquals('port', $resolved['port']);
5156
$this->assertEquals('unix_socket', $resolved['unix_socket']);
57+
$this->assertEquals('ssl_key', $resolved['ssl_key']);
58+
$this->assertEquals('ssl_cert', $resolved['ssl_cert']);
59+
$this->assertEquals('ssl_ca', $resolved['ssl_ca']);
60+
$this->assertEquals('ssl_capath', $resolved['ssl_capath']);
61+
$this->assertEquals('ssl_cipher', $resolved['ssl_cipher']);
5262
$this->assertEquals('prefix', $resolved['prefix']);
5363
$this->assertCount(0, $resolved['defaultTableOptions']);
5464
$this->assertCount(0, $resolved['driverOptions']);

tests/Configuration/Connections/PgsqlConnectionTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ public function test_can_resolve()
3737
'port' => 'port',
3838
'prefix' => 'prefix',
3939
'sslmode' => 'sslmode',
40+
'sslkey' => 'sslkey',
41+
'sslcert' => 'sslcert',
42+
'sslrootcert' => 'sslrootcert',
43+
'sslcrl' => 'sslcrl',
44+
'gssencmode' => 'gssencmode',
4045
'defaultTableOptions' => [],
4146
'driverOptions' => [],
4247
]);
@@ -49,6 +54,11 @@ public function test_can_resolve()
4954
$this->assertEquals('charset', $resolved['charset']);
5055
$this->assertEquals('port', $resolved['port']);
5156
$this->assertEquals('sslmode', $resolved['sslmode']);
57+
$this->assertEquals('sslkey', $resolved['sslkey']);
58+
$this->assertEquals('sslcert', $resolved['sslcert']);
59+
$this->assertEquals('sslrootcert', $resolved['sslrootcert']);
60+
$this->assertEquals('sslcrl', $resolved['sslcrl']);
61+
$this->assertEquals('gssencmode', $resolved['gssencmode']);
5262
$this->assertEquals('prefix', $resolved['prefix']);
5363
$this->assertCount(0, $resolved['defaultTableOptions']);
5464
$this->assertCount(0, $resolved['driverOptions']);

0 commit comments

Comments
 (0)