fall back to uuid for incoming messages, when e164 fails

contactsDiscovery/remoteAttestationUtil.go

@@ -120,7 +120,7 @@ func validateAndBuildRemoteAttestation(
 	enclaveName string,
 ) (*RemoteAttestation, error) {
 	keys, err := remoteAttestationKeys(keyPair, remoteAttestation.ServerEphemeralPublic, remoteAttestation.ServerStaticPublic)
-	log.Debugln("[textsecure] validateAndBuildRemoteAttestation ", err)
+	log.Debugln("[textsecure] validateAndBuildRemoteAttestation ")
 	if err != nil {
 		return nil, err
 	}

server.go

@@ -767,7 +767,10 @@ func buildMessage(reciever string, paddedMessage []byte, devices []uint32, isSyn
 	if len(reciever) == 0 {
 		return nil, fmt.Errorf("empty reciever")
 	}
-	recid := recID(reciever)
+	recid, err := recID(reciever)
+	if err != nil {
+		return nil, err
+	}
 	messages := []jsonMessage{}
 	for _, devid := range devices {
 		if !textSecureStore.ContainsSession(recid, devid) {
@@ -884,7 +887,11 @@ func buildAndSendMessage(uuid string, paddedMessage []byte, isSync bool, timesta
 		dec.Decode(&j)
 		log.Debugf("[textsecure] Stale devices: %+v\n", j)
 		for _, id := range j.StaleDevices {
-			textSecureStore.DeleteSession(recID(uuid), id)
+			uuidCleanup, err := recID(uuid)
+			if err != nil {
+				return nil, err
+			}
+			textSecureStore.DeleteSession(uuidCleanup, id)
 		}
 		return buildAndSendMessage(uuid, paddedMessage, isSync, timestamp)
 	}

store.go

@@ -249,7 +249,11 @@ func (err UnknownContactError) Error() string {
 // ContactIdentityKey returns the serialized public key of the given contact
 func ContactIdentityKey(id string) ([]byte, error) {
 	s := textSecureStore
-	idkeyfile := filepath.Join(s.identityDir, "remote_"+recID(id))
+	idClean, err := recID(id)
+	if err != nil {
+		return nil, err
+	}
+	idkeyfile := filepath.Join(s.identityDir, "remote_"+idClean)
 	if !exists(idkeyfile) {
 		return nil, UnknownContactError{id}
 	}

textsecure.go

@@ -187,7 +187,11 @@ func EndSession(uuid string, msg string) (uint64, error) {
 	if err != nil {
 		return 0, err
 	}
-	textSecureStore.DeleteAllSessions(recID(uuid))
+	uuidClean, err := recID(uuid)
+	if err != nil {
+		return 0, err
+	}
+	textSecureStore.DeleteAllSessions(uuidClean)
 	return ts, nil
 }
 
@@ -468,11 +472,15 @@ func handleReceipt(env *signalservice.Envelope) {
 }
 
 // recID removes the + from phone numbers
-func recID(source string) string {
-	if source[0] == '+' {
-		return source[1:]
+func recID(source string) (string, error) {
+	if len(source) == 0 {
+		return source[1:], nil
+	} else if len(source) > 0 && source[0] == '+' {
+		log.Errorln("[textsecure] invalid recipient id", source)
+		return "", errors.New("invalid recipient id")
+
 	}
-	return source
+	return source, nil
 }
 
 // EndSessionFlag signals that this message resets the session
@@ -485,8 +493,11 @@ func handleFlags(src string, dm *signalservice.DataMessage) (uint32, error) {
 	flags := uint32(0)
 	if dm.GetFlags() == uint32(signalservice.DataMessage_END_SESSION) {
 		flags = EndSessionFlag
-
-		textSecureStore.DeleteAllSessions(recID(src))
+		srcClean, err := recID(src)
+		if err != nil {
+			return 0, err
+		}
+		textSecureStore.DeleteAllSessions(srcClean)
 		textSecureStore.DeleteAllSessions(src)
 	}
 	if dm.GetFlags() == uint32(signalservice.DataMessage_PROFILE_KEY_UPDATE) {
@@ -567,7 +578,10 @@ func handleReceivedMessage(msg []byte) error {
 			// try the legacy way
 			log.Infof("[textsecure] Incoming WhisperMessage try legacy decrypting")
 
-			recid := recID(env.GetSourceE164())
+			recid, err := recID(env.GetSourceE164())
+			if err != nil {
+				recid = env.GetSourceUuid()
+			}
 			sc := axolotl.NewSessionCipher(textSecureStore, textSecureStore, textSecureStore, textSecureStore, recid, env.GetSourceDevice())
 			b, err = sc.SessionDecryptWhisperMessage(wm)
 			if _, ok := err.(axolotl.DuplicateMessageError); ok {