A target's settings move from the per-type JSON string in targets.config to columns: url, headers, timeout_seconds, forward_query, archive_expiry and archive_rotation. A column a type does not use stays empty. headers holds the header map as JSON text through GORM's JSON serializer, and archive_expiry holds a time.Duration, 0 meaning never, so nothing that reads a target parses it. The forms check each setting once, with the same refusals and messages, and the edit form is filled from the columns, so the per-type config structs, their parsers and the "could not be read" branches are gone. A delivery task carries the six settings in place of the JSON string. Model: opus-5-5
This commit is contained in:
@@ -23,7 +23,7 @@ func TestRedactor_RemovesSlackWebhookURL(t *testing.T) {
|
||||
|
||||
r := delivery.NewRedactor(&database.Target{
|
||||
Type: database.TargetTypeSlack,
|
||||
Config: `{"webhookUrl":"` + redactWebhookURL + `"}`,
|
||||
URL: redactWebhookURL,
|
||||
MaxAttempts: 1,
|
||||
})
|
||||
|
||||
@@ -54,7 +54,7 @@ func TestRedactor_RemovesSecretSeveredByACut(t *testing.T) {
|
||||
|
||||
r := delivery.NewRedactor(&database.Target{
|
||||
Type: database.TargetTypeSlack,
|
||||
Config: `{"webhookUrl":"` + redactWebhookURL + `"}`,
|
||||
URL: redactWebhookURL,
|
||||
MaxAttempts: 1,
|
||||
})
|
||||
|
||||
@@ -86,18 +86,19 @@ func TestRedactor_RedactsCredentialShapedHeaderValues(
|
||||
|
||||
r := delivery.NewRedactor(&database.Target{
|
||||
Type: database.TargetTypeHTTP,
|
||||
Config: `{"url":"https://example.com/in",` +
|
||||
`"headers":{` +
|
||||
`"Authorization":"Bearer AAAAAAAAAAAA",` +
|
||||
`"Cookie":"session=BBBBBBBBBBBB",` +
|
||||
`"X-Api-Key":"CCCCCCCCCCCC",` +
|
||||
`"X-Hub-Signature":"sha256=DDDDDDDDDDDD",` +
|
||||
`"X-Sig":"EEEEEEEEEEEE",` +
|
||||
`"X-Pass":"FFFFFFFFFFFF",` +
|
||||
`"X-HMAC":"GGGGGGGGGGGG",` +
|
||||
`"X-Credential":"HHHHHHHHHHHH",` +
|
||||
`"Accept":"application/json",` +
|
||||
`"User-Agent":"webhooker/1.0"}}`,
|
||||
URL: "https://example.com/in",
|
||||
Headers: map[string]string{
|
||||
headerAuthorization: "Bearer AAAAAAAAAAAA",
|
||||
"Cookie": "session=BBBBBBBBBBBB",
|
||||
probeHeaderName: "CCCCCCCCCCCC",
|
||||
"X-Hub-Signature": "sha256=DDDDDDDDDDDD",
|
||||
"X-Sig": "EEEEEEEEEEEE",
|
||||
"X-Pass": "FFFFFFFFFFFF",
|
||||
"X-HMAC": "GGGGGGGGGGGG",
|
||||
"X-Credential": "HHHHHHHHHHHH",
|
||||
"Accept": "application/json",
|
||||
headerUserAgent: "webhooker/1.0",
|
||||
},
|
||||
MaxAttempts: 1,
|
||||
})
|
||||
|
||||
@@ -136,9 +137,9 @@ func TestRedactor_IgnoresVeryShortHeaderValues(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
r := delivery.NewRedactor(&database.Target{
|
||||
Type: database.TargetTypeHTTP,
|
||||
Config: `{"url":"https://example.com/in",` +
|
||||
`"headers":{"X-Api-Key":"ab"}}`,
|
||||
Type: database.TargetTypeHTTP,
|
||||
URL: "https://example.com/in",
|
||||
Headers: map[string]string{probeHeaderName: "ab"},
|
||||
MaxAttempts: 1,
|
||||
})
|
||||
|
||||
@@ -155,7 +156,7 @@ func TestRedactor_RemovesBarePath(t *testing.T) {
|
||||
|
||||
r := delivery.NewRedactor(&database.Target{
|
||||
Type: database.TargetTypeSlack,
|
||||
Config: `{"webhookUrl":"` + redactWebhookURL + `"}`,
|
||||
URL: redactWebhookURL,
|
||||
MaxAttempts: 1,
|
||||
})
|
||||
|
||||
@@ -189,7 +190,7 @@ func TestRedactor_RemovesHTTPURLQueryAndUserinfo(t *testing.T) {
|
||||
|
||||
r := delivery.NewRedactor(&database.Target{
|
||||
Type: database.TargetTypeHTTP,
|
||||
Config: `{"url":"` + raw + `"}`,
|
||||
URL: raw,
|
||||
MaxAttempts: 1,
|
||||
})
|
||||
|
||||
@@ -239,7 +240,7 @@ func TestRedactor_RemovesEchoedQueryOfURLWithoutPath(t *testing.T) {
|
||||
} {
|
||||
r := delivery.NewRedactor(&database.Target{
|
||||
Type: database.TargetTypeHTTP,
|
||||
Config: `{"url":"` + dest + `"}`,
|
||||
URL: dest,
|
||||
MaxAttempts: 1,
|
||||
})
|
||||
|
||||
@@ -261,7 +262,7 @@ func TestRedactor_LeavesUnrelatedTextAlone(t *testing.T) {
|
||||
|
||||
r := delivery.NewRedactor(&database.Target{
|
||||
Type: database.TargetTypeSlack,
|
||||
Config: `{"webhookUrl":"` + redactWebhookURL + `"}`,
|
||||
URL: redactWebhookURL,
|
||||
MaxAttempts: 1,
|
||||
})
|
||||
|
||||
@@ -288,7 +289,7 @@ func TestRedactor_EmptyUserinfoDoesNotShredTheBody(t *testing.T) {
|
||||
|
||||
r := delivery.NewRedactor(&database.Target{
|
||||
Type: database.TargetTypeHTTP,
|
||||
Config: `{"url":"` + dest + `"}`,
|
||||
URL: dest,
|
||||
MaxAttempts: 1,
|
||||
})
|
||||
|
||||
@@ -306,11 +307,10 @@ func TestRedactor_EmptyUserinfoDoesNotShredTheBody(t *testing.T) {
|
||||
)
|
||||
}
|
||||
|
||||
// TestRedactor_ZeroValueAndConfiglessTargets pins that a
|
||||
// caller with no target, an unparseable config, or a target
|
||||
// type with no destination URL gets a redactor that changes
|
||||
// nothing rather than one that panics.
|
||||
func TestRedactor_ZeroValueAndConfiglessTargets(t *testing.T) {
|
||||
// TestRedactor_ZeroValueAndURLlessTargets pins that a caller
|
||||
// with no target, or a target with no destination URL, gets a
|
||||
// redactor that changes nothing rather than one that panics.
|
||||
func TestRedactor_ZeroValueAndURLlessTargets(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
const text = "some response body"
|
||||
@@ -323,8 +323,8 @@ func TestRedactor_ZeroValueAndConfiglessTargets(t *testing.T) {
|
||||
for _, tgt := range []database.Target{
|
||||
{Type: database.TargetTypeLog},
|
||||
{Type: database.TargetTypeDatabase},
|
||||
{Type: database.TargetTypeSlack, Config: "not json", MaxAttempts: 1},
|
||||
{Type: database.TargetTypeHTTP, Config: "", MaxAttempts: 1},
|
||||
{Type: database.TargetTypeSlack, MaxAttempts: 1},
|
||||
{Type: database.TargetTypeHTTP, MaxAttempts: 1},
|
||||
} {
|
||||
assert.Equal(
|
||||
t, text,
|
||||
|
||||
Reference in New Issue
Block a user