feat: add support for protocol version 8

Add support for the planned changes in protocol version 8. See: https://invent.kde.org/network/kdeconnect-android/-/commit/454b2fd5d7b3162443fbec4a6f0b7cafa1b554ee
GSConnect · Jan 10, 2025 · 07f3803 · 07f3803
1 parent b3bcec6
commit 07f3803
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/installed-tests/fixtures/backend.js b/installed-tests/fixtures/backend.js
@@ -292,7 +292,7 @@ export const ChannelService = GObject.registerClass({
                 deviceId: this.id,
                 deviceName: this.name,
                 deviceType: 'desktop',
-                protocolVersion: 7,
+                protocolVersion: 8,
                 incomingCapabilities: [],
                 outgoingCapabilities: [],
                 tcpPort: this.port,

diff --git a/installed-tests/fixtures/utils.js b/installed-tests/fixtures/utils.js
@@ -110,7 +110,7 @@ export function generateIdentity(params = {}) {
             'deviceId': GLib.uuid_string_random(),
             'deviceName': 'Test Device',
             'deviceType': getDeviceType(),
-            'protocolVersion': 7,
+            'protocolVersion': 8,
             'incomingCapabilities': [],
             'outgoingCapabilities': [],
         },

diff --git a/src/service/backends/lan.js b/src/service/backends/lan.js
@@ -375,7 +375,7 @@ export const ChannelService = GObject.registerClass({
                 certificate: this.certificate,
                 host: packet.body.tcpHost,
                 port: packet.body.tcpPort,
-                identity: packet,
+                identity: new Core.Packet(packet),
             });
 
             // Check if channel is already open with this address
@@ -730,6 +730,14 @@ export const Channel = GObject.registerClass({
                 throw new Error('missing deviceId');
 
             this._connection = await this._encryptClient(connection);
+
+            // Starting with protocol version 8, the devices are expected to
+            // exchange identity packets again after TLS negotiation to
+            // prevent a number of spoofing attacks
+            if (this.identity.body.protocolVersion >= 8) {
+                await this.sendPacket(this.backend.identity.serialize());
+                this.identity = await this.readPacket();
+            }
         } catch (e) {
             this.close();
             throw e;
@@ -754,6 +762,14 @@ export const Channel = GObject.registerClass({
                 this.cancellable);
 
             this._connection = await this._encryptServer(connection);
+
+            // Starting with protocol version 8, the devices are expected to
+            // exchange identity packets again after TLS negotiation to
+            // prevent a number of spoofing attacks
+            if (this.identity.body.protocolVersion >= 8) {
+                await this.sendPacket(this.backend.identity.serialize());
+                this.identity = await this.readPacket();
+            }
         } catch (e) {
             this.close();
             throw e;

diff --git a/src/service/core.js b/src/service/core.js
@@ -406,7 +406,7 @@ export const ChannelService = GObject.registerClass({
                 deviceId: this.id,
                 deviceName: this.name,
                 deviceType: _getDeviceType(),
-                protocolVersion: 7,
+                protocolVersion: 8,
                 incomingCapabilities: [],
                 outgoingCapabilities: [],
             },