From b42ae83538b0ef5a2102c26665c77d88a4d71af0 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 10 May 2019 11:38:48 +1000 Subject: [PATCH] Fix validation --- SignalServiceKit/src/Messages/OWSMessageDecrypter.m | 2 +- SignalServiceKit/src/Messages/OWSMessageManager.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m index dd7d9bb30..ad61e6b5a 100644 --- a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m +++ b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m @@ -197,7 +197,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes OWSLogInfo(@"decrypting envelope: %@", [self descriptionForEnvelope:envelope]); if (envelope.type != SSKProtoEnvelopeTypeUnidentifiedSender) { - if (!envelope.hasSource || envelope.source.length < 1 /*|| !envelope.source.isValidE164*/) { + if (!envelope.hasSource || envelope.source.length < 1 || ![ECKeyPair isValidHexEncodedPublicKeyWithCandidate:envelope.source]) { OWSFailDebug(@"incoming envelope has invalid source"); return failureBlock(); } diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 9d98151b4..8c0d7223e 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -248,7 +248,7 @@ NS_ASSUME_NONNULL_BEGIN OWSLogInfo(@"handling decrypted envelope: %@", [self descriptionForEnvelope:envelope]); - if (!envelope.hasSource || envelope.source.length < 1 /*|| !envelope.source.isValidE164*/) { + if (!envelope.hasSource || envelope.source.length < 1 || ![ECKeyPair isValidHexEncodedPublicKeyWithCandidate:envelope.source]) { OWSFailDebug(@"incoming envelope has invalid source"); return; }