chore: code improvements

- In Store.autogenerateHasher, avoid modifying foundVariants.
- Improve comment for Hasher.HashWithSalt

Author: gwossum

authorization/storage.go

@@ -256,12 +256,15 @@ func (s *Store) autogenerateHasher(ctx context.Context, variantName string) (*Au
 	}
 
 	var decoderVariants []influxdb2_algo.Variant
-	// Make sure we have the hasher variant we will make in there and that it is first in the list.
+	// Make sure we have the hasher variant we will make in there and that it is first in the list,
+	// so that it is the first one we try to lookup a given token.
 	hasherVariant := influxdb2_algo.NewVariant(variantName)
 	decoderVariants = append(decoderVariants, hasherVariant)
-	delete(foundVariants, hasherVariant)
 	for variant := range foundVariants {
-		decoderVariants = append(decoderVariants, variant)
+		// Avoid having 2 hasherVariant decoders.
+		if variant != hasherVariant {
+			decoderVariants = append(decoderVariants, variant)
+		}
 	}
 
 	hasher, err := NewAuthorizationHasher(WithHasherVariant(hasherVariant), WithDecoderVariants(decoderVariants))

pkg/crypt/algorithm/influxdb2/hasher.go

@@ -59,8 +59,9 @@ func (h *Hasher) Hash(password string) (hashed algorithm.Digest, err error) {
 	return d, nil
 }
 
-// HashWithSalt is an overload of plaintext.Digest that also accepts a salt.
-func (h *Hasher) HashWithSalt(password string, _ []byte) (hashed algorithm.Digest, err error) {
+// HashWithSalt is an overload of Hasher.Digest that also accepts a salt. The salt is ignored since we can't support
+// salted hashes because we need to lookup the auth record by the token.
+func (h *Hasher) HashWithSalt(password string, salt []byte) (hashed algorithm.Digest, err error) {
 	return h.Hash(password)
 }