signalapp/SignalMetadataKit
signalapp/SignalMetadataKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mkirk/fixup-tests'

Browse Source
This commit is contained in:
Michael Kirk 2018-11-19 09:27:16 -06:00
commit b493b7b0db
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SignalMetadataKit/src/SMKSecretSessionCipher.swift
View File

@ -12,9 +12,9 @@ public class SecretSessionKnownSenderError: NSObject, CustomNSError {
@objc
public static let kSenderDeviceIdKey = "kSenderDeviceIdKey"
let senderRecipientId: String
let senderDeviceId: UInt32
let underlyingError: Error
public let senderRecipientId: String
public let senderDeviceId: UInt32
public let underlyingError: Error
init(senderRecipientId: String, senderDeviceId: UInt32, underlyingError: Error) {
self.senderRecipientId = senderRecipientId
@ -22,7 +22,7 @@ public class SecretSessionKnownSenderError: NSObject, CustomNSError {
self.underlyingError = underlyingError
}
public var errorUserInfo: [String : Any] {
public var errorUserInfo: [String: Any] {
return [
type(of: self).kSenderRecipientIdKey: self.senderRecipientId,
type(of: self).kSenderDeviceIdKey: self.senderDeviceId,

19
SignalMetadataKitTests/src/SMKSecretSessionCipherTest.swift
View File

@ -128,8 +128,9 @@ class SMKSecretSessionCipherTest: XCTestCase {
localDeviceId: bobMockClient.deviceId,
protocolContext: nil)
XCTFail("Decryption should have failed.")
} catch _ as SMKCertificateError {
} catch let knownSenderError as SecretSessionKnownSenderError {
// Decryption is expected to fail.
XCTAssert(knownSenderError.underlyingError is SMKCertificateError )
} catch {
XCTFail("Unexpected error: \(error)")
}
@ -187,8 +188,9 @@ class SMKSecretSessionCipherTest: XCTestCase {
localDeviceId: bobMockClient.deviceId,
protocolContext: nil)
XCTFail("Decryption should have failed.")
} catch _ as SMKCertificateError {
} catch let knownSenderError as SecretSessionKnownSenderError {
// Decryption is expected to fail.
XCTAssert(knownSenderError.underlyingError is SMKCertificateError )
} catch {
XCTFail("Unexpected error: \(error)")
}
@ -240,16 +242,21 @@ class SMKSecretSessionCipherTest: XCTestCase {
// }
let certificateValidator = SMKCertificateDefaultValidator(trustRoot: try! trustRoot.ecPublicKey())
do {
try bobCipher.throwswrapped_decryptMessage(certificateValidator: certificateValidator,
_ = try bobCipher.throwswrapped_decryptMessage(certificateValidator: certificateValidator,
cipherTextData: ciphertext,
timestamp: 31335,
localRecipientId: bobMockClient.recipientId,
localDeviceId: bobMockClient.deviceId,
protocolContext: nil)
XCTFail("Decryption should have failed.")
} catch {
} catch let knownSenderError as SecretSessionKnownSenderError {
// Decryption is expected to fail.
XCTAssertTrue(error is SMKError)
guard case SMKError.assertionError = knownSenderError.underlyingError else {
XCTFail("unexpected error: \(knownSenderError.underlyingError)")
return
}
} catch {
XCTFail("unexpected error: \(error)")
}
}
@ -287,7 +294,7 @@ class SMKSecretSessionCipherTest: XCTestCase {
key: try! serverKey.ecPublicKey(),
signatureData: serverCertificateSignature)
XCTAssertEqual(try! signedServerCertificate.toProto().certificate, unsignedServerCertificateData)
let signedServerCertificateData = try! signedServerCertificate.serialized()
_ = try! signedServerCertificate.serialized()
// byte[] senderCertificateBytes = SignalProtos.SenderCertificate.Certificate.newBuilder()
// .setSender(sender)