Fix validation

7 years ago · b42ae83538
parent 2b490b5ad5
commit b42ae83538
2 changed files with 2 additions and 2 deletions
--- 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();
            }
--- 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;
    }