lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-24 09:25:33 +02:00
Code Activity

sip: fix incoming TLS calls by disabling secure dialog

Browse source 
Change-Id: I28e6135d9586adf7b4264431726f82f47856be51
This commit is contained in:
Antoine Noreau 2022-10-24 16:10:24 -04:00
parent f2b40af3e2
commit 9457c7ccbb
6 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/app/constant/JamiStrings.qml
View file

@ -115,6 +115,7 @@ Item {
property string verifyCertificatesServer: qsTr("Verify certificates for incoming TLS connections")
property string verifyCertificatesClient: qsTr("Verify server TLS certificates")
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 audioDeviceSelector: qsTr("Audio input device selector")
property string tlsServerName: qsTr("TLS server name")

1
src/app/currentaccount.cpp
View file

@ -141,6 +141,7 @@ CurrentAccount::updateData()
set_verifyServerTLS(accConfig.TLS.verifyServer, true);
set_verifyClientTLS(accConfig.TLS.verifyClient, true);
set_requireClientCertificateTLS(accConfig.TLS.requireClientCertificate, true);
set_disableSecureDlgCheckTLS(accConfig.TLS.disableSecureDlgCheck, true);
set_certificateListFileTLS(accConfig.TLS.certificateListFile, true);
set_certificateFileTLS(accConfig.TLS.certificateFile, true);
set_privateKeyFileTLS(accConfig.TLS.privateKeyFile, true);

1
src/app/currentaccount.h
View file

@ -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, verifyClient, 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, certificateFile, TLS)
QML_ACCOUNT_CONFIG_CATEGORY_SETTINGS_PROPERTY(QString, privateKeyFile, TLS)

11
src/app/settingsview/components/AdvancedSIPSecuritySettings.qml
View file

@ -247,6 +247,17 @@ ColumnLayout {
onSwitchToggled: CurrentAccount.requireClientCertificate_TLS = checked
}
ToggleSwitch {
id: disableSecureDlgCheckToggle
labelText: JamiStrings.disableSecureDlgCheck
fontPointSize: JamiTheme.settingsFontSize
checked: CurrentAccount.disableSecureDlgCheck_TLS
onSwitchToggled: CurrentAccount.disableSecureDlgCheck_TLS = checked
}
SettingsComboBox {
id: tlsProtocolComboBox

4
src/libclient/accountmodel.cpp
View file

@ -896,6 +896,8 @@ account::Info::fromDetails(const MapStringString& details)
confProperties.TLS.verifyClient = toBool(details[ConfProperties::TLS::VERIFY_CLIENT]);
confProperties.TLS.requireClientCertificate = toBool(
details[ConfProperties::TLS::REQUIRE_CLIENT_CERTIFICATE]);
confProperties.TLS.disableSecureDlgCheck = toBool(
details[ConfProperties::TLS::DISABLE_SECURE_DLG_CHECK]);
confProperties.TLS.negotiationTimeoutSec = toInt(
details[ConfProperties::TLS::NEGOTIATION_TIMEOUT_SEC]);
// DHT
@ -1018,6 +1020,8 @@ account::ConfProperties_t::toDetails() const
details[ConfProperties::TLS::VERIFY_CLIENT] = toQString(this->TLS.verifyClient);
details[ConfProperties::TLS::REQUIRE_CLIENT_CERTIFICATE] = toQString(
this->TLS.requireClientCertificate);
details[ConfProperties::TLS::DISABLE_SECURE_DLG_CHECK] = toQString(
this->TLS.disableSecureDlgCheck);
details[ConfProperties::TLS::NEGOTIATION_TIMEOUT_SEC] = toQString(
this->TLS.negotiationTimeoutSec);
// DHT

1
src/libclient/api/account.h
View file

@ -177,6 +177,7 @@ struct ConfProperties_t
bool verifyServer;
bool verifyClient;
bool requireClientCertificate;
bool disableSecureDlgCheck;
int negotiationTimeoutSec;
} TLS;
struct DHT_t