Commit 4dc8b73
authored
## Summary
\`PresetLoader.Load\` resolves bundled presets first and never falls
through, so a file at \`\$LOCAL_DIR/json-post.yaml\` placed hoping to
override the bundled \`json-post\` is silently ignored at attach time.
Same applies to every bundled name: \`slack\`, \`discord\`, \`teams\`,
\`matrix\`, \`ntfy\`, \`ntfy-token\`, \`gotify\`, \`pushover\`,
\`pagerduty\`.
\`AddLocalPresetDir\` now scans the registered directory for \`*.yaml\`
/ \`*.yml\` files whose stem collides with a bundled preset name and
emits a startup \`slog.Warn\` per match. Missing or unreadable
directories stay silent (operators commonly register a dir before
populating it).
Closes [#679](#679).
## Why not invert the lookup order
The issue body called this out explicitly: a local typo accidentally
shadowing \`slack.yaml\` would silently break Slack delivery for *every*
webhook on the host. Operators trust the bundled set to behave
consistently across hosts; warn-and-keep-bundled preserves that contract
while surfacing the override gap.
## Tests
Two new tests in \`middlewares/preset_test.go\` (reusing the existing
\`captureSlog\` helper from \`webhook_security_warn_test.go\`):
1. **\`TestPresetLoader_AddLocalPresetDir_WarnsOnBundledShadow\`** —
temp dir with \`json-post.yaml\` + \`slack.yml\` + \`my-custom.yaml\` +
\`json-post.txt\`, asserts warnings for the two bundled collisions but
NOT for the non-colliding file or the non-yaml file. Covers both
\`.yaml\` and \`.yml\` extensions.
2. **\`TestPresetLoader_AddLocalPresetDir_NoWarnOnMissingDir\`** —
registering a directory that doesn'"'"'t exist is silent, preserving the
existing \`/tmp/presets\` fixture behavior.
## Docs
New "**Preset Lookup Order**" subsection in \`docs/webhooks.md\`
documents the bundled-first precedence and rationale.
## CHANGELOG
Entry under \`[Unreleased]\` → \`### Added\`.
## Test plan
- [x] \`go test ./...\` passes (full repo, 14 packages, ~58s)
- [x] \`golangci-lint run\` clean
- [x] \`go vet ./...\` clean
- [ ] CI green
## References
- Surfaced in: [#677](#677)
(parallel-reviewer pass)
4 files changed
Lines changed: 175 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
10 | 14 | | |
11 | 15 | | |
12 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
618 | 618 | | |
619 | 619 | | |
620 | 620 | | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
621 | 633 | | |
622 | 634 | | |
623 | 635 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
| 13 | + | |
| 14 | + | |
12 | 15 | | |
13 | 16 | | |
14 | 17 | | |
| |||
140 | 143 | | |
141 | 144 | | |
142 | 145 | | |
143 | | - | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
144 | 159 | | |
145 | 160 | | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
146 | 211 | | |
147 | 212 | | |
148 | 213 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
324 | 325 | | |
325 | 326 | | |
326 | 327 | | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
327 | 420 | | |
328 | 421 | | |
329 | 422 | | |
| |||
0 commit comments