Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: obfuscate the fingerprint encrypting parameters #47

Merged
merged 1 commit into from
Jun 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions generator/encrypt.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,21 @@ func decodeValue(value string) (enc []byte, err error) {
return base64.StdEncoding.DecodeString(value)
}

func secretFingerprintIDKey(value, salt []byte) []byte {
return argon2.IDKey(value, salt, 1, 46*1024, 1, 32)
}

func secretFingerprintObfuscatedValue(value string, salt []byte) []byte {
sum := secretFingerprintIDKey([]byte(value), salt)
mod := int(sum[31]) % 16
if mod == 0 {
mod = 1
}

truncateIndex := 16 + (int(sum[0]) % mod)
return sum[:truncateIndex]
}

func secretFingerprintCryptoKey(secretName, secretType, key, value string, b64encoded bool,
salt []byte,
recipients ...config.UpdateKSopsRecipient,
Expand All @@ -312,17 +327,17 @@ func secretFingerprintCryptoKey(secretName, secretType, key, value string, b64en
secretValue = encodeValue(value)
}

buffer.WriteString(secretName)
buffer.WriteString(secretType)
buffer.WriteString(key)
buffer.WriteString(secretValue)
buffer.Write(secretFingerprintObfuscatedValue(secretName, salt))
buffer.Write(secretFingerprintObfuscatedValue(secretType, salt))
buffer.Write(secretFingerprintObfuscatedValue(key, salt))
buffer.Write(secretFingerprintObfuscatedValue(secretValue, salt))

for _, recipient := range recipients {
buffer.WriteString(recipient.Type)
buffer.WriteString(recipient.Recipient)
buffer.Write(secretFingerprintObfuscatedValue(recipient.Type, salt))
buffer.Write(secretFingerprintObfuscatedValue(recipient.Recipient, salt))
}

return argon2.IDKey(buffer.Bytes(), salt, 1, 46*1024, 1, 32)
return secretFingerprintIDKey(buffer.Bytes(), salt)
}

func secretFingerprintSeal(secretName, secretType, key, value string, b64encoded bool,
Expand Down
9 changes: 9 additions & 0 deletions generator/encrypt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,15 @@ func TestSecretFingerprint(t *testing.T) {
if err != nil {
t.Errorf("Expect no errors got %v", err)
}

fp, err = secretFingerprintSeal("secret-name", "Opaque", "test", "", false, recipients...)
if err != nil {
t.Errorf("Expect no errors got %v", err)
}

if fp == "" {
t.Errorf("Expect non-empty sealed fingerprint, got %s", fp)
}
})

t.Run("generate encrypted files with encrypted_fp added", func(t *testing.T) {
Expand Down
Loading