From 00c290e68d26656bafa3b3649f3dd7343d813a60 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Tue, 30 Oct 2018 10:54:39 +0200 Subject: [PATCH 1/4] Add TLS-over-SSH option to Connection dialog --- src/qml/ConnectionSettignsDialog.qml | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/qml/ConnectionSettignsDialog.qml b/src/qml/ConnectionSettignsDialog.qml index a4c803680..b7fc1257e 100644 --- a/src/qml/ConnectionSettignsDialog.qml +++ b/src/qml/ConnectionSettignsDialog.qml @@ -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 { @@ -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 @@ -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 (AWS ElastiCache Encryption in-transit)") + checked: root.settings ? root.settings.sslEnabled && root.sshEnabled : false + onCheckedChanged: root.settings.sslEnabled = checked } } } From 5deb3c7d9731a35593c4218836cb561013290511 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Wed, 31 Oct 2018 17:51:02 +0200 Subject: [PATCH 2/4] Allow precompiled qredisclient --- 3rdparty/3rdparty.pri | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/3rdparty/3rdparty.pri b/3rdparty/3rdparty.pri index 9e829e829..f13644e46 100644 --- a/3rdparty/3rdparty.pri +++ b/3rdparty/3rdparty.pri @@ -7,7 +7,18 @@ OTHER_FILES += $$PWD/../src/resources/qml/3rdparty/php-unserialize-js/phpUnserialize.js # qredisclient -include($$PWD/qredisclient/qredisclient.pri) +if(win32*):exists( $$PWD/qredisclient/qredisclient.lib ) { + message("Using prebuilt qredisclient") + INCLUDEPATH += $$PWD/qredisclient/src/ + LIBS += $$PWD/qredisclient/qredisclient.lib +} else:unix*:exists( $$PWD/qredisclient/libqredisclient.a ) { + message("Using prebuilt qredisclient") + INCLUDEPATH += $$PWD/qredisclient/src/ + LIBS += $$PWD/qredisclient/libqredisclient.a +} else { + include($$PWD/qredisclient/qredisclient.pri) +} + # Asyncfuture include($$PWD/asyncfuture/asyncfuture.pri) From a23961e1278b6b5ce47c30563375487739c2d16d Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Thu, 1 Nov 2018 17:11:08 +0200 Subject: [PATCH 3/4] Update 3rdparty.pri --- 3rdparty/3rdparty.pri | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/3rdparty/3rdparty.pri b/3rdparty/3rdparty.pri index f13644e46..82e5d1609 100644 --- a/3rdparty/3rdparty.pri +++ b/3rdparty/3rdparty.pri @@ -8,9 +8,10 @@ OTHER_FILES += $$PWD/../src/resources/qml/3rdparty/php-unserialize-js/phpUnseria # qredisclient if(win32*):exists( $$PWD/qredisclient/qredisclient.lib ) { - message("Using prebuilt qredisclient") - INCLUDEPATH += $$PWD/qredisclient/src/ - LIBS += $$PWD/qredisclient/qredisclient.lib + message("Using prebuilt qredisclient") + INCLUDEPATH += $$PWD/qredisclient/src/ + OPENSSL_LIB_PATH = C:\OpenSSL-Win32\lib\VC\static + LIBS += -L$$OPENSSL_LIB_PATH -llibeay32MD $$PWD/qredisclient/qredisclient.lib $$PWD/qredisclient/botan.lib } else:unix*:exists( $$PWD/qredisclient/libqredisclient.a ) { message("Using prebuilt qredisclient") INCLUDEPATH += $$PWD/qredisclient/src/ From 5ac60dc51543c3b9708a098fdfeac5fc2619074d Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Thu, 1 Nov 2018 17:18:13 +0200 Subject: [PATCH 4/4] Update 3rdparty.pri --- 3rdparty/3rdparty.pri | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/3rdparty/3rdparty.pri b/3rdparty/3rdparty.pri index 82e5d1609..c7263b9bb 100644 --- a/3rdparty/3rdparty.pri +++ b/3rdparty/3rdparty.pri @@ -11,7 +11,7 @@ if(win32*):exists( $$PWD/qredisclient/qredisclient.lib ) { message("Using prebuilt qredisclient") INCLUDEPATH += $$PWD/qredisclient/src/ OPENSSL_LIB_PATH = C:\OpenSSL-Win32\lib\VC\static - LIBS += -L$$OPENSSL_LIB_PATH -llibeay32MD $$PWD/qredisclient/qredisclient.lib $$PWD/qredisclient/botan.lib + LIBS += -L$$OPENSSL_LIB_PATH -llibeay32MD -L$$PWD/qredisclient/ -lqredisclient -lbotan -llibssh2 } else:unix*:exists( $$PWD/qredisclient/libqredisclient.a ) { message("Using prebuilt qredisclient") INCLUDEPATH += $$PWD/qredisclient/src/ @@ -20,7 +20,6 @@ if(win32*):exists( $$PWD/qredisclient/qredisclient.lib ) { include($$PWD/qredisclient/qredisclient.pri) } - # Asyncfuture include($$PWD/asyncfuture/asyncfuture.pri)