diff --git a/.env.example b/.env.example index 82eef0b0..7d1c3e4a 100644 --- a/.env.example +++ b/.env.example @@ -116,8 +116,8 @@ DELIVERYMQ_MAX_CONCURRENCY=1 # DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_SIGNATURE_HEADER=false # DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_TIMESTAMP_HEADER=false # DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_TOPIC_HEADER=false -# DESTINATIONS_WEBHOOK_SIGNATURE_CONTENT_TEMPLATE={{.Timestamp.Unix}}.{{.Body}} -# DESTINATIONS_WEBHOOK_SIGNATURE_HEADER_TEMPLATE=t={{.Timestamp.Unix}},v0={{.Signatures | join ","}} +# DESTINATIONS_WEBHOOK_SIGNATURE_CONTENT_TEMPLATE={{.Body}} +# DESTINATIONS_WEBHOOK_SIGNATURE_HEADER_TEMPLATE=v0={{.Signatures | join ","}} # DESTINATIONS_WEBHOOK_SIGNATURE_ENCODING="hex" # DESTINATIONS_WEBHOOK_SIGNATURE_ALGORITHM="hmac-sha256" diff --git a/docs/pages/guides/migrate-to-outpost.mdx b/docs/pages/guides/migrate-to-outpost.mdx index bea9de38..ad966ea2 100644 --- a/docs/pages/guides/migrate-to-outpost.mdx +++ b/docs/pages/guides/migrate-to-outpost.mdx @@ -85,17 +85,17 @@ You can customize the following webhook features and behaviors. The full path to Templates use the [Go template syntax](https://pkg.go.dev/text/template). -| YAML | Environment Variable | Default Value | -| ---------------------------------- | ------------------------------------------------------- | ------------------------------------------------------ | -| `header_prefix` | `DESTINATIONS_WEBHOOK_HEADER_PREFIX` | `x-outpost` | -| `disable_default_event_id_header` | `DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_EVENT_ID_HEADER` | `false` | -| `disable_default_signature_header` | `DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_SIGNATURE_HEADER` | `false` | -| `disable_default_timestamp_header` | `DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_TIMESTAMP_HEADER` | `false` | -| `disable_default_topic_header` | `DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_TOPIC_HEADER` | `false` | -| `signature_content_template` | `DESTINATIONS_WEBHOOK_SIGNATURE_CONTENT_TEMPLATE` | `{{.Timestamp.Unix}}.{{.Body}}` | -| `signature_header_template` | `DESTINATIONS_WEBHOOK_SIGNATURE_HEADER_TEMPLATE` | `t={{.Timestamp.Unix}},v0={{.Signatures \| join ","}}` | -| `signature_encoding` | `DESTINATIONS_WEBHOOK_SIGNATURE_ENCODING` | `hex` | -| `signature_algorithm` | `DESTINATIONS_WEBHOOK_SIGNATURE_ALGORITHM` | `hmac-sha256` | +| YAML | Environment Variable | Default Value | +| ---------------------------------- | ------------------------------------------------------- | -------------------------------- | +| `header_prefix` | `DESTINATIONS_WEBHOOK_HEADER_PREFIX` | `x-outpost` | +| `disable_default_event_id_header` | `DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_EVENT_ID_HEADER` | `false` | +| `disable_default_signature_header` | `DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_SIGNATURE_HEADER` | `false` | +| `disable_default_timestamp_header` | `DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_TIMESTAMP_HEADER` | `false` | +| `disable_default_topic_header` | `DESTINATIONS_WEBHOOK_DISABLE_DEFAULT_TOPIC_HEADER` | `false` | +| `signature_content_template` | `DESTINATIONS_WEBHOOK_SIGNATURE_CONTENT_TEMPLATE` | `{{.Body}}` | +| `signature_header_template` | `DESTINATIONS_WEBHOOK_SIGNATURE_HEADER_TEMPLATE` | `v0={{.Signatures \| join ","}}` | +| `signature_encoding` | `DESTINATIONS_WEBHOOK_SIGNATURE_ENCODING` | `hex` | +| `signature_algorithm` | `DESTINATIONS_WEBHOOK_SIGNATURE_ALGORITHM` | `hmac-sha256` | ### Migration Process diff --git a/internal/config/config.go b/internal/config/config.go index b31aec01..f8b84ef2 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -176,8 +176,8 @@ func (c *Config) InitDefaults() { MetadataPath: "config/outpost/destinations", Webhook: DestinationWebhookConfig{ HeaderPrefix: "x-outpost-", - SignatureContentTemplate: "{{.Timestamp.Unix}}.{{.Body}}", - SignatureHeaderTemplate: "t={{.Timestamp.Unix}},v0={{.Signatures | join \",\"}}", + SignatureContentTemplate: "{{.Body}}", + SignatureHeaderTemplate: "v0={{.Signatures | join \",\"}}", SignatureEncoding: "hex", SignatureAlgorithm: "hmac-sha256", },