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

Validate and filter device names

Browse source
This commit is contained in:
Albert Vaca Cintora 2024-05-19 16:15:39 +02:00
parent 983788e5c9
commit b672d80249
No known key found for this signature in database
4 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/backends/bluetooth/bluetoothlinkprovider.cpp
View file

@ -194,8 +194,8 @@ void BluetoothLinkProvider::clientIdentityReceived(const QBluetoothAddress &peer
NetworkPacket receivedPacket; NetworkPacket receivedPacket;
bool success = NetworkPacket::unserialize(identityArray, &receivedPacket); bool success = NetworkPacket::unserialize(identityArray, &receivedPacket);
if (!success || receivedPacket.type() != PACKET_TYPE_IDENTITY) { if (!success || !DeviceInfo::isValidIdentityPacket(np)) {
qCWarning(KDECONNECT_CORE) << "BluetoothLinkProvider Received not an identity packet"; qCWarning(KDECONNECT_CORE) << "BluetoothLinkProvider: Invalid identity packet received";
mSockets.remove(peer); mSockets.remove(peer);
socket->close(); socket->close();
socket->deleteLater(); socket->deleteLater();
@ -298,8 +298,8 @@ void BluetoothLinkProvider::serverDataReceived(const QBluetoothAddress &peer, QS
NetworkPacket receivedPacket; NetworkPacket receivedPacket;
bool success = NetworkPacket::unserialize(identityArray, &receivedPacket); bool success = NetworkPacket::unserialize(identityArray, &receivedPacket);
if (!success || receivedPacket.type() != PACKET_TYPE_IDENTITY) { if (!success || !DeviceInfo::isValidIdentityPacket(receivedPacket)) {
qCWarning(KDECONNECT_CORE) << "Not an identity packet."; qCWarning(KDECONNECT_CORE) << "BluetoothLinkProvider: Invalid identity packet received";
mSockets.remove(peer); mSockets.remove(peer);
socket->close(); socket->close();
socket->deleteLater(); socket->deleteLater();

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

@ -259,8 +259,8 @@ void LanLinkProvider::udpBroadcastReceived()
continue; continue;
} }
if (receivedPacket->type() != PACKET_TYPE_IDENTITY) { if (!DeviceInfo::isValidIdentityPacket(receivedPacket)) {
qCDebug(KDECONNECT_CORE) << "Received a UDP packet of wrong type" << receivedPacket->type(); qCWarning(KDECONNECT_CORE) << "Invalid identity packet received";
delete receivedPacket; delete receivedPacket;
continue; continue;
} }
@ -477,8 +477,8 @@ void LanLinkProvider::dataReceived()
return; return;
} }
if (np->type() != PACKET_TYPE_IDENTITY) { if (!DeviceInfo::isValidIdentityPacket(np)) {
qCWarning(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Expected identity, received " << np->type(); qCWarning(KDECONNECT_CORE) << "Invalid identity packet received";
delete np; delete np;
return; return;
} }

5
core/daemon.cpp
View file

@ -193,10 +193,11 @@ void Daemon::onDeviceStatusChanged()
void Daemon::setAnnouncedName(const QString &name) void Daemon::setAnnouncedName(const QString &name)
{ {
QString filteredName = DeviceInfo::filterName(name);
qCDebug(KDECONNECT_CORE) << "Announcing name"; qCDebug(KDECONNECT_CORE) << "Announcing name";
KdeConnectConfig::instance().setName(name); KdeConnectConfig::instance().setName(filteredName);
forceOnNetworkChange(); forceOnNetworkChange();
Q_EMIT announcedNameChanged(name); Q_EMIT announcedNameChanged(filteredName);
} }
void Daemon::setCustomDevices(const QStringList &addresses) void Daemon::setCustomDevices(const QStringList &addresses)

16
core/deviceinfo.h
View file

@ -8,6 +8,7 @@
#define DEVICE_INFO_H #define DEVICE_INFO_H
#include "networkpacket.h" #include "networkpacket.h"
#include <QRegularExpression>
#include <QSet> #include <QSet>
#include <QSslCertificate> #include <QSslCertificate>
#include <QString> #include <QString>
@ -138,12 +139,25 @@ struct DeviceInfo {
return DeviceInfo(np.get<QString>(QStringLiteral("deviceId")), return DeviceInfo(np.get<QString>(QStringLiteral("deviceId")),
certificate, certificate,
np.get<QString>(QStringLiteral("deviceName")), filterName(np.get<QString>(QStringLiteral("deviceName"))),
DeviceType::FromString(np.get<QString>(QStringLiteral("deviceType"))), DeviceType::FromString(np.get<QString>(QStringLiteral("deviceType"))),
np.get<int>(QStringLiteral("protocolVersion"), -1), np.get<int>(QStringLiteral("protocolVersion"), -1),
QSet<QString>(incomingCapabilities.begin(), incomingCapabilities.end()), QSet<QString>(incomingCapabilities.begin(), incomingCapabilities.end()),
QSet<QString>(outgoingCapabilities.begin(), outgoingCapabilities.end())); QSet<QString>(outgoingCapabilities.begin(), outgoingCapabilities.end()));
} }
static QString filterName(QString input)
{
static const QRegularExpression NAME_INVALID_CHARACTERS_REGEX(QStringLiteral("[\"',;:.!?()\\[\\]<>]"));
constexpr int MAX_DEVICE_NAME_LENGTH = 32;
return input.remove(NAME_INVALID_CHARACTERS_REGEX).left(MAX_DEVICE_NAME_LENGTH);
}
static bool isValidIdentityPacket(NetworkPacket *np)
{
return np->type() == PACKET_TYPE_IDENTITY && !filterName(np->get(QLatin1String("deviceName"), QString())).isEmpty()
&& !np->get(QLatin1String("deviceId"), QString()).isEmpty();
}
}; };
#endif #endif