oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Finish linking request validation

This commit is contained in:
Niels Andriesse 2019-09-24 09:21:34 +10:00
parent 8429fc3536
commit 9a9cefd4ec
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SignalServiceKit/src/Loki/API/Multi Device/LokiDeviceLinkingSession.swift
View File

@ -27,7 +27,7 @@ public final class LokiDeviceLinkingSession : NSObject {
let master = LokiDeviceLink.Device(hexEncodedPublicKey: OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey)
let slave = LokiDeviceLink.Device(hexEncodedPublicKey: slaveHexEncodedPublicKey, signature: slaveSignature)
let deviceLink = LokiDeviceLink(between: master, and: slave)
guard isValid(deviceLink) else { return }
guard isValidLinkingRequest(deviceLink) else { return }
delegate.requestUserAuthorization(for: deviceLink)
}
@ -41,9 +41,12 @@ public final class LokiDeviceLinkingSession : NSObject {
}
// MARK: Private API
private func isValid(_ deviceLink: LokiDeviceLink) -> Bool {
let signature = deviceLink.slave.signature!
let publicKey = Data(hex: deviceLink.slave.hexEncodedPublicKey)
return try? Ed25519.verifySignature(signature, publicKey: publicKey, data: Data()) ?? false // TODO: Data
private func isValidLinkingRequest(_ deviceLink: LokiDeviceLink) -> Bool {
// When requesting a device link, the slave device signs the master device's public key. When authorizing
// a device link, the master device signs the slave device's public key.
let slaveSignature = deviceLink.slave.signature!
let slavePublicKey = Data(hex: deviceLink.slave.hexEncodedPublicKey)
let masterPublicKey = Data(hex: deviceLink.master.hexEncodedPublicKey)
return (try? Ed25519.verifySignature(slaveSignature, publicKey: slavePublicKey, data: masterPublicKey)) ?? false
}
}