Skip to content
Open
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
4 changes: 4 additions & 0 deletions sanitize/exempts.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ var entityLevelExemptedFields = map[string]map[string]struct{}{
"PartialLink": {"Path": {}},
"Plugin": {"Name": {}},
"Route": {"Methods": {}, "Expression": {}},
"Service": {"CACertificates": {}},

// Special handling
"CACertificate": {"Cert": {}, "CertDigest": {}},
Expand All @@ -31,6 +32,9 @@ var entityLevelExemptedFields = map[string]map[string]struct{}{
var configLevelExemptedFields = map[string]struct{}{
"ID": {},

// CA certificate IDs are preserved, so references must remain unchanged.
"ca_certificates": {},

// Plugin specific exemptions, that can't be generated from schema
"dictionary_name": {}, // present in rla, upstream_oauth
"lock_dictionary_name": {}, // present in rla
Expand Down
35 changes: 35 additions & 0 deletions sanitize/sanitize_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -517,3 +517,38 @@ func Test_patternBasedSanitization(t *testing.T) {
})
}
}

func TestSanitizePreservesCACertificateReferences(t *testing.T) {
const certificateID = "80552e11-f2ac-438f-b38d-65380d3f648a"
content := &file.Content{
Services: []file.FService{{Service: kong.Service{
Host: kong.String("private.example.com"),
CACertificates: []*string{kong.String(certificateID)},
}}},
Plugins: []file.FPlugin{{Plugin: kong.Plugin{
Name: kong.String("mtls-auth"),
Config: kong.Configuration{
"ca_certificates": []interface{}{certificateID},
"private_value": "sensitive",
},
}}},
CACertificates: []file.FCACertificate{{CACertificate: kong.CACertificate{
ID: kong.String(certificateID),
Cert: kong.String("original certificate"),
CertDigest: kong.String("original digest"),
}}},
}
sanitizer := NewSanitizer(&SanitizerOptions{
Ctx: context.Background(),
Content: content.DeepCopy(),
Salt: "test-salt",
})
result, err := sanitizer.Sanitize()
require.NoError(t, err)
assert.Equal(t, certificateID, *result.CACertificates[0].ID)
assert.Equal(t, certificateID, *result.Services[0].CACertificates[0])
assert.Equal(t, []interface{}{certificateID}, result.Plugins[0].Config["ca_certificates"])
assert.NotEqual(t, *content.Services[0].Host, *result.Services[0].Host)
assert.NotEqual(t, "sensitive", result.Plugins[0].Config["private_value"])
assert.NotEqual(t, *content.CACertificates[0].Cert, *result.CACertificates[0].Cert)
}