From 1eda812c9c4f444c03d97657e75f3db234e669b1 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 21 Sep 2019 23:22:03 +0200 Subject: [PATCH 01/34] Add tls transfer encryption for database connections --- .../com_admin/Model/SysinfoModel.php | 22 +++--- .../com_admin/tmpl/sysinfo/default_system.php | 16 ++++ .../com_config/forms/application.xml | 77 +++++++++++++++++++ .../language/en-GB/en-GB.com_admin.ini | 2 + .../language/en-GB/en-GB.com_config.ini | 17 ++++ libraries/src/Factory.php | 18 +++++ libraries/src/Service/Provider/Database.php | 18 +++++ .../debug/DataCollector/InfoCollector.php | 2 + 8 files changed, 162 insertions(+), 10 deletions(-) diff --git a/administrator/components/com_admin/Model/SysinfoModel.php b/administrator/components/com_admin/Model/SysinfoModel.php index 0bba09c258748..8d990a3bde648 100644 --- a/administrator/components/com_admin/Model/SysinfoModel.php +++ b/administrator/components/com_admin/Model/SysinfoModel.php @@ -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; diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_system.php b/administrator/components/com_admin/tmpl/sysinfo/default_system.php index b5b787cf6e576..91be5889302a6 100644 --- a/administrator/components/com_admin/tmpl/sysinfo/default_system.php +++ b/administrator/components/com_admin/tmpl/sysinfo/default_system.php @@ -71,6 +71,22 @@ info['dbconnectioncollation']; ?> + + + + + + info['dbconnectionencryption'] ?: Text::_('JNONE'); ?> + + + + + + + + info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?> + + diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index 3bd48543e20e8..97ebf8258837a 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -231,6 +231,83 @@ size="10" /> + + + + + + + + + + + + + + + + + + + + +
$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); diff --git a/libraries/src/Service/Provider/Database.php b/libraries/src/Service/Provider/Database.php index f1cb3299c3d36..31f97b9b730a3 100644 --- a/libraries/src/Service/Provider/Database.php +++ b/libraries/src/Service/Provider/Database.php @@ -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') { diff --git a/plugins/system/debug/DataCollector/InfoCollector.php b/plugins/system/debug/DataCollector/InfoCollector.php index d258b7df7a524..ec43c4565c100 100644 --- a/plugins/system/debug/DataCollector/InfoCollector.php +++ b/plugins/system/debug/DataCollector/InfoCollector.php @@ -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'] ?? '', ]; } } From a1b8f29d8e885c0ad1ef59ef383bba2b2da39e2b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 21 Sep 2019 23:44:22 +0200 Subject: [PATCH 02/34] Update composer.lock --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 71bde1b4795e1..9060998867d3d 100644 --- a/composer.lock +++ b/composer.lock @@ -758,12 +758,12 @@ "source": { "type": "git", "url": "https://github.com/joomla-framework/database.git", - "reference": "493ee1d08f28ff1f6a39369ce1099a504c0f5900" + "reference": "c5cd726fb6137dede3a0f141df4271df310a9568" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/database/zipball/493ee1d08f28ff1f6a39369ce1099a504c0f5900", - "reference": "493ee1d08f28ff1f6a39369ce1099a504c0f5900", + "url": "https://api.github.com/repos/joomla-framework/database/zipball/c5cd726fb6137dede3a0f141df4271df310a9568", + "reference": "c5cd726fb6137dede3a0f141df4271df310a9568", "shasum": "" }, "require": { @@ -815,7 +815,7 @@ "framework", "joomla" ], - "time": "2019-08-21T16:21:26+00:00" + "time": "2019-09-10T10:17:45+00:00" }, { "name": "joomla/di", From fb41bcc9faa3e405b7de2e51e2f4609442864695 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 22 Sep 2019 12:31:29 +0200 Subject: [PATCH 03/34] Better language strings 1 --- administrator/language/en-GB/en-GB.com_config.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 4375796d0dba5..b82c86cd1e092 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -44,13 +44,13 @@ COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of permissible cipher COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Data in transit encryption with TLS for database connections" 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_NONE="Default (server controlled)" 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="The server's private key file." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC="Verify the server certificate on client side." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify Server Certificate" COM_CONFIG_FIELD_DATABASE_HOST_LABEL="Host" COM_CONFIG_FIELD_DATABASE_NAME_LABEL="Database Name" COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL="Database Tables Prefix" From dcfc98bbb58221859f95fdb9588222ec57e315f3 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 22 Sep 2019 12:35:14 +0200 Subject: [PATCH 04/34] Update administrator/language/en-GB/en-GB.com_config.ini Co-Authored-By: Brian Teeman --- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index b82c86cd1e092..afa479d84ec10 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -34,7 +34,7 @@ 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="The full path of the Certificate Authority (CA) certificate file." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="The full path to the Certificate Authority (CA) certificate file." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="Path to Certificate Authority (CA) certificate files (MySQL only)." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" From 9fc96d500508eeecdfd9853bb56908baa80e73c3 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 22 Sep 2019 12:36:08 +0200 Subject: [PATCH 05/34] Update administrator/language/en-GB/en-GB.com_config.ini Co-Authored-By: Brian Teeman --- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index afa479d84ec10..ea1a428ae376d 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -42,7 +42,7 @@ COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="The server's certificate file." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of permissible ciphers for connection encryption as set on the server." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Data in transit encryption with TLS for database connections" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Data in transit encryption (with TLS for database connections)." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controlled)" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_ONE_WAY="One-way encryption" From 9cfa6726dd482782044cb5bdf41c5a6aa953db63 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Wed, 25 Sep 2019 20:58:36 +0200 Subject: [PATCH 06/34] Remove unused key from foreach --- libraries/src/Factory.php | 2 +- libraries/src/Service/Provider/Database.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php index 5ff02c873f09c..d7aaa84f01d4c 100644 --- a/libraries/src/Factory.php +++ b/libraries/src/Factory.php @@ -674,7 +674,7 @@ protected static function createDbo() 'verify_server_cert' => (bool) $conf->get('dbsslverifyservercert'), ]; - foreach (['cipher', 'ca', 'capath', 'key', 'cert'] as $key => $value) + foreach (['cipher', 'ca', 'capath', 'key', 'cert'] as $value) { $confVal = trim($conf->get('dbssl' . $value, '')); diff --git a/libraries/src/Service/Provider/Database.php b/libraries/src/Service/Provider/Database.php index 31f97b9b730a3..5fad50698e1fc 100644 --- a/libraries/src/Service/Provider/Database.php +++ b/libraries/src/Service/Provider/Database.php @@ -97,7 +97,7 @@ function (Container $container) 'verify_server_cert' => (bool) $conf->get('dbsslverifyservercert'), ]; - foreach (['cipher', 'ca', 'capath', 'key', 'cert'] as $key => $value) + foreach (['cipher', 'ca', 'capath', 'key', 'cert'] as $value) { $confVal = trim($conf->get('dbssl' . $value, '')); From 4f9d7fe1f1f0c6b2b2ddc4a9acdf1d7a9a528c77 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 5 Oct 2019 13:43:26 +0100 Subject: [PATCH 07/34] Need to check database connection on global configuration save If not checked here the connection error on save (for instance using a unix socket in "localhost") will not be captured which in put the site down until someone manualy changes the configuration.php file. --- .../com_config/Model/ApplicationModel.php | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_config/Model/ApplicationModel.php b/administrator/components/com_config/Model/ApplicationModel.php index 45fe7f673d8d7..fdf779f3b6766 100644 --- a/administrator/components/com_config/Model/ApplicationModel.php +++ b/administrator/components/com_config/Model/ApplicationModel.php @@ -130,9 +130,27 @@ public function save($data) 'user' => $data['user'], 'password' => $app->get('password'), 'database' => $data['db'], - 'prefix' => $data['dbprefix'] + 'prefix' => $data['dbprefix'], ); + if ((int) $data['dbencryption'] !== 0) + { + $options['ssl'] = [ + 'enable' => true, + 'verify_server_cert' => (bool) $data['dbsslverifyservercert'], + ]; + + foreach (['cipher', 'ca', 'capath', 'key', 'cert'] as $value) + { + $confVal = trim($data['dbssl' . $value]); + + if ($confVal !== '') + { + $options['ssl'][$value] = $confVal; + } + } + } + try { $revisedDbo = DatabaseDriver::getInstance($options); From 5e2a153b3c21aa63dff2a974551158501de975b4 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 5 Oct 2019 13:52:38 +0100 Subject: [PATCH 08/34] Add new global variables to installation config file --- installation/configuration.php-dist | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/installation/configuration.php-dist b/installation/configuration.php-dist index f9f2a57483503..dbaebecebe0fc 100644 --- a/installation/configuration.php-dist +++ b/installation/configuration.php-dist @@ -44,6 +44,13 @@ class JConfig public $password = ''; // DB password public $db = ''; // DB database name public $dbprefix = 'jos_'; // Do not change unless you need to! + public $dbencryption = 0; + public $dbsslverifyservercert = false; + public $dbsslkey = ''; + public $dbsslcert = ''; + public $dbsslca = ''; + public $dbsslcapath = ''; + public $dbsslcipher = ''; /* Server Settings */ public $secret = 'FBVtggIk5lAzEU9H'; // Change this to something more secure From a2b9ff1ad9a7f262e37731388eca377e3b22ab2f Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 5 Oct 2019 14:08:28 +0100 Subject: [PATCH 09/34] more usable error message --- administrator/components/com_config/Model/ApplicationModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_config/Model/ApplicationModel.php b/administrator/components/com_config/Model/ApplicationModel.php index fdf779f3b6766..3ebf6e6150905 100644 --- a/administrator/components/com_config/Model/ApplicationModel.php +++ b/administrator/components/com_config/Model/ApplicationModel.php @@ -158,7 +158,7 @@ public function save($data) } catch (\Exception $e) { - $app->enqueueMessage(Text::_('JLIB_DATABASE_ERROR_DATABASE_CONNECT'), 'error'); + $app->enqueueMessage(Text::sprintf('COM_CONFIG_ERROR_DATABASE_NOT_AVAILABLE', $e->getCode(), $e->getMessage()), 'error'); return false; } From c1b916cf898daf7f1e5b2bc60521ed4beb0eaa3b Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 5 Oct 2019 14:11:33 +0100 Subject: [PATCH 10/34] Update en-GB.com_config.ini --- administrator/language/en-GB/en-GB.com_config.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index ea1a428ae376d..73484ce729a07 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -20,6 +20,7 @@ COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE="Could not make configuration.p COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE="Could not make configuration.php writable." COM_CONFIG_ERROR_CUSTOM_CACHE_PATH_NOTWRITABLE_USING_DEFAULT="The folder at %1$s is not writable and cannot be used for the cache, using the default %2$s instead." COM_CONFIG_ERROR_CUSTOM_SESSION_FILESYSTEM_PATH_NOTWRITABLE_USING_DEFAULT="The folder at %s is not writable and cannot be used to store session data, the default PHP path will be used instead." +COM_CONFIG_ERROR_DATABASE_NOT_AVAILABLE="Database connection test failed with the following error: %s: %s
Database connection settings changes were not saved." COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND="The asset for global configuration could not be found. Permissions have not been saved." COM_CONFIG_ERROR_SSL_NOT_AVAILABLE="HTTPS has not been enabled as it is not available on this server. HTTPS connection test failed with the following error: %s" COM_CONFIG_ERROR_SSL_NOT_AVAILABLE_HTTP_CODE="HTTPS version of the site returned an invalid HTTP status code." From 7ad2ff5890ec36639cf7f53fd8cf8e17b3171ffa Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 5 Oct 2019 17:24:18 +0100 Subject: [PATCH 11/34] Get databaseConnectionEncryption value in module start --- .../mod_privacy_status/mod_privacy_status.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/administrator/modules/mod_privacy_status/mod_privacy_status.php b/administrator/modules/mod_privacy_status/mod_privacy_status.php index 42a411955a83e..b88193d25eac8 100644 --- a/administrator/modules/mod_privacy_status/mod_privacy_status.php +++ b/administrator/modules/mod_privacy_status/mod_privacy_status.php @@ -33,11 +33,12 @@ JLoader::register('ModPrivacyStatusHelper', __DIR__ . '/helper.php'); -$privacyPolicyInfo = ModPrivacyStatusHelper::getPrivacyPolicyInfo(); -$requestFormPublished = ModPrivacyStatusHelper::getRequestFormPublished(); -$privacyConsentPluginId = PrivacyHelper::getPrivacyConsentPluginId(); -$sendMailEnabled = (bool) Factory::getConfig()->get('mailonline', 1); -$numberOfUrgentRequests = ModPrivacyStatusHelper::getNumberUrgentRequests(); -$urgentRequestDays = (int) ComponentHelper::getParams('com_privacy')->get('notify', 14); +$privacyPolicyInfo = ModPrivacyStatusHelper::getPrivacyPolicyInfo(); +$requestFormPublished = ModPrivacyStatusHelper::getRequestFormPublished(); +$privacyConsentPluginId = PrivacyHelper::getPrivacyConsentPluginId(); +$sendMailEnabled = (bool) Factory::getConfig()->get('mailonline', 1); +$numberOfUrgentRequests = ModPrivacyStatusHelper::getNumberUrgentRequests(); +$urgentRequestDays = (int) ComponentHelper::getParams('com_privacy')->get('notify', 14); +$databaseConnectionEncryption = Factory::getContainer()->get('DatabaseDriver')->getConnectionEncryption(); require ModuleHelper::getLayoutPath('mod_privacy_status', $params->get('layout', 'default')); From 7d3992e6f805c04bcc713b0def6c08d241e35ee5 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 5 Oct 2019 17:25:28 +0100 Subject: [PATCH 12/34] Add a new line showing the database connection encryption status --- .../mod_privacy_status/tmpl/default.php | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/administrator/modules/mod_privacy_status/tmpl/default.php b/administrator/modules/mod_privacy_status/tmpl/default.php index a0f4bf1f34928..911dd8bdc5df3 100644 --- a/administrator/modules/mod_privacy_status/tmpl/default.php +++ b/administrator/modules/mod_privacy_status/tmpl/default.php @@ -120,5 +120,27 @@ + + + + + + + + + + + + + + + + + + + + + + From af31ed7db7e02b4e0316c82a1bd26826095ab3af Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 5 Oct 2019 17:25:57 +0100 Subject: [PATCH 13/34] Add the language variables --- administrator/language/en-GB/en-GB.mod_privacy_status.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/administrator/language/en-GB/en-GB.mod_privacy_status.ini b/administrator/language/en-GB/en-GB.mod_privacy_status.ini index 3c9d56599dcd8..bc2dda8fcdffb 100644 --- a/administrator/language/en-GB/en-GB.mod_privacy_status.ini +++ b/administrator/language/en-GB/en-GB.mod_privacy_status.ini @@ -4,4 +4,6 @@ ; Note : All ini files need to be saved as UTF-8 MOD_PRIVACY_STATUS="Privacy Status Check" +MOD_PRIVACY_STATUS_CHECK_DATABASE_CONNECTION_ENCRYPTION_DISABLED="Database connection encryption is not enabled." +MOD_PRIVACY_STATUS_CHECK_DATABASE_CONNECTION_ENCRYPTION_ENABLED="Database connection encryption is enabled.
Encrypting all database connections with %s" MOD_PRIVACY_STATUS_XML_DESCRIPTION="The Privacy Status Check Module shows information about your sites privacy status." From a70adf7cfd4936b4c8abf490c249c86b67f192be Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 5 Oct 2019 20:11:16 +0200 Subject: [PATCH 14/34] CS --- .../mod_privacy_status/tmpl/default.php | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/administrator/modules/mod_privacy_status/tmpl/default.php b/administrator/modules/mod_privacy_status/tmpl/default.php index 911dd8bdc5df3..7a6c7889090ee 100644 --- a/administrator/modules/mod_privacy_status/tmpl/default.php +++ b/administrator/modules/mod_privacy_status/tmpl/default.php @@ -24,19 +24,19 @@ - - - + + + - - - + + + - - - + + + @@ -53,19 +53,19 @@ - - - + + + - - - + + + - - - + + + @@ -105,7 +105,7 @@ - + @@ -128,7 +128,7 @@ - + From 9b21dadedcdc8e6c82f4fa1461c7a8af71b5d647 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 12 Oct 2019 13:21:06 +0100 Subject: [PATCH 15/34] language clarifications --- administrator/language/en-GB/en-GB.com_config.ini | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index f84bb819060af..8edc69da65d09 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -36,20 +36,25 @@ 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="The full path to the Certificate Authority (CA) certificate file." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="The absolute file path to the Certificate Authority (CA) base64 encoded certificates files." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT="/etc/pki/tls/certs/ca-bundle.crt" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="Path to Certificate Authority (CA) certificate files (MySQL only)." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="The full path to Certificate Authority (CA) base64 encoded certificate files (MySQL only). Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_HINT="/etc/pki/tls/certs/" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="The server's certificate file." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="The absolute file path to the database client (Joomla server) base64 encoded certificate file (including intermediate certification authorities if applicable)." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_HINT="/etc/pki/tls/certs/my-client-certificate.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of permissible ciphers for connection encryption as set on the server." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client (Joomla server) allows to use for connection encryption." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_HINT="EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES+EDH" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Data in transit encryption (with TLS for database connections)." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controlled)" 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="The server's private key file." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_DESC="The absolute file path to the database client (Joomla server) base64 encoded private key file." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_HINT="/etc/pki/tls/private/my-client-cert.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC="Verify the server certificate on client side." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify Server Certificate" From df002775ba87a4b79745fd09524b2fce3a2da3b6 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 12 Oct 2019 13:24:53 +0100 Subject: [PATCH 16/34] hints and allow more characters --- .../components/com_config/forms/application.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index 97ebf8258837a..b178239648d99 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -263,8 +263,9 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_DESC" + hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_HINT" filter="string" - size="100" + size="250" showon="dbencryption:2" /> @@ -273,8 +274,9 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC" + hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_HINT" filter="string" - size="100" + size="250" showon="dbencryption:2" /> @@ -283,8 +285,9 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC" + hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT" filter="string" - size="100" + size="250" showon="dbencryption:2" /> @@ -293,8 +296,9 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC" + hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_HINT" filter="string" - size="100" + size="250" showon="dbencryption:2" /> @@ -303,8 +307,9 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC" + hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_HINT" filter="string" - size="100" + size="300" showon="dbencryption:2" /> From be6c19b9990750124e87b59871dde79527a49215 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 12 Oct 2019 13:40:05 +0100 Subject: [PATCH 17/34] Need to save in install configuation.php (on install) the new default global config values --- installation/src/Model/ConfigurationModel.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/installation/src/Model/ConfigurationModel.php b/installation/src/Model/ConfigurationModel.php index 2e582919d359d..aa3ee8db9639e 100644 --- a/installation/src/Model/ConfigurationModel.php +++ b/installation/src/Model/ConfigurationModel.php @@ -133,6 +133,13 @@ public function createConfiguration($options) $registry->set('password', $options->db_pass_plain); $registry->set('db', $options->db_name); $registry->set('dbprefix', $options->db_prefix); + $registry->set('dbencryption', 0); + $registry->set('dbsslverifyservercert', 0); + $registry->set('dbsslkey', ''); + $registry->set('dbsslcert', ''); + $registry->set('dbsslca', ''); + $registry->set('dbsslcapath', ''); + $registry->set('dbsslcipher', ''); // Server settings. $registry->set('live_site', ''); From 8c6ded9287b235b9d9fc1b2f1ae98d0778c97d71 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 12 Oct 2019 13:52:42 +0100 Subject: [PATCH 18/34] corrections --- administrator/language/en-GB/en-GB.com_config.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 8edc69da65d09..8f27f8363c724 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -37,16 +37,16 @@ COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Precede domain with '.' if cookie should be COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL="Cookie Domain" COM_CONFIG_FIELD_COOKIE_PATH_LABEL="Cookie Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="The absolute file path to the Certificate Authority (CA) base64 encoded certificates files." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT="/etc/pki/tls/certs/ca-bundle.crt" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT="ex: /etc/pki/tls/certs/ca-bundle.crt" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="The full path to Certificate Authority (CA) base64 encoded certificate files (MySQL only). Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_HINT="/etc/pki/tls/certs/" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_HINT="ex: /etc/pki/tls/certs/" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="The absolute file path to the database client (Joomla server) base64 encoded certificate file (including intermediate certification authorities if applicable)." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_HINT="/etc/pki/tls/certs/my-client-certificate.pem" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_HINT="ex: /etc/pki/tls/certs/my-client-certificate.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client (Joomla server) allows to use for connection encryption." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_HINT="EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES+EDH" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_HINT="ex: EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES+EDH" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Data in transit encryption (with TLS for database connections)." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption" @@ -54,7 +54,7 @@ COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controll 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="The absolute file path to the database client (Joomla server) base64 encoded private key file." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_HINT="/etc/pki/tls/private/my-client-cert.pem" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_HINT="ex: /etc/pki/tls/private/my-client-private-key.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC="Verify the server certificate on client side." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify Server Certificate" From 11c42e2140328c224f5a306e08f7ff0a7f549cd9 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 12 Oct 2019 17:08:25 +0100 Subject: [PATCH 19/34] correct minor bug and put more friendly client certificates example path that doesn't need special permissions (open_basedir, user/group permissions) for php to access it --- administrator/language/en-GB/en-GB.com_config.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 8f27f8363c724..12d9f0e82649d 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -37,16 +37,16 @@ COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Precede domain with '.' if cookie should be COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL="Cookie Domain" COM_CONFIG_FIELD_COOKIE_PATH_LABEL="Cookie Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="The absolute file path to the Certificate Authority (CA) base64 encoded certificates files." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT="ex: /etc/pki/tls/certs/ca-bundle.crt" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT="ex: /path/to/joomla/site/administrator/tls/ca/ca.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="The full path to Certificate Authority (CA) base64 encoded certificate files (MySQL only). Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_HINT="ex: /etc/pki/tls/certs/" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_HINT="ex: /path/to/joomla/site/administrator/tls/ca/" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="The absolute file path to the database client (Joomla server) base64 encoded certificate file (including intermediate certification authorities if applicable)." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_HINT="ex: /etc/pki/tls/certs/my-client-certificate.pem" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_HINT="ex: /path/to/joomla/site/administrator/tls/certs/my-client-certificate.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client (Joomla server) allows to use for connection encryption." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_HINT="ex: EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES+EDH" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_HINT="ex: EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Data in transit encryption (with TLS for database connections)." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption" @@ -54,7 +54,7 @@ COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controll 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="The absolute file path to the database client (Joomla server) base64 encoded private key file." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_HINT="ex: /etc/pki/tls/private/my-client-private-key.pem" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_HINT="ex: /path/to/joomla/site/administrator/tls/private/my-client-private-key.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC="Verify the server certificate on client side." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify Server Certificate" From fea7da4031584bef4d2ebaeb919112152968e949 Mon Sep 17 00:00:00 2001 From: andrepereiradasilva Date: Sat, 12 Oct 2019 17:10:27 +0100 Subject: [PATCH 20/34] Update en-GB.com_config.ini --- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 12d9f0e82649d..117da20d27eca 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -37,7 +37,7 @@ COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Precede domain with '.' if cookie should be COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL="Cookie Domain" COM_CONFIG_FIELD_COOKIE_PATH_LABEL="Cookie Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="The absolute file path to the Certificate Authority (CA) base64 encoded certificates files." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT="ex: /path/to/joomla/site/administrator/tls/ca/ca.pem" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT="ex: /path/to/joomla/site/administrator/tls/ca/my-client-certificate-ca.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="The full path to Certificate Authority (CA) base64 encoded certificate files (MySQL only). Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_HINT="ex: /path/to/joomla/site/administrator/tls/ca/" From 254d6c9c1bd73b4a240d368f05f6a26e6024f115 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 20:57:44 +0200 Subject: [PATCH 21/34] Update administrator/language/en-GB/en-GB.com_config.ini Co-Authored-By: Brian Teeman --- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 117da20d27eca..2443e17db9d8b 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -45,7 +45,7 @@ COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="The absolute file path to the database client (Joomla server) base64 encoded certificate file (including intermediate certification authorities if applicable)." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_HINT="ex: /path/to/joomla/site/administrator/tls/certs/my-client-certificate.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client (Joomla server) allows to use for connection encryption." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client supports." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_HINT="ex: EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Data in transit encryption (with TLS for database connections)." From 3a499e92f7e971541161b58382a4f2ab33792765 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 20:58:07 +0200 Subject: [PATCH 22/34] Update administrator/language/en-GB/en-GB.com_config.ini Co-Authored-By: Brian Teeman --- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 2443e17db9d8b..487e0100e839c 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -53,7 +53,7 @@ COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controlled)" 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="The absolute file path to the database client (Joomla server) base64 encoded private key file." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_DESC="The absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_HINT="ex: /path/to/joomla/site/administrator/tls/private/my-client-private-key.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC="Verify the server certificate on client side." From 16854d9a0c0d47d4301971420dd07ada352b3781 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 21:21:09 +0200 Subject: [PATCH 23/34] One CA key file only. --- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 487e0100e839c..ad829001b5212 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -36,7 +36,7 @@ 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="The absolute file path to the Certificate Authority (CA) base64 encoded certificates files." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="The absolute file path to the Certificate Authority (CA) base64 encoded certificates file." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT="ex: /path/to/joomla/site/administrator/tls/ca/my-client-certificate-ca.pem" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="The full path to Certificate Authority (CA) base64 encoded certificate files (MySQL only). Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." From 3e3765bc36c44ed4bcab24db697d2bcd16df67a3 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 21:33:07 +0200 Subject: [PATCH 24/34] Remove hints and move into to descriptions + correct some texts --- .../components/com_config/forms/application.xml | 5 ----- administrator/language/en-GB/en-GB.com_config.ini | 15 +++++---------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index b178239648d99..0ab2efce3fea6 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -263,7 +263,6 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_DESC" - hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_HINT" filter="string" size="250" showon="dbencryption:2" @@ -274,7 +273,6 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC" - hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_HINT" filter="string" size="250" showon="dbencryption:2" @@ -285,7 +283,6 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC" - hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT" filter="string" size="250" showon="dbencryption:2" @@ -296,7 +293,6 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC" - hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_HINT" filter="string" size="250" showon="dbencryption:2" @@ -307,7 +303,6 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL" desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC" - hint="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_HINT" filter="string" size="300" showon="dbencryption:2" diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index ad829001b5212..3de2e18225f01 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -36,25 +36,20 @@ 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="The absolute file path to the Certificate Authority (CA) base64 encoded certificates file." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_HINT="ex: /path/to/joomla/site/administrator/tls/ca/my-client-certificate-ca.pem" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="The absolute file path to the Certificate Authority (CA) base64 encoded certificates file, eg 'ex: /path/to/joomla/site/administrator/tls/ca/my-client-certificate-ca.pem'." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="The full path to Certificate Authority (CA) base64 encoded certificate files (MySQL only). Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_HINT="ex: /path/to/joomla/site/administrator/tls/ca/" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="The full path to Certificate Authority (CA) base64 encoded certificate files (MySQL only), eg '/path/to/joomla/site/administrator/tls/ca/'. Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="The absolute file path to the database client (Joomla server) base64 encoded certificate file (including intermediate certification authorities if applicable)." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_HINT="ex: /path/to/joomla/site/administrator/tls/certs/my-client-certificate.pem" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="The absolute file path to the database client's base64 encoded certificate file, eg '/path/to/joomla/site/administrator/tls/certs/my-client-certificate.pem', including any intermediate CA's certificates if used." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client supports." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_HINT="ex: EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client supports, eg 'EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES'." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Data in transit encryption (with TLS for database connections)." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controlled)" 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="The absolute file path." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_HINT="ex: /path/to/joomla/site/administrator/tls/private/my-client-private-key.pem" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_DESC="The absolute file path to the database client's. private key file, eg '/path/to/joomla/site/administrator/tls/private/my-client-private-key.pem'." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC="Verify the server certificate on client side." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify Server Certificate" From 045c933065d4499d08d052f76fe8db398ee8016b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 22:00:51 +0200 Subject: [PATCH 25/34] Update ConfigurationModel.php --- installation/src/Model/ConfigurationModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/src/Model/ConfigurationModel.php b/installation/src/Model/ConfigurationModel.php index aa3ee8db9639e..3d1e33a51d532 100644 --- a/installation/src/Model/ConfigurationModel.php +++ b/installation/src/Model/ConfigurationModel.php @@ -133,8 +133,8 @@ public function createConfiguration($options) $registry->set('password', $options->db_pass_plain); $registry->set('db', $options->db_name); $registry->set('dbprefix', $options->db_prefix); - $registry->set('dbencryption', 0); - $registry->set('dbsslverifyservercert', 0); + $registry->set('dbencryption', false); + $registry->set('dbsslverifyservercert', false); $registry->set('dbsslkey', ''); $registry->set('dbsslcert', ''); $registry->set('dbsslca', ''); From e37b45bfc5e8066c9a505a0c497781749a7c665b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 22:04:35 +0200 Subject: [PATCH 26/34] Grr --- installation/src/Model/ConfigurationModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation/src/Model/ConfigurationModel.php b/installation/src/Model/ConfigurationModel.php index 3d1e33a51d532..c84655021981b 100644 --- a/installation/src/Model/ConfigurationModel.php +++ b/installation/src/Model/ConfigurationModel.php @@ -133,7 +133,7 @@ public function createConfiguration($options) $registry->set('password', $options->db_pass_plain); $registry->set('db', $options->db_name); $registry->set('dbprefix', $options->db_prefix); - $registry->set('dbencryption', false); + $registry->set('dbencryption', 0); $registry->set('dbsslverifyservercert', false); $registry->set('dbsslkey', ''); $registry->set('dbsslcert', ''); From 80a9876dbf966277495adf0a7995860fef403dc6 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 22:32:12 +0200 Subject: [PATCH 27/34] Simplify language strings and remove some obsolete ones --- .../components/com_config/forms/application.xml | 1 - administrator/language/en-GB/en-GB.com_config.ini | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index 0ab2efce3fea6..b67b1c0744bdd 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -235,7 +235,6 @@ name="dbencryption" type="list" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL" - desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC" default="0" filter="integer" > diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 3de2e18225f01..fcdb84355266d 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -36,20 +36,19 @@ 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="The absolute file path to the Certificate Authority (CA) base64 encoded certificates file, eg 'ex: /path/to/joomla/site/administrator/tls/ca/my-client-certificate-ca.pem'." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="The full path to Certificate Authority (CA) base64 encoded certificate files (MySQL only), eg '/path/to/joomla/site/administrator/tls/ca/'. Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="Absolute path (MySQL only). Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="The absolute file path to the database client's base64 encoded certificate file, eg '/path/to/joomla/site/administrator/tls/certs/my-client-certificate.pem', including any intermediate CA's certificates if used." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client supports, eg 'EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES'." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client supports eg 'EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES'." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_DESC="Data in transit encryption (with TLS for database connections)." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controlled)" 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="The absolute file path to the database client's. private key file, eg '/path/to/joomla/site/administrator/tls/private/my-client-private-key.pem'." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_DESC="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC="Verify the server certificate on client side." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify Server Certificate" From a3d0d6921f40e7f3c7db822a5b32d83f222ef7f8 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 22:33:46 +0200 Subject: [PATCH 28/34] Simplify another one --- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index fcdb84355266d..9e06dc2b38467 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -42,7 +42,7 @@ COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="Absolute path (MySQL only). Le COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="The list of ciphers the database client supports eg 'EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES'." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="Supported ciphers eg 'EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES'." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controlled)" From 67fadb049ea0f6b0da4242aa111977ca468fb42d Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 22:43:02 +0200 Subject: [PATCH 29/34] Remove another not needed description --- administrator/components/com_config/forms/application.xml | 1 - administrator/language/en-GB/en-GB.com_config.ini | 1 - 2 files changed, 2 deletions(-) diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index b67b1c0744bdd..aeae4d0d7e414 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -247,7 +247,6 @@ 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" diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 9e06dc2b38467..7b903edae129a 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -50,7 +50,6 @@ 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="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_DESC="Verify the server certificate on client side." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify Server Certificate" COM_CONFIG_FIELD_DATABASE_HOST_LABEL="Host" COM_CONFIG_FIELD_DATABASE_NAME_LABEL="Database Name" From 68c573f21f224b50f093e7be509097f0518fdefa Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 23:01:00 +0200 Subject: [PATCH 30/34] Display CA path only if MySQL --- administrator/components/com_config/forms/application.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index aeae4d0d7e414..2ad90be5efead 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -293,7 +293,7 @@ desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC" filter="string" size="250" - showon="dbencryption:2" + showon="databaseconnection:mysql,mysqli[AND]dbencryption:2" /> Date: Sun, 13 Oct 2019 23:07:55 +0200 Subject: [PATCH 31/34] Correct showon and text for MySQL only fields --- administrator/components/com_config/forms/application.xml | 4 ++-- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index 2ad90be5efead..e00bdbc926090 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -293,7 +293,7 @@ desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC" filter="string" size="250" - showon="databaseconnection:mysql,mysqli[AND]dbencryption:2" + showon="dbtype:mysql,mysqli[AND]dbencryption:2" />
diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 7b903edae129a..6db5c7023d388 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -38,7 +38,7 @@ COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL="Cookie Domain" COM_CONFIG_FIELD_COOKIE_PATH_LABEL="Cookie Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="Absolute path (MySQL only). Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="Absolute path. Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" From 80a78c4618e91e2060b310ed20dbfb06cfc00f23 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 13 Oct 2019 23:20:38 +0200 Subject: [PATCH 32/34] Update administrator/language/en-GB/en-GB.com_config.ini Co-Authored-By: Brian Teeman --- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 6db5c7023d388..36ccf05fe3529 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -38,7 +38,7 @@ COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL="Cookie Domain" COM_CONFIG_FIELD_COOKIE_PATH_LABEL="Cookie Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="Absolute path. Leave it empty if \"CA File\" already have all the CA certificates needed to validate the chain of trust." +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="Absolute file path." COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" From 197f06d9020c0312a082631144e3a0bf55430281 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 14 Oct 2019 20:22:25 +0200 Subject: [PATCH 33/34] Drop useless descriptions and shorten label texts --- .../components/com_config/forms/application.xml | 5 ----- administrator/language/en-GB/en-GB.com_config.ini | 15 +++++---------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml index e00bdbc926090..d0e14ba0e3a11 100644 --- a/administrator/components/com_config/forms/application.xml +++ b/administrator/components/com_config/forms/application.xml @@ -260,7 +260,6 @@ name="dbsslkey" type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL" - desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_DESC" filter="string" size="250" showon="dbencryption:2" @@ -270,7 +269,6 @@ name="dbsslcert" type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL" - desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC" filter="string" size="250" showon="dbencryption:2" @@ -280,7 +278,6 @@ name="dbsslca" type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL" - desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_DESC" filter="string" size="250" showon="dbencryption:2" @@ -290,7 +287,6 @@ name="dbsslcapath" type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL" - desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC" filter="string" size="250" showon="dbtype:mysql,mysqli[AND]dbencryption:2" @@ -300,7 +296,6 @@ name="dbsslcipher" type="text" label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL" - desc="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC" filter="string" size="300" showon="dbtype:mysql,mysqli[AND]dbencryption:2" diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 36ccf05fe3529..68d8686014e54 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -36,20 +36,15 @@ 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="Absolute file path." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="CA File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_DESC="Absolute file path." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="CA Path" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_DESC="Absolute file path." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Certificate File" -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_DESC="Supported ciphers eg 'EECDH+AESGCM:EDH+AESGCM:EECDH+AES:EDH+AES'." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="Path to CA File" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL="Path to CA Folder" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Path to Certificate File" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Supported Cipher Suite" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controlled)" 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="Absolute file path." -COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Private Key File" +COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Path to Private Key File" COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify Server Certificate" COM_CONFIG_FIELD_DATABASE_HOST_LABEL="Host" COM_CONFIG_FIELD_DATABASE_NAME_LABEL="Database Name" From dc3244034206b2c63ffc08fe41e594a5ceb0b01a Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 14 Oct 2019 22:21:55 +0200 Subject: [PATCH 34/34] Fix language text for HTML5 --- administrator/language/en-GB/en-GB.com_config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 68d8686014e54..46deacc832279 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -20,7 +20,7 @@ COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE="Could not make configuration.p COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE="Could not make configuration.php writable." COM_CONFIG_ERROR_CUSTOM_CACHE_PATH_NOTWRITABLE_USING_DEFAULT="The folder at %1$s is not writable and cannot be used for the cache, using the default %2$s instead." COM_CONFIG_ERROR_CUSTOM_SESSION_FILESYSTEM_PATH_NOTWRITABLE_USING_DEFAULT="The folder at %s is not writable and cannot be used to store session data, the default PHP path will be used instead." -COM_CONFIG_ERROR_DATABASE_NOT_AVAILABLE="Database connection test failed with the following error: %s: %s
Database connection settings changes were not saved." +COM_CONFIG_ERROR_DATABASE_NOT_AVAILABLE="Database connection test failed with the following error: %s: %s
Database connection settings changes were not saved." COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND="The asset for global configuration could not be found. Permissions have not been saved." COM_CONFIG_ERROR_SSL_NOT_AVAILABLE="HTTPS has not been enabled as it is not available on this server. HTTPS connection test failed with the following error: %s" COM_CONFIG_ERROR_SSL_NOT_AVAILABLE_HTTP_CODE="HTTPS version of the site returned an invalid HTTP status code."