Skip to content

Building 70 Projects ranging from beginner to advanced so anyone can β€” learn from, build upon, use as a reference, or even copy directly. Owned by my cybersecurity company πŸ‘‡

fix(canary): PDF trigger URL uses ?p= query pad; handler trims trailing _

CarterPerez-dev30ebda39d5fb
diff --git a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pdf/generator.go b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pdf/generator.go
index 6b02b3c2..11a98f44 100644
--- a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pdf/generator.go
+++ b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pdf/generator.go
@@ -35,6 +35,8 @@ const (
padChar = "_"
+ queryPadPrefix = "?p="
+
contentType = "application/pdf"
defaultFilename = "Document.pdf"
)
@@ -71,8 +73,7 @@ func (g *Generator) Generate(
)
}
- padded := triggerURL +
- strings.Repeat(padChar, PlaceholderLength-len(triggerURL))
+ padded := padTriggerURL(triggerURL)
out := bytes.Replace(
pdfTemplate,
@@ -140,3 +141,16 @@ func resolveFilename(name *string) string {
}
return trimmed
}
+
+func padTriggerURL(triggerURL string) string {
+ needed := PlaceholderLength - len(triggerURL)
+ switch {
+ case needed == 0:
+ return triggerURL
+ case needed >= len(queryPadPrefix):
+ return triggerURL + queryPadPrefix +
+ strings.Repeat(padChar, needed-len(queryPadPrefix))
+ default:
+ return triggerURL + strings.Repeat(padChar, needed)
+ }
+}
diff --git a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pdf/generator_test.go b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pdf/generator_test.go
index a87edba1..9cef05d4 100644
--- a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pdf/generator_test.go
+++ b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pdf/generator_test.go
@@ -286,6 +286,34 @@ func TestGenerate_ContainsTriggerURL(t *testing.T) {
)
}
+func TestGenerate_ByteAfterTokenIDIsNotUnderscore(t *testing.T) {
+ g := pdf.New()
+ art, err := g.Generate(
+ context.Background(),
+ newPDFToken("token42"),
+ testBaseURL,
+ )
+ require.NoError(t, err)
+
+ urlPrefix := testBaseURL + "/c/token42"
+ idx := bytes.Index(art.Content, []byte(urlPrefix))
+ require.GreaterOrEqual(
+ t,
+ idx,
+ 0,
+ "trigger URL prefix must be present in PDF output",
+ )
+ after := art.Content[idx+len(urlPrefix)]
+ require.NotEqual(
+ t,
+ byte('_'),
+ after,
+ "byte immediately after the token id must not be underscore β€” "+
+ "otherwise Acrobat fetches /c/token42____ and the canary silently "+
+ "no-ops on lookup (audit finding F2)",
+ )
+}
+
func TestGenerate_PlaceholderRemoved(t *testing.T) {
g := pdf.New()
art, err := g.Generate(
diff --git a/PROJECTS/beginner/canary-token-generator/backend/internal/token/handler.go b/PROJECTS/beginner/canary-token-generator/backend/internal/token/handler.go
index c5e44cf9..bbfa2adc 100644
--- a/PROJECTS/beginner/canary-token-generator/backend/internal/token/handler.go
+++ b/PROJECTS/beginner/canary-token-generator/backend/internal/token/handler.go
@@ -162,7 +162,7 @@ func (h *Handler) CreateToken(w http.ResponseWriter, r *http.Request) {
}
func (h *Handler) HandleTrigger(w http.ResponseWriter, r *http.Request) {
- id := chi.URLParam(r, urlParamTokenID)
+ id := strings.TrimRight(chi.URLParam(r, urlParamTokenID), "_")
if id == "" {
http.NotFound(w, r)
return
diff --git a/PROJECTS/beginner/canary-token-generator/backend/internal/token/handler_test.go b/PROJECTS/beginner/canary-token-generator/backend/internal/token/handler_test.go
index 6f59b268..82ff508c 100644
--- a/PROJECTS/beginner/canary-token-generator/backend/internal/token/handler_test.go
+++ b/PROJECTS/beginner/canary-token-generator/backend/internal/token/handler_test.go
@@ -220,6 +220,40 @@ func TestHandleTrigger_KnownTokenReturnsResponseAndRecordsEvent(t *testing.T) {
require.Len(t, rec.events, 1)
}
+func TestHandleTrigger_TrimsTrailingUnderscoresFromPaddedID(t *testing.T) {
+ gen := &triggerGen{
+ tokenType: token.TypeWebbug,
+ artifact: generators.Artifact{Kind: generators.KindURL},
+ resp: &generators.TriggerResponse{
+ StatusCode: 200,
+ ContentType: "image/gif",
+ Body: []byte{0x47},
+ },
+ evt: &event.Event{SourceIP: "1.2.3.4"},
+ }
+ h, repo, rec := newWebbugHandler(t, gen)
+
+ tok := &token.Token{
+ ID: "abcdef012345", ManageID: "m", Type: token.TypeWebbug,
+ AlertChannel: token.ChannelWebhook, Enabled: true,
+ Metadata: json.RawMessage(`{}`),
+ }
+ require.NoError(t, repo.Insert(context.Background(), tok))
+
+ r := chi.NewRouter()
+ h.RegisterTriggerRoutes(r)
+
+ w := httptest.NewRecorder()
+ padded := "/c/abcdef012345____________________"
+ r.ServeHTTP(w, httptest.NewRequest(http.MethodGet, padded, nil))
+
+ require.Equal(t, http.StatusOK, w.Code)
+ require.Len(t, rec.events, 1,
+ "trailing-underscore padded id must still resolve to the real token "+
+ "so PDFs already in the field (carrying padded URLs) record events "+
+ "instead of silently no-opping (audit finding F2)")
+}
+
func TestHandleTrigger_UnknownTokenStillReturnsArtifactShape(t *testing.T) {
gen := &triggerGen{
tokenType: token.TypeWebbug,