Log all tested index MACs

Author: tulir

appstate/decode.go

@@ -10,10 +10,12 @@ import (
 	"bytes"
 	"context"
 	"crypto/sha256"
+	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"slices"
+	"strconv"
 	"strings"
 
 	"github.com/rs/zerolog"
@@ -393,6 +395,7 @@ func (proc *Processor) evilHackForLIDMutation(
 	}
 	newIndexMAC = concatAndHMAC(sha256.New, keys.Index, indexBytes)
 	currentKeyID := mutation.GetRecord().GetKeyID().GetID()
+	triedIndexMACs := map[string]string{hex.EncodeToString(currentKeyID): hex.EncodeToString(newIndexMAC)}
 	for i := mutationNum - 1; i >= 0; i-- {
 		newKeyID := prevMutations[i].GetRecord().GetKeyID().GetID()
 		if !bytes.Equal(currentKeyID, newKeyID) {
@@ -402,6 +405,7 @@ func (proc *Processor) evilHackForLIDMutation(
 			}
 			currentKeyID = newKeyID
 			newIndexMAC = concatAndHMAC(sha256.New, keys.Index, indexBytes)
+			triedIndexMACs[hex.EncodeToString(currentKeyID)] = hex.EncodeToString(newIndexMAC)
 		}
 		if bytes.Equal(prevMutations[i].GetRecord().GetIndex().GetBlob(), newIndexMAC) {
 			if prevMutations[i].GetOperation() == waServerSync.SyncdMutation_SET {
@@ -418,8 +422,9 @@ func (proc *Processor) evilHackForLIDMutation(
 		if err == nil && newValueMAC == nil {
 			var allKeys []*store.AppStateSyncKey
 			allKeys, err = proc.Store.AppStateKeys.GetAllAppStateSyncKeys(ctx)
-			for _, key := range allKeys {
+			for i, key := range allKeys {
 				altIndexMAC := concatAndHMAC(sha256.New, expandAppStateKeys(key.Data).Index, indexBytes)
+				triedIndexMACs[strconv.Itoa(i)] = hex.EncodeToString(newIndexMAC)
 				newValueMAC, err = proc.Store.AppState.GetAppStateMutationMAC(ctx, string(patchName), altIndexMAC)
 				if newValueMAC != nil {
 					newIndexMAC = altIndexMAC
@@ -438,7 +443,7 @@ func (proc *Processor) evilHackForLIDMutation(
 			Strs("old_index", index).
 			Hex("old_index_mac", oldIndexMAC).
 			Strs("new_index", newIndex).
-			Hex("new_index_mac", newIndexMAC).
+			Any("new_index_macs_attempted", triedIndexMACs).
 			Msg("DEBUG: No PN value MAC found for LID mutation")
 	} else {
 		zerolog.Ctx(ctx).Debug().
@@ -448,6 +453,7 @@ func (proc *Processor) evilHackForLIDMutation(
 			Strs("new_index", newIndex).
 			Hex("new_index_mac", newIndexMAC).
 			Hex("value_mac", newValueMAC).
+			Any("new_index_macs_attempted", triedIndexMACs).
 			Msg("Found matching PN value MAC for new LID mutation, using it for evil hack")
 	}
 	return