Skip to content
Snippets Groups Projects
Unverified Commit 9b1a6e47 authored by Antoine Noreau's avatar Antoine Noreau Committed by Sébastien Blin
Browse files

sip: fix incoming TLS calls by disabling secure dialog

Change-Id: I8925ba8d4cd29978efc700aa43c6e5acc7980365
parent 40672bb6
Branches
Tags
No related merge requests found
...@@ -115,6 +115,7 @@ Item { ...@@ -115,6 +115,7 @@ Item {
property string verifyCertificatesServer: qsTr("Verify certificates for incoming TLS connections") property string verifyCertificatesServer: qsTr("Verify certificates for incoming TLS connections")
property string verifyCertificatesClient: qsTr("Verify server TLS certificates") property string verifyCertificatesClient: qsTr("Verify server TLS certificates")
property string tlsRequireConnections: qsTr("Require certificate for incoming TLS connections") property string tlsRequireConnections: qsTr("Require certificate for incoming TLS connections")
property string disableSecureDlgCheck: qsTr("Disable secure dialog check for incoming TLS data")
property string tlsProtocol: qsTr("TLS protocol method") property string tlsProtocol: qsTr("TLS protocol method")
property string audioDeviceSelector: qsTr("Audio input device selector") property string audioDeviceSelector: qsTr("Audio input device selector")
property string tlsServerName: qsTr("TLS server name") property string tlsServerName: qsTr("TLS server name")
......
...@@ -141,6 +141,7 @@ CurrentAccount::updateData() ...@@ -141,6 +141,7 @@ CurrentAccount::updateData()
set_verifyServerTLS(accConfig.TLS.verifyServer, true); set_verifyServerTLS(accConfig.TLS.verifyServer, true);
set_verifyClientTLS(accConfig.TLS.verifyClient, true); set_verifyClientTLS(accConfig.TLS.verifyClient, true);
set_requireClientCertificateTLS(accConfig.TLS.requireClientCertificate, true); set_requireClientCertificateTLS(accConfig.TLS.requireClientCertificate, true);
set_disableSecureDlgCheckTLS(accConfig.TLS.disableSecureDlgCheck, true);
set_certificateListFileTLS(accConfig.TLS.certificateListFile, true); set_certificateListFileTLS(accConfig.TLS.certificateListFile, true);
set_certificateFileTLS(accConfig.TLS.certificateFile, true); set_certificateFileTLS(accConfig.TLS.certificateFile, true);
set_privateKeyFileTLS(accConfig.TLS.privateKeyFile, true); set_privateKeyFileTLS(accConfig.TLS.privateKeyFile, true);
......
...@@ -148,6 +148,7 @@ class CurrentAccount final : public QObject ...@@ -148,6 +148,7 @@ class CurrentAccount final : public QObject
QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(bool, verifyServer, TLS) QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(bool, verifyServer, TLS)
QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(bool, verifyClient, TLS) QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(bool, verifyClient, TLS)
QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(bool, requireClientCertificate, TLS) QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(bool, requireClientCertificate, TLS)
QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(bool, disableSecureDlgCheck, TLS)
QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(QString, certificateListFile, TLS) QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(QString, certificateListFile, TLS)
QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(QString, certificateFile, TLS) QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(QString, certificateFile, TLS)
QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(QString, privateKeyFile, TLS) QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(QString, privateKeyFile, TLS)
......
...@@ -247,6 +247,17 @@ ColumnLayout { ...@@ -247,6 +247,17 @@ ColumnLayout {
onSwitchToggled: CurrentAccount.requireClientCertificate_TLS = checked onSwitchToggled: CurrentAccount.requireClientCertificate_TLS = checked
} }
ToggleSwitch {
id: disableSecureDlgCheckToggle
labelText: JamiStrings.disableSecureDlgCheck
fontPointSize: JamiTheme.settingsFontSize
checked: CurrentAccount.disableSecureDlgCheck_TLS
onSwitchToggled: CurrentAccount.disableSecureDlgCheck_TLS = checked
}
SettingsComboBox { SettingsComboBox {
id: tlsProtocolComboBox id: tlsProtocolComboBox
......
...@@ -896,6 +896,8 @@ account::Info::fromDetails(const MapStringString& details) ...@@ -896,6 +896,8 @@ account::Info::fromDetails(const MapStringString& details)
confProperties.TLS.verifyClient = toBool(details[ConfProperties::TLS::VERIFY_CLIENT]); confProperties.TLS.verifyClient = toBool(details[ConfProperties::TLS::VERIFY_CLIENT]);
confProperties.TLS.requireClientCertificate = toBool( confProperties.TLS.requireClientCertificate = toBool(
details[ConfProperties::TLS::REQUIRE_CLIENT_CERTIFICATE]); details[ConfProperties::TLS::REQUIRE_CLIENT_CERTIFICATE]);
confProperties.TLS.disableSecureDlgCheck = toBool(
details[ConfProperties::TLS::DISABLE_SECURE_DLG_CHECK]);
confProperties.TLS.negotiationTimeoutSec = toInt( confProperties.TLS.negotiationTimeoutSec = toInt(
details[ConfProperties::TLS::NEGOTIATION_TIMEOUT_SEC]); details[ConfProperties::TLS::NEGOTIATION_TIMEOUT_SEC]);
// DHT // DHT
...@@ -1018,6 +1020,8 @@ account::ConfProperties_t::toDetails() const ...@@ -1018,6 +1020,8 @@ account::ConfProperties_t::toDetails() const
details[ConfProperties::TLS::VERIFY_CLIENT] = toQString(this->TLS.verifyClient); details[ConfProperties::TLS::VERIFY_CLIENT] = toQString(this->TLS.verifyClient);
details[ConfProperties::TLS::REQUIRE_CLIENT_CERTIFICATE] = toQString( details[ConfProperties::TLS::REQUIRE_CLIENT_CERTIFICATE] = toQString(
this->TLS.requireClientCertificate); this->TLS.requireClientCertificate);
details[ConfProperties::TLS::DISABLE_SECURE_DLG_CHECK] = toQString(
this->TLS.disableSecureDlgCheck);
details[ConfProperties::TLS::NEGOTIATION_TIMEOUT_SEC] = toQString( details[ConfProperties::TLS::NEGOTIATION_TIMEOUT_SEC] = toQString(
this->TLS.negotiationTimeoutSec); this->TLS.negotiationTimeoutSec);
// DHT // DHT
......
...@@ -177,6 +177,7 @@ struct ConfProperties_t ...@@ -177,6 +177,7 @@ struct ConfProperties_t
bool verifyServer; bool verifyServer;
bool verifyClient; bool verifyClient;
bool requireClientCertificate; bool requireClientCertificate;
bool disableSecureDlgCheck;
int negotiationTimeoutSec; int negotiationTimeoutSec;
} TLS; } TLS;
struct DHT_t struct DHT_t
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment