Fix validation

pull/13/head
Niels Andriesse 7 years ago
parent 2b490b5ad5
commit b42ae83538

@ -197,7 +197,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
OWSLogInfo(@"decrypting envelope: %@", [self descriptionForEnvelope:envelope]); OWSLogInfo(@"decrypting envelope: %@", [self descriptionForEnvelope:envelope]);
if (envelope.type != SSKProtoEnvelopeTypeUnidentifiedSender) { 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"); OWSFailDebug(@"incoming envelope has invalid source");
return failureBlock(); return failureBlock();
} }

@ -248,7 +248,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSLogInfo(@"handling decrypted envelope: %@", [self descriptionForEnvelope:envelope]); 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"); OWSFailDebug(@"incoming envelope has invalid source");
return; return;
} }

Loading…
Cancel
Save