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

find -E . -type f -regex ".*\.(m|h|swift)" -exec sed -i "" -e "s/trywrapped_/throwswrapped_/g" {} \;

Browse Source
pull/1/head
Michael Kirk 7 years ago
parent cb9aa6304c
commit 3bef78335d
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

14
SignalServiceKit/src/Messages/OWSMessageDecrypter.m
Unescape Escape View File

@ -449,13 +449,13 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
} }
SMKDecryptResult *_Nullable decryptResult = SMKDecryptResult *_Nullable decryptResult =
[cipher trywrapped_decryptMessageWithCertificateValidator:certificateValidator [cipher throwswrapped_decryptMessageWithCertificateValidator:certificateValidator
cipherTextData:encryptedData cipherTextData:encryptedData
timestamp:serverTimestamp timestamp:serverTimestamp
localRecipientId:localRecipientId localRecipientId:localRecipientId
localDeviceId:localDeviceId localDeviceId:localDeviceId
protocolContext:transaction protocolContext:transaction
error:&error]; error:&error];
SCKRaiseIfExceptionWrapperError(error); SCKRaiseIfExceptionWrapperError(error);
if (error || !decryptResult) { if (error || !decryptResult) {

14
SignalServiceKit/src/Messages/OWSMessageSender.m
Unescape Escape View File

@ -479,7 +479,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
failure:(RetryableFailureHandler)failure failure:(RetryableFailureHandler)failure
{ {
[self.udManager [self.udManager
trywrapped_ensureSenderCertificateWithSuccess:^(SMKSenderCertificate *senderCertificate) { throwswrapped_ensureSenderCertificateWithSuccess:^(SMKSenderCertificate *senderCertificate) {
dispatch_async([OWSDispatch sendingQueue], ^{ dispatch_async([OWSDispatch sendingQueue], ^{
[self sendMessageToService:message senderCertificate:senderCertificate success:success failure:failure]; [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."); OWSRaiseException(@"SecretSessionCipherFailure", @"Can't create secret session cipher.");
} }
serializedMessage = [secretCipher trywrapped_encryptMessageWithRecipientId:recipientId serializedMessage = [secretCipher throwswrapped_encryptMessageWithRecipientId:recipientId
deviceId:deviceId.intValue deviceId:deviceId.intValue
paddedPlaintext:[plainText paddedMessageBody] paddedPlaintext:[plainText paddedMessageBody]
senderCertificate:messageSend.senderCertificate senderCertificate:messageSend.senderCertificate
protocolContext:transaction protocolContext:transaction
error:&error]; error:&error];
SCKRaiseIfExceptionWrapperError(error); SCKRaiseIfExceptionWrapperError(error);
messageType = TSUnidentifiedSenderMessageType; messageType = TSUnidentifiedSenderMessageType;
} else { } else {

32
SignalServiceKit/src/Messages/UD/OWSUDManager.swift
Unescape Escape View File

@ -65,7 +65,7 @@ private func string(forUnidentifiedAccessMode mode: UnidentifiedAccessMode) -> S
// We use completion handlers instead of a promise so that message sending // We use completion handlers instead of a promise so that message sending
// logic can access the strongly typed certificate data. // logic can access the strongly typed certificate data.
@objc @objc
func trywrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void, func throwswrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void,
failure:@escaping (Error) -> Void) failure:@escaping (Error) -> Void)
// MARK: Unrestricted Access // MARK: Unrestricted Access
@ -111,7 +111,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
} }
// Any error is silently ignored on startup. // Any error is silently ignored on startup.
self.trywrapped_ensureSenderCertificate().retainUntilComplete() self.throwswrapped_ensureSenderCertificate().retainUntilComplete()
} }
NotificationCenter.default.addObserver(self, NotificationCenter.default.addObserver(self,
selector: #selector(registrationStateDidChange), selector: #selector(registrationStateDidChange),
@ -124,7 +124,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
AssertIsOnMainThread() AssertIsOnMainThread()
// Any error is silently ignored // Any error is silently ignored
trywrapped_ensureSenderCertificate().retainUntilComplete() throwswrapped_ensureSenderCertificate().retainUntilComplete()
} }
// MARK: - // MARK: -
@ -266,12 +266,12 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
#if DEBUG #if DEBUG
@objc @objc
public func trywrapped_hasSenderCertificate() -> Bool { public func throwswrapped_hasSenderCertificate() -> Bool {
return trywrapped_senderCertificate() != nil return throwswrapped_senderCertificate() != nil
} }
#endif #endif
private func trywrapped_senderCertificate() -> SMKSenderCertificate? { private func throwswrapped_senderCertificate() -> SMKSenderCertificate? {
guard let certificateData = dbConnection.object(forKey: senderCertificateKey(), inCollection: kUDCollection) as? Data else { guard let certificateData = dbConnection.object(forKey: senderCertificateKey(), inCollection: kUDCollection) as? Data else {
return nil return nil
} }
@ -279,7 +279,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
do { do {
let certificate = try SMKSenderCertificate.parse(data: certificateData) 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.") Logger.warn("Current sender certificate is not valid.")
return nil return nil
} }
@ -300,10 +300,10 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
} }
@objc @objc
public func trywrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void, public func throwswrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void,
failure:@escaping (Error) -> Void) { failure:@escaping (Error) -> Void) {
firstly { firstly {
trywrapped_ensureSenderCertificate() throwswrapped_ensureSenderCertificate()
}.map { certificate in }.map { certificate in
success(certificate) success(certificate)
}.catch { error in }.catch { error in
@ -311,15 +311,15 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
}.retainUntilComplete() }.retainUntilComplete()
} }
public func trywrapped_ensureSenderCertificate() -> Promise<SMKSenderCertificate> { public func throwswrapped_ensureSenderCertificate() -> Promise<SMKSenderCertificate> {
// If there is a valid cached sender certificate, use that. // If there is a valid cached sender certificate, use that.
if let certificate = trywrapped_senderCertificate() { if let certificate = throwswrapped_senderCertificate() {
return Promise.value(certificate) return Promise.value(certificate)
} }
// Try to obtain a new sender certificate. // Try to obtain a new sender certificate.
return firstly { return firstly {
trywrapped_requestSenderCertificate() throwswrapped_requestSenderCertificate()
}.map { (certificateData: Data, certificate: SMKSenderCertificate) in }.map { (certificateData: Data, certificate: SMKSenderCertificate) in
// Cache the current sender certificate. // 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 { return firstly {
SignalServiceRestClient().requestUDSenderCertificate() SignalServiceRestClient().requestUDSenderCertificate()
}.map { certificateData -> (certificateData: Data, certificate: SMKSenderCertificate) in }.map { certificateData -> (certificateData: Data, certificate: SMKSenderCertificate) in
let certificate = try SMKSenderCertificate.parse(data: certificateData) 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") 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. // Ensure that the certificate will not expire in the next hour.
// We want a threshold long enough to ensure that any outgoing message // We want a threshold long enough to ensure that any outgoing message
// sends will complete before the expiration. // sends will complete before the expiration.
@ -351,7 +351,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
let anHourFromNowMs = nowMs + kHourInMs let anHourFromNowMs = nowMs + kHourInMs
do { do {
try certificateValidator.trywrapped_validate(senderCertificate: certificate, validationTime: anHourFromNowMs) try certificateValidator.throwswrapped_validate(senderCertificate: certificate, validationTime: anHourFromNowMs)
return true return true
} catch { } catch {
OWSLogger.error("Invalid certificate") OWSLogger.error("Invalid certificate")

Write Preview
Loading…
Cancel
Save