Skip to content

[4.0] TLS encryption for database connections: Correct language texts and showon for fields #27320

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

Closed
richard67 wants to merge 6 commits into from
Closed

[4.0] TLS encryption for database connections: Correct language texts and showon for fields #27320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aacd8bd
Change showon for dbsslca and dbsslcapath in application.xml
richard67 Dec 1, 2019
4185e83
Merge remote-tracking branch 'upstream/4.0-dev' into 4.0-dev-tls-encr…
richard67 Dec 15, 2019
768c1e4
Merge remote-tracking branch 'upstream/4.0-dev' into 4.0-dev-tls-encr…
richard67 Dec 18, 2019
a4a0285
Change language texts for one way and two way TLS
richard67 Dec 18, 2019
3d997af
Merge remote-tracking branch 'upstream/4.0-dev' into 4.0-dev-tls-encr…
richard67 Dec 19, 2019
bb87402
Merge branch '4.0-dev' into 4.0-dev-tls-encrypt-db-connections-mod-1
richard67 Dec 19, 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
4 changes: 2 additions & 2 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 @@ -282,7 +282,7 @@
label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL"
filter="string"
size="250"
showon="host!:localhost[AND]dbencryption:2"
showon="host!:localhost[AND]dbencryption:1,2[AND]dbsslverifyservercert:1"
/>

<field
Expand All @@ -291,7 +291,7 @@
label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL"
filter="string"
size="250"
showon="host!:localhost[AND]dbtype:mysql,mysqli[AND]dbencryption:2"
showon="host!:localhost[AND]dbtype:mysql,mysqli[AND]dbencryption:1,2[AND]dbsslverifyservercert:1"
/>

<field
Expand Down
4 changes: 2 additions & 2 deletions administrator/language/en-GB/com_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ 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_ENABLE_VALUE_ONE_WAY="One-way authentication"
Copy link
Contributor

@brianteeman brianteeman Dec 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as this is a new string and you are changing the value to authentication then it would be good to update the constant as well

Copy link
Member Author

@richard67 richard67 Dec 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How you mean to change it? COM_CONFIG_FIELD_DATABASE_AUTHENTICATION_ENABLE_VALUE_ONE_WAY would be wrong, because all the fields with names starting with COM_CONFIG_FIELD_DATABASE_ENCRYPTION belong to the same feature, which is well described with that name prefix.

Copy link
Member Author

@richard67 richard67 Dec 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or how else do you mean it should be changed? I don't understand yet.

Copy link
Contributor

@brianteeman brianteeman Dec 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes that was what I was suggesting

Copy link
Member Author

@richard67 richard67 Dec 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well COM_CONFIG_FIELD_DATABASE_AUTHENTICATION_ENABLE_VALUE_ONE_WAY would be wrong, because it reads as if it would be related to authentication to database in general, but it is only relevant for connection encryption.

What could make sense would be to change the texts COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE... to COM_CONFIG_FIELD_DATABASE_ENCRYPTION_MODE..., or something like that, that would fit more to the values ("Default (server controlled)", "One-way authentication" and "Two-way authentication". The "ENABLE" is a bit misleading and has historically grown when that feadutre was developed by @andrepereiradasilva .

Should I change them to COM_CONFIG_FIELD_DATABASE_ENCRYPTION_MODE...?

Copy link
Member Author

@richard67 richard67 Dec 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brianteeman Please check my comment above. To make it perfect I could change COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL to COM_CONFIG_FIELD_DATABASE_ENCRYPTION_MODE_LABEL, COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE to COM_CONFIG_FIELD_DATABASE_ENCRYPTION_MODE_VALUE_DEFAULT, COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_ONE_WAY to COM_CONFIG_FIELD_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY and COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_TWO_WAY to COM_CONFIG_FIELD_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY.

Let me know your opinion and what you suggest, but your original suggestion was not good in my opinion.

Copy link
Member Author

@richard67 richard67 Dec 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or we leave text names like they are.

COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_TWO_WAY="Two-way authentication"
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"
Expand Down