tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not replace connections for a given deviceId if the certs have changed

Browse source 
Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
This commit is contained in:
Albert Vaca Cintora 2020-09-24 18:46:57 +02:00
parent ce0f00fc2d
commit bd27aec9d2
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/backends/lan/landevicelink.cpp
View file

@ -178,3 +178,8 @@ bool LanDeviceLink::linkShouldBeKeptAlive() {
//return (mConnectionSource == ConnectionStarted::Remotely || pairStatus() == Paired); //return (mConnectionSource == ConnectionStarted::Remotely || pairStatus() == Paired);
} }
QSslCertificate LanDeviceLink::certificate() const
{
return m_socketLineReader->peerCertificate();
}

1
core/backends/lan/landevicelink.h
View file

@ -42,6 +42,7 @@ public:
bool linkShouldBeKeptAlive() override; bool linkShouldBeKeptAlive() override;
QHostAddress hostAddress() const; QHostAddress hostAddress() const;
QSslCertificate certificate() const;
private Q_SLOTS: private Q_SLOTS:
void dataReceived(); void dataReceived();

6
core/backends/lan/lanlinkprovider.cpp
View file

@ -363,6 +363,12 @@ void LanLinkProvider::encrypted()
NetworkPacket* receivedPacket = m_receivedIdentityPackets[socket].np; NetworkPacket* receivedPacket = m_receivedIdentityPackets[socket].np;
const QString& deviceId = receivedPacket->get<QString>(QStringLiteral("deviceId")); const QString& deviceId = receivedPacket->get<QString>(QStringLiteral("deviceId"));
if (m_links.contains(deviceId) && m_links[deviceId]->certificate() != socket->peerCertificate()) {
socket->disconnectFromHost();
qCWarning(KDECONNECT_CORE) << "Got connection for the same deviceId but certificates don't match. Ignoring " << deviceId;
return;
}
addLink(deviceId, socket, receivedPacket, connectionOrigin); addLink(deviceId, socket, receivedPacket, connectionOrigin);
// Copied from tcpSocketConnected slot, now delete received packet // Copied from tcpSocketConnected slot, now delete received packet