ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #516: Fix encryption flag erraneously set for "ws" connections

pull/517/head
Jenkins nymea 2021-01-23 20:30:20 +01:00
parent 997fb58540 986714c9e1
commit 0c1b4dac51
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-app/connection/nymeaconnection.cpp
View File

@ -250,7 +250,7 @@ void NymeaConnection::onConnected()
NymeaTransportInterface* newTransport = qobject_cast<NymeaTransportInterface*>(sender());
if (!m_currentTransport) {
m_currentTransport = newTransport;
qDebug() << "NymeaConnection: Connected to" << m_currentHost->name() << "via" << m_currentTransport->url();
qDebug() << "NymeaConnection: Connected to" << m_currentHost->name() << "via" << m_currentTransport->url() << m_currentTransport->isEncrypted();
emit currentConnectionChanged();
emit connectedChanged(true);
return;

2
libnymea-app/connection/websockettransport.cpp
View File

@ -101,7 +101,7 @@ void WebsocketTransport::ignoreSslErrors(const QList<QSslError> &errors)
bool WebsocketTransport::isEncrypted() const
{
return !m_socket->sslConfiguration().isNull();
return m_url.scheme() == "wss";
}
QSslCertificate WebsocketTransport::serverCertificate() const

9
libnymea-app/jsonrpc/jsonrpcclient.cpp
View File

@ -665,14 +665,15 @@ void JsonRpcClient::helloReply(int /*commandId*/, const QVariantMap &params)
if (m_connection->sslCertificate().toPem() != pem) {
// Uh oh, the certificate has changed
qWarning() << "This connections certificate has changed!";
QSslCertificate certificate = m_connection->sslCertificate();
QVariantMap issuerInfo = certificateIssuerInfo();
emit verifyConnectionCertificate(m_serverUuid, issuerInfo, certificate.toPem());
qWarning() << "Old PEM:" << pem;
qWarning() << "New PEM:" << m_connection->sslCertificate().toPem();
// Reject the connection until the UI explicitly accepts this...
m_connection->disconnectFromHost();
QSslCertificate certificate = m_connection->sslCertificate();
QVariantMap issuerInfo = certificateIssuerInfo();
emit verifyConnectionCertificate(m_serverUuid, issuerInfo, certificate.toPem());
return;
}
qDebug() << "This connections certificate is trusted.";