Skip to content

fix: session comparison in socket events #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 18, 2023
+29 −28
Merged

fix: session comparison in socket events #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4adb1f1
fix: session comparison in socket events
metalurgical Aug 18, 2023
8949242
fix: comparison
metalurgical Aug 18, 2023
2d6c957
Update Helpers.swift
metalurgical Aug 18, 2023
8336c99
Update Helpers.swift
metalurgical Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions Sources/tss-client-swift/Helpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,23 +118,27 @@ public class TSSHelpers {
///
/// - Throws: `TSSClientError`
public static func hexUncompressedPublicKey(pubKey: Data, return64Bytes: Bool) throws -> String {
if pubKey.bytes.count == 65 && return64Bytes {
if pubKey.bytes.first == 04 {
return Data(pubKey.bytes.dropFirst()).hexString
if pubKey.bytes.count == 65 {
if return64Bytes {
if pubKey.bytes.first == 04 {
return Data(pubKey.bytes.dropFirst()).hexString
} else {
throw TSSClientError("Invalid public key bytes")
}
} else {
throw TSSClientError("Invalid public key bytes")
return Data(pubKey.bytes).hexString
}
} else if !return64Bytes {
return Data(pubKey.bytes).hexString
}

if pubKey.bytes.count == 65 && !return64Bytes {
return Data(pubKey.bytes).hexString
} else if return64Bytes { // first byte should be 04 prefix
let prefix: UInt8 = 4
var pk = Data(pubKey)
pk.insert(prefix, at: 0)
return pk.hexString
if pubKey.bytes.count == 64 {
if return64Bytes {
return Data(pubKey.bytes).hexString
} else { // first byte should be 04 prefix
let prefix: UInt8 = 4
var pk = Data(pubKey)
pk.insert(prefix, at: 0)
return pk.hexString
}
}

throw TSSClientError("Invalid public key bytes")
Expand Down
27 changes: 12 additions & 15 deletions Sources/tss-client-swift/TSSSocket.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,12 @@ internal final class TSSSocket {
print("disconnected, party:" + String(party))
})
socket.on("precompute_complete", callback: { data, ack in
if session != self.session {
print("ignoring message for a different session...")
return
}

if let json = try? JSONSerialization.data(withJSONObject: data[0]) {
if let msg = try? JSONDecoder().decode(TssPrecomputeUpdate.self, from: json) {
if msg.session != self.session {
print("ignoring message for a different session...")
return
}
EventQueue.shared.addEvent(event: Event(message: String(msg.party), session: msg.session, party: Int32(msg.party), occurred: Date(), type: EventType.PrecomputeComplete))
} else {
EventQueue.shared.addEvent(event: Event(message: "Received json was not decodable", session: self.session, party: Int32(-1), occurred: Date(), type: EventType.SocketDataError))
Expand All @@ -72,14 +71,13 @@ internal final class TSSSocket {
}
})
socket.on("precompute_failed", callback: { data, ack in
if session != self.session {
print("ignoring message for a different session...")
return
}

if let json = try? JSONSerialization.data(withJSONObject: data[0])
{
if let msg = try? JSONDecoder().decode(TssPrecomputeUpdate.self, from: json) {
if msg.session != self.session {
print("ignoring message for a different session...")
return
}
EventQueue.shared.addEvent(event: Event(message: String(msg.party), session: msg.session, party: Int32(msg.party), occurred: Date(), type: EventType.PrecomputeError))
} else {
EventQueue.shared.addEvent(event: Event(message: "Received json was not decodable", session: self.session, party: Int32(-1), occurred: Date(), type: EventType.SocketDataError))
Expand All @@ -92,13 +90,12 @@ internal final class TSSSocket {
}
})
socket.on("send", callback: { data, ack in
if session != self.session {
print("ignoring message for a different session...")
return
}

if let json = try? JSONSerialization.data(withJSONObject: data[0]) {
if let msg = try? JSONDecoder().decode(TssRecvMsg.self, from: json) {
if msg.session != self.session {
print("ignoring message for a different session...")
return
}
MessageQueue.shared.addMessage(msg: Message(session: msg.session, sender: UInt64(Int64(msg.sender)), recipient: UInt64(Int64(msg.recipient)), msgType: msg.msg_type, msgData: msg.msg_data))
let tag = msg.msg_type.split(separator: "~")[1]
print("dkls: Received message \(tag), sender: `\(msg.sender)`, receiver: `\(msg.recipient)`")
Expand Down