Skip to content

Db tls transit option in J 4 #138

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

Open
andrepereiradasilva wants to merge 7 commits into
base: 4.0-dev
Choose a base branch
from
Open

Db tls transit option in J 4 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
791ad48
initial commit
andrepereiradasilva Aug 5, 2019
6802238
language strings - some
andrepereiradasilva Aug 5, 2019
07b4760
no switcher
andrepereiradasilva Aug 5, 2019
3acf744
Add isConnectionEncryptionSupported
richard67 Aug 18, 2019
e907f10
Merge pull request #139 from richard67/db-tls-transit-2
andrepereiradasilva Aug 18, 2019
45bf9b5
Show "None" if no encryption
richard67 Aug 18, 2019
2881995
Merge pull request #140 from richard67/db-tls-transit-2
andrepereiradasilva Aug 18, 2019
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
22 changes: 12 additions & 10 deletions administrator/components/com_admin/Model/SysinfoModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,16 +308,18 @@ public function &getInfo()
$db = $this->getDbo();

$this->info = array(
'php' => php_uname(),
'dbserver' => $db->getServerType(),
'dbversion' => $db->getVersion(),
'dbcollation' => $db->getCollation(),
'dbconnectioncollation' => $db->getConnectionCollation(),
'phpversion' => PHP_VERSION,
'server' => $_SERVER['SERVER_SOFTWARE'] ?? getenv('SERVER_SOFTWARE'),
'sapi_name' => PHP_SAPI,
'version' => (new Version)->getLongVersion(),
'useragent' => $_SERVER['HTTP_USER_AGENT'] ?? '',
'php' => php_uname(),
'dbserver' => $db->getServerType(),
'dbversion' => $db->getVersion(),
'dbcollation' => $db->getCollation(),
'dbconnectioncollation' => $db->getConnectionCollation(),
'dbconnectionencryption' => $db->getConnectionEncryption(),
'dbconnencryptsupported' => $db->isConnectionEncryptionSupported(),
'phpversion' => PHP_VERSION,
'server' => $_SERVER['SERVER_SOFTWARE'] ?? getenv('SERVER_SOFTWARE'),
'sapi_name' => PHP_SAPI,
'version' => (new Version)->getLongVersion(),
'useragent' => $_SERVER['HTTP_USER_AGENT'] ?? '',
);

return $this->info;
Expand Down
16 changes: 16 additions & 0 deletions administrator/components/com_admin/tmpl/sysinfo/default_system.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,22 @@
<?php echo $this->info['dbconnectioncollation']; ?>
</td>
</tr>
<tr>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION'); ?>
</th>
<td>
<?php echo $this->info['dbconnectionencryption'] ?: Text::_('JNONE'); ?>
</td>
</tr>
<tr>
<th scope="row">
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED'); ?>
</th>
<td>
<?php echo $this->info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
</td>
</tr>
<tr>
<th scope="row">
<?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
Expand Down
77 changes: 77 additions & 0 deletions administrator/components/com_config/forms/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,83 @@
size="10"
/>

<field
name="dbencryption"
type="list"
label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL"
desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC"
default="0"
filter="integer"
>
<option value="0">COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE</option>
<option value="1">COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_ONE_WAY</option>
<option value="2">COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_TWO_WAY</option>
</field>

<field
name="dbsslverifyservercert"
type="radio"
label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL"
desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC"
class="switcher"
default="0"
filter="boolean"
showon="dbencryption:1,2"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>

<field
name="dbsslkey"
type="text"
label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL"
desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_DESC"
filter="string"
size="100"
showon="dbencryption:2"
/>

<field
name="dbsslcert"
type="text"
label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL"
desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC"
filter="string"
size="100"
showon="dbencryption:2"
/>

<field
name="dbsslca"
type="text"
label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL"
desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC"
filter="string"
size="100"
showon="dbencryption:2"
/>

<field
name="dbsslcapath"
type="text"
label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL"
desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC"
filter="string"
size="100"
showon="dbencryption:2"
/>

<field
name="dbsslcipher"
type="text"
label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL"
desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC"
filter="string"
size="100"
showon="dbencryption:2"
/>

</fieldset>

<fieldset
Expand Down
2 changes: 2 additions & 0 deletions administrator/language/en-GB/en-GB.com_admin.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ COM_ADMIN_CACHE_DIRECTORY="(Cache folder)"
COM_ADMIN_CONFIGURATION_FILE="Configuration File"
COM_ADMIN_DATABASE_COLLATION="Database Collation"
COM_ADMIN_DATABASE_CONNECTION_COLLATION="Database Connection Collation"
COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION="Database Connection Encryption"
COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED="Database Server Supports Connection Encryption"
COM_ADMIN_DATABASE_TYPE="Database Type"
COM_ADMIN_DATABASE_VERSION="Database Version"
COM_ADMIN_DIRECTORY="Folder"
Expand Down
17 changes: 17 additions & 0 deletions administrator/language/en-GB/en-GB.com_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,23 @@ COM_CONFIG_FIELD_CACHE_TIME_LABEL="Cache Time (minutes)"
COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Precede domain with '.' if cookie should be valid for all subdomains."
COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL="Cookie Domain"
COM_CONFIG_FIELD_COOKIE_PATH_LABEL="Cookie Path"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="..."
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="..."
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="..."
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="..."
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Connection Encryption desc..."
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="No encryption"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_ONE_WAY="One-way encryption"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_TWO_WAY="Two-way encryption"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_DESC="Private Key File desc..."
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC="Verify desc..."
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify"
COM_CONFIG_FIELD_DATABASE_HOST_LABEL="Host"
COM_CONFIG_FIELD_DATABASE_NAME_LABEL="Database Name"
COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL="Database Tables Prefix"
Expand Down
18 changes: 18 additions & 0 deletions libraries/src/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,24 @@ protected static function createDbo()

$options = array('driver' => $driver, 'host' => $host, 'user' => $user, 'password' => $password, 'database' => $database, 'prefix' => $prefix);

if ((int) $conf->get('dbencryption') !== 0)
{
$options['ssl'] = [
'enable' => true,
'verify_server_cert' => (bool) $conf->get('dbsslverifyservercert'),
];

foreach (['cipher', 'ca', 'capath', 'key', 'cert'] as $key => $value)
{
$confVal = trim($conf->get('dbssl' . $value, ''));

if ($confVal !== '')
{
$options['ssl'][$value] = $confVal;
}
}
}

try
{
$db = DatabaseDriver::getInstance($options);
Expand Down
18 changes: 18 additions & 0 deletions libraries/src/Service/Provider/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,24 @@ function (Container $container)
'prefix' => $conf->get('dbprefix'),
];

if ((int) $conf->get('dbencryption') !== 0)
{
$options['ssl'] = [
'enable' => true,
'verify_server_cert' => (bool) $conf->get('dbsslverifyservercert'),
];

foreach (['cipher', 'ca', 'capath', 'key', 'cert'] as $key => $value)
{
$confVal = trim($conf->get('dbssl' . $value, ''));

if ($confVal !== '')
{
$options['ssl'][$value] = $confVal;
}
}
}

// Enable utf8mb4 connections for mysql adapters
if (strtolower($dbtype) === 'mysqli')
{
Expand Down
2 changes: 2 additions & 0 deletions plugins/system/debug/DataCollector/InfoCollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ private function getDatabaseInfo(array $info): array
'dbversion' => $info['dbversion'] ?? '',
'dbcollation' => $info['dbcollation'] ?? '',
'dbconnectioncollation' => $info['dbconnectioncollation'] ?? '',
'dbconnectionencryption' => $info['dbconnectionencryption'] ?? '',
'dbconnencryptsupported' => $info['dbconnencryptsupported'] ?? '',
];
}
}