From 3bef78335d0dcfd3e5885f42fe744b7902d5140f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 30 Oct 2018 09:28:01 -0600 Subject: [PATCH] find -E . -type f -regex ".*\.(m|h|swift)" -exec sed -i "" -e "s/trywrapped_/throwswrapped_/g" {} \; --- .../src/Messages/OWSMessageDecrypter.m | 14 ++++---- .../src/Messages/OWSMessageSender.m | 14 ++++---- .../src/Messages/UD/OWSUDManager.swift | 32 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m index 04d203a6c..960069cc7 100644 --- a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m +++ b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m @@ -449,13 +449,13 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes } SMKDecryptResult *_Nullable decryptResult = - [cipher trywrapped_decryptMessageWithCertificateValidator:certificateValidator - cipherTextData:encryptedData - timestamp:serverTimestamp - localRecipientId:localRecipientId - localDeviceId:localDeviceId - protocolContext:transaction - error:&error]; + [cipher throwswrapped_decryptMessageWithCertificateValidator:certificateValidator + cipherTextData:encryptedData + timestamp:serverTimestamp + localRecipientId:localRecipientId + localDeviceId:localDeviceId + protocolContext:transaction + error:&error]; SCKRaiseIfExceptionWrapperError(error); if (error || !decryptResult) { diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 31581c74f..ed0cd9095 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -479,7 +479,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; failure:(RetryableFailureHandler)failure { [self.udManager - trywrapped_ensureSenderCertificateWithSuccess:^(SMKSenderCertificate *senderCertificate) { + throwswrapped_ensureSenderCertificateWithSuccess:^(SMKSenderCertificate *senderCertificate) { dispatch_async([OWSDispatch sendingQueue], ^{ [self sendMessageToService:message senderCertificate:senderCertificate success:success failure:failure]; }); @@ -1656,12 +1656,12 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; OWSRaiseException(@"SecretSessionCipherFailure", @"Can't create secret session cipher."); } - serializedMessage = [secretCipher trywrapped_encryptMessageWithRecipientId:recipientId - deviceId:deviceId.intValue - paddedPlaintext:[plainText paddedMessageBody] - senderCertificate:messageSend.senderCertificate - protocolContext:transaction - error:&error]; + serializedMessage = [secretCipher throwswrapped_encryptMessageWithRecipientId:recipientId + deviceId:deviceId.intValue + paddedPlaintext:[plainText paddedMessageBody] + senderCertificate:messageSend.senderCertificate + protocolContext:transaction + error:&error]; SCKRaiseIfExceptionWrapperError(error); messageType = TSUnidentifiedSenderMessageType; } else { diff --git a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift b/SignalServiceKit/src/Messages/UD/OWSUDManager.swift index f4d6a7af9..680ba5d17 100644 --- a/SignalServiceKit/src/Messages/UD/OWSUDManager.swift +++ b/SignalServiceKit/src/Messages/UD/OWSUDManager.swift @@ -65,7 +65,7 @@ private func string(forUnidentifiedAccessMode mode: UnidentifiedAccessMode) -> S // We use completion handlers instead of a promise so that message sending // logic can access the strongly typed certificate data. @objc - func trywrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void, + func throwswrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void, failure:@escaping (Error) -> Void) // MARK: Unrestricted Access @@ -111,7 +111,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { } // Any error is silently ignored on startup. - self.trywrapped_ensureSenderCertificate().retainUntilComplete() + self.throwswrapped_ensureSenderCertificate().retainUntilComplete() } NotificationCenter.default.addObserver(self, selector: #selector(registrationStateDidChange), @@ -124,7 +124,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { AssertIsOnMainThread() // Any error is silently ignored - trywrapped_ensureSenderCertificate().retainUntilComplete() + throwswrapped_ensureSenderCertificate().retainUntilComplete() } // MARK: - @@ -266,12 +266,12 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { #if DEBUG @objc - public func trywrapped_hasSenderCertificate() -> Bool { - return trywrapped_senderCertificate() != nil + public func throwswrapped_hasSenderCertificate() -> Bool { + return throwswrapped_senderCertificate() != nil } #endif - private func trywrapped_senderCertificate() -> SMKSenderCertificate? { + private func throwswrapped_senderCertificate() -> SMKSenderCertificate? { guard let certificateData = dbConnection.object(forKey: senderCertificateKey(), inCollection: kUDCollection) as? Data else { return nil } @@ -279,7 +279,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { do { let certificate = try SMKSenderCertificate.parse(data: certificateData) - guard trywrapped_isValidCertificate(certificate) else { + guard throwswrapped_isValidCertificate(certificate) else { Logger.warn("Current sender certificate is not valid.") return nil } @@ -300,10 +300,10 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { } @objc - public func trywrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void, + public func throwswrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void, failure:@escaping (Error) -> Void) { firstly { - trywrapped_ensureSenderCertificate() + throwswrapped_ensureSenderCertificate() }.map { certificate in success(certificate) }.catch { error in @@ -311,15 +311,15 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { }.retainUntilComplete() } - public func trywrapped_ensureSenderCertificate() -> Promise { + public func throwswrapped_ensureSenderCertificate() -> Promise { // If there is a valid cached sender certificate, use that. - if let certificate = trywrapped_senderCertificate() { + if let certificate = throwswrapped_senderCertificate() { return Promise.value(certificate) } // Try to obtain a new sender certificate. return firstly { - trywrapped_requestSenderCertificate() + throwswrapped_requestSenderCertificate() }.map { (certificateData: Data, certificate: SMKSenderCertificate) in // Cache the current sender certificate. @@ -329,13 +329,13 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { } } - private func trywrapped_requestSenderCertificate() -> Promise<(certificateData: Data, certificate: SMKSenderCertificate)> { + private func throwswrapped_requestSenderCertificate() -> Promise<(certificateData: Data, certificate: SMKSenderCertificate)> { return firstly { SignalServiceRestClient().requestUDSenderCertificate() }.map { certificateData -> (certificateData: Data, certificate: SMKSenderCertificate) in let certificate = try SMKSenderCertificate.parse(data: certificateData) - guard self.trywrapped_isValidCertificate(certificate) else { + guard self.throwswrapped_isValidCertificate(certificate) else { throw OWSUDError.invalidData(description: "Invalid sender certificate returned by server") } @@ -343,7 +343,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { } } - private func trywrapped_isValidCertificate(_ certificate: SMKSenderCertificate) -> Bool { + private func throwswrapped_isValidCertificate(_ certificate: SMKSenderCertificate) -> Bool { // Ensure that the certificate will not expire in the next hour. // We want a threshold long enough to ensure that any outgoing message // sends will complete before the expiration. @@ -351,7 +351,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager { let anHourFromNowMs = nowMs + kHourInMs do { - try certificateValidator.trywrapped_validate(senderCertificate: certificate, validationTime: anHourFromNowMs) + try certificateValidator.throwswrapped_validate(senderCertificate: certificate, validationTime: anHourFromNowMs) return true } catch { OWSLogger.error("Invalid certificate")