Skip to content
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

Jump to bottom

Add TLS-over-SSH option to Connection dialog #4279

Closed
wants to merge 1 commit into from
Closed

Add TLS-over-SSH option to Connection dialog #4279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 22 additions & 5 deletions src/qml/ConnectionSettignsDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,19 +138,26 @@ Dialog {

Tab {
id: mainTab
anchors.fill: parent
anchors.margins: 10
title: qsTranslate("RDM","Connection Settings")

ScrollView {
ColumnLayout {
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: PlatformUtils.isOSX()? 5 : 10
id: mainSettingsScrollView
width: settingsTabs.width - 20
height: settingsTabs.height

ColumnLayout {
width: mainSettingsScrollView.width
height: children.height

SettingsGroupTitle { text: qsTranslate("RDM","Main Settings") }

GridLayout {
columns: 2

Layout.fillWidth: true

Label { text: qsTranslate("RDM","Name:") }

TextField {
Expand Down Expand Up @@ -202,7 +209,7 @@ Dialog {
id: sslRadioButton
Layout.columnSpan: 2
text: qsTranslate("RDM","SSL")
checked: root.settings ? root.settings.sslEnabled : false
checked: root.settings ? root.settings.sslEnabled && !root.sshEnabled : false
Component.onCompleted: root.sslEnabled = Qt.binding(function() { return sslRadioButton.checked })
onCheckedChanged: {
root.settings.sslEnabled = checked
Expand Down Expand Up @@ -358,6 +365,16 @@ Dialog {
text: root.settings ? root.settings.sshPassword : ""
onTextChanged: root.settings.sshPassword = text
}
}

BetterCheckbox {
id: sshTLSoverSSHCheckbox
objectName: "rdm_connection_security_ssh_tls_over_ssh"
Layout.fillWidth: true
Layout.columnSpan: 2
text: qsTranslate("RDM","Enable TLS-over-SSH (<b>AWS ElastiCache</b> <b>Encryption in-transit</b>)")
checked: root.settings ? root.settings.sslEnabled && root.sshEnabled : false
onCheckedChanged: root.settings.sslEnabled = checked
}
}
}
Expand Down