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 π
Go aicertificationcloud-engineeringcybercybersecuritycybersecurity-analystcybersecurity-certificationcybersecurity-certificationscybersecurity-educationcybersecurity-jobscybersecurity-portfoliocybersecurity-projectscybersecurity-toolsgrchackinglearningpentestingproject-repositoryprojetcspython
fix(canary-phase2): address audit findings before rollup
CarterPerez-dev1a240952c739
diff --git a/PROJECTS/beginner/canary-token-generator/backend/cmd/canary/main.go b/PROJECTS/beginner/canary-token-generator/backend/cmd/canary/main.goindex c0f88ec9..dea17cac 100644--- a/PROJECTS/beginner/canary-token-generator/backend/cmd/canary/main.go+++ b/PROJECTS/beginner/canary-token-generator/backend/cmd/canary/main.go@@ -5,6 +5,7 @@ package mainimport ("context"+ "errors""flag""fmt""log/slog"@@ -159,23 +160,28 @@ func gracefulShutdown()defer cancel()+ var errs []errorif err := srv.Shutdown(shutdownCtx, drainDelay); err != nil {logger.Error("server shutdown error", "error", err)+ errs = append(errs, fmt.Errorf("server shutdown: %w", err))}if telemetry != nil {if err := telemetry.Shutdown(shutdownCtx); err != nil {logger.Error("telemetry shutdown error", "error", err)+ errs = append(errs, fmt.Errorf("telemetry shutdown: %w", err))}}if err := rdb.Close(); err != nil {logger.Error("redis close error", "error", err)+ errs = append(errs, fmt.Errorf("redis close: %w", err))}if err := db.Close(); err != nil {logger.Error("database close error", "error", err)+ errs = append(errs, fmt.Errorf("database close: %w", err))}logger.Info("application stopped")- return nil+ return errors.Join(errs...)}func setupLogger(cfg config.LogConfig) *slog.Logger {diff --git a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pixel/pixel.go b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pixel/pixel.goindex 5b2159a7..dec64e3e 100644--- a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pixel/pixel.go+++ b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pixel/pixel.go@@ -3,7 +3,9 @@package pixel-var TransparentGIF = []byte{+import "slices"++var transparentGIF = []byte{0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x01, 0x00, 0x01, 0x00, 0x80, 0x00,0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x21, 0xf9, 0x04, 0x01, 0x00,0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,@@ -11,3 +13,11 @@ var TransparentGIF = []byte{}const ContentType = "image/gif"++func Clone() []byte {+ return slices.Clone(transparentGIF)+}++func Len() int {+ return len(transparentGIF)+}diff --git a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pixel/pixel_test.go b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pixel/pixel_test.goindex a5347cb3..7edc0839 100644--- a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pixel/pixel_test.go+++ b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/pixel/pixel_test.go@@ -24,27 +24,32 @@ var (gifTrailer = byte(0x3b))-func TestTransparentGIF_Length(t *testing.T) {- require.Len(t, pixel.TransparentGIF, expectedLength)+func TestLen_Is43(t *testing.T) {+ require.Equal(t, expectedLength, pixel.Len())}-func TestTransparentGIF_MagicBytes(t *testing.T) {+func TestClone_Length(t *testing.T) {+ require.Len(t, pixel.Clone(), expectedLength)+}++func TestClone_MagicBytes(t *testing.T) {+ g := pixel.Clone()require.True(t,- bytes.HasPrefix(pixel.TransparentGIF, gif89aMagic),+ bytes.HasPrefix(g, gif89aMagic),"expected GIF89a magic prefix, got % x",- pixel.TransparentGIF[:len(gif89aMagic)],+ g[:len(gif89aMagic)],)require.Equal(t,gifTrailer,- pixel.TransparentGIF[len(pixel.TransparentGIF)-1],+ g[len(g)-1],"expected trailing GIF terminator 0x3B",)}-func TestTransparentGIF_DecodesAsImageGIF(t *testing.T) {- img, err := gif.Decode(bytes.NewReader(pixel.TransparentGIF))+func TestClone_DecodesAsImageGIF(t *testing.T) {+ img, err := gif.Decode(bytes.NewReader(pixel.Clone()))require.NoError(t, err)require.NotNil(t, img)@@ -53,6 +58,26 @@ func TestTransparentGIF_DecodesAsImageGIF(t *testing.T) {require.Equal(t, expectedHeight, bounds.Dy())}+func TestClone_ReturnsIndependentCopy(t *testing.T) {+ a := pixel.Clone()+ b := pixel.Clone()+ require.Equal(t, a, b, "two clones must be byte-equal")++ a[0] = 0x00+ require.Equal(+ t,+ byte(0x47),+ b[0],+ "mutating one clone must not affect another",+ )+ require.Equal(+ t,+ byte(0x47),+ pixel.Clone()[0],+ "mutating one clone must not affect the package-internal source",+ )+}+func TestContentType_IsImageGIF(t *testing.T) {require.Equal(t, "image/gif", pixel.ContentType)}diff --git a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/webbug/generator.go b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/webbug/generator.goindex 47e17612..c0492b91 100644--- a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/webbug/generator.go+++ b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/webbug/generator.go@@ -5,6 +5,7 @@ package webbugimport ("context"+ "net""net/http""strings"@@ -50,25 +51,26 @@ func (g *Generator) Trigger(t *token.Token,r *http.Request,) (*event.Event, *generators.TriggerResponse, error) {- tokenID := ""- if t != nil {- tokenID = t.ID- }- evt := &event.Event{- TokenID: tokenID,- SourceIP: realIP(r),- UserAgent: optionalHeader(r.UserAgent()),- Referer: optionalHeader(r.Header.Get(headerReferer)),- }resp := &generators.TriggerResponse{StatusCode: http.StatusOK,ContentType: pixel.ContentType,- Body: pixel.TransparentGIF,+ Body: pixel.Clone(),ExtraHeaders: map[string]string{headerCacheControl: cacheControlNoStore,headerPragma: pragmaNoCache,},}++ if t == nil {+ return nil, resp, nil+ }++ evt := &event.Event{+ TokenID: t.ID,+ SourceIP: realIP(r),+ UserAgent: optionalHeader(r.UserAgent()),+ Referer: optionalHeader(r.Header.Get(headerReferer)),+ }return evt, resp, nil}@@ -84,12 +86,27 @@ func realIP(r *http.Request) string {if v := strings.TrimSpace(r.Header.Get(headerCFConnectingIP)); v != "" {return v}- if v := r.Header.Get(headerXForwardedFor); v != "" {- parts := strings.Split(v, ",")- return strings.TrimSpace(parts[len(parts)-1])+ if v := lastNonEmptyXFF(r.Header.Get(headerXForwardedFor)); v != "" {+ return v}if v := strings.TrimSpace(r.Header.Get(headerXRealIP)); v != "" {return v}+ if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {+ return host+ }return r.RemoteAddr}++func lastNonEmptyXFF(header string) string {+ if header == "" {+ return ""+ }+ parts := strings.Split(header, ",")+ for i := len(parts) - 1; i >= 0; i-- {+ if v := strings.TrimSpace(parts[i]); v != "" {+ return v+ }+ }+ return ""+}diff --git a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/webbug/generator_test.go b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/webbug/generator_test.goindex fc2c2d9a..c5018981 100644--- a/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/webbug/generator_test.go+++ b/PROJECTS/beginner/canary-token-generator/backend/internal/token/generators/webbug/generator_test.go@@ -106,72 +106,114 @@ func TestTrigger_RecordsEventWithRequestMetadata(t *testing.T) {},)- t.Run(- "source ip precedence CF > XFF (last) > XRI > RemoteAddr",- func(t *testing.T) {- cases := []struct {- name string- headers map[string]string- remote string- wantIP string- }{- {- name: "CF wins over XFF and XRI",- headers: map[string]string{- "CF-Connecting-IP": "203.0.113.10",- "X-Forwarded-For": "198.51.100.1, 198.51.100.2",- "X-Real-IP": "192.0.2.99",- },- remote: "127.0.0.1:9999",- wantIP: "203.0.113.10",+ t.Run("source ip precedence", func(t *testing.T) {+ cases := []struct {+ name string+ headers map[string]string+ remote string+ wantIP string+ }{+ {+ name: "CF wins over XFF and XRI",+ headers: map[string]string{+ "CF-Connecting-IP": "203.0.113.10",+ "X-Forwarded-For": "198.51.100.1, 198.51.100.2",+ "X-Real-IP": "192.0.2.99",},- {- name: "XFF rightmost wins over XRI when no CF",- headers: map[string]string{- "X-Forwarded-For": "198.51.100.1, 198.51.100.7",- "X-Real-IP": "192.0.2.99",- },- remote: "127.0.0.1:9999",- wantIP: "198.51.100.7",+ remote: "127.0.0.1:9999",+ wantIP: "203.0.113.10",+ },+ {+ name: "XFF rightmost wins over XRI when no CF",+ headers: map[string]string{+ "X-Forwarded-For": "198.51.100.1, 198.51.100.7",+ "X-Real-IP": "192.0.2.99",},- {- name: "XRI when no CF or XFF",- headers: map[string]string{- "X-Real-IP": "192.0.2.99",- },- remote: "127.0.0.1:9999",- wantIP: "192.0.2.99",+ remote: "127.0.0.1:9999",+ wantIP: "198.51.100.7",+ },+ {+ name: "XFF trailing-comma falls through to XRI",+ headers: map[string]string{+ "X-Forwarded-For": "198.51.100.1, ",+ "X-Real-IP": "192.0.2.99",},- {- name: "RemoteAddr when no proxy headers",- headers: nil,- remote: "127.0.0.1:9999",- wantIP: "127.0.0.1:9999",+ remote: "127.0.0.1:9999",+ wantIP: "198.51.100.1",+ },+ {+ name: "XFF entirely empty entries fall through to XRI",+ headers: map[string]string{+ "X-Forwarded-For": ", ,",+ "X-Real-IP": "192.0.2.99",},- {- name: "CF value is trimmed of whitespace",- headers: map[string]string{- "CF-Connecting-IP": " 203.0.113.10 ",- },- remote: "127.0.0.1:9999",- wantIP: "203.0.113.10",+ remote: "127.0.0.1:9999",+ wantIP: "192.0.2.99",+ },+ {+ name: "XRI when no CF or XFF",+ headers: map[string]string{+ "X-Real-IP": "192.0.2.99",},- }- for _, tc := range cases {- tc := tc- t.Run(tc.name, func(t *testing.T) {- r := httptest.NewRequest(http.MethodGet, "/c/token1", nil)- for k, v := range tc.headers {- r.Header.Set(k, v)- }- r.RemoteAddr = tc.remote- evt, _, err := g.Trigger(context.Background(), tok, r)- require.NoError(t, err)- require.Equal(t, tc.wantIP, evt.SourceIP)- })- }- },- )+ remote: "127.0.0.1:9999",+ wantIP: "192.0.2.99",+ },+ {+ name: "RemoteAddr IPv4 strips port",+ headers: nil,+ remote: "127.0.0.1:9999",+ wantIP: "127.0.0.1",+ },+ {+ name: "RemoteAddr IPv6 strips brackets and port",+ headers: nil,+ remote: "[2001:db8::1]:54321",+ wantIP: "2001:db8::1",+ },+ {+ name: "RemoteAddr loopback IPv6 strips brackets and port",+ headers: nil,+ remote: "[::1]:9999",+ wantIP: "::1",+ },+ {+ name: "RemoteAddr without port falls back to raw value",+ headers: nil,+ remote: "127.0.0.1",+ wantIP: "127.0.0.1",+ },+ {+ name: "XFF IPv6 rightmost",+ headers: map[string]string{+ "X-Forwarded-For": "198.51.100.1, 2001:db8::dead",+ },+ remote: "127.0.0.1:9999",+ wantIP: "2001:db8::dead",+ },+ {+ name: "CF value is trimmed of whitespace",+ headers: map[string]string{+ "CF-Connecting-IP": " 203.0.113.10 ",+ },+ remote: "127.0.0.1:9999",+ wantIP: "203.0.113.10",+ },+ }+ for _, tc := range cases {+ tc := tc+ t.Run(tc.name, func(t *testing.T) {+ r := httptest.NewRequest(http.MethodGet, "/c/token1", nil)+ for k, v := range tc.headers {+ r.Header.Set(k, v)+ }+ r.RemoteAddr = tc.remote+ evt, _, err := g.Trigger(context.Background(), tok, r)+ require.NoError(t, err)+ require.NotNil(t, evt)+ require.Equal(t, tc.wantIP, evt.SourceIP)+ })+ }+ })t.Run("missing user agent and referer record as nil pointers",@@ -183,6 +225,7 @@ func TestTrigger_RecordsEventWithRequestMetadata(t *testing.T) {evt, _, err := g.Trigger(context.Background(), tok, r)require.NoError(t, err)+ require.NotNil(t, evt)require.Nil(t,evt.UserAgent,@@ -208,11 +251,30 @@ func TestTrigger_ResponseIs43ByteGIF(t *testing.T) {require.Equal(t, http.StatusOK, resp.StatusCode)require.Equal(t, pixel.ContentType, resp.ContentType)require.Len(t, resp.Body, gifByteLength)- require.Equal(t, pixel.TransparentGIF, resp.Body)+ require.Equal(t, pixel.Clone(), resp.Body)require.Equal(t, cacheControlNoStore, resp.ExtraHeaders["Cache-Control"])require.Equal(t, pragmaNoCache, resp.ExtraHeaders["Pragma"])}+func TestTrigger_ResponseBodyIsIndependentCopyPerCall(t *testing.T) {+ g := webbug.New()+ tok := newWebbugToken("abc")+ r := httptest.NewRequest(http.MethodGet, "/c/abc", nil)++ _, resp1, err := g.Trigger(context.Background(), tok, r)+ require.NoError(t, err)+ _, resp2, err := g.Trigger(context.Background(), tok, r)+ require.NoError(t, err)++ resp1.Body[0] = 0x00+ require.Equal(+ t,+ byte(0x47),+ resp2.Body[0],+ "each Trigger call must produce an independent body slice",+ )+}+func TestTrigger_TokenNotFound_StillReturnsGIF(t *testing.T) {g := webbug.New()r := httptest.NewRequest(http.MethodGet, "/c/does-not-exist", nil)@@ -228,19 +290,10 @@ func TestTrigger_TokenNotFound_StillReturnsGIF(t *testing.T) {require.NotNil(t, resp, "nil-token path must still return GIF response")require.Equal(t, http.StatusOK, resp.StatusCode)require.Equal(t, pixel.ContentType, resp.ContentType)- require.Equal(t, pixel.TransparentGIF, resp.Body)- require.NotNil(t, evt, "event value still produced for forensic continuity")- require.Empty(- t,- evt.TokenID,- "empty TokenID signals nil token; persistence layer decides what to do",- )- require.Equal(+ require.Equal(t, pixel.Clone(), resp.Body)+ require.Nil(t,- "203.0.113.100",- evt.SourceIP,- "source IP still captured for forensics",+ evt,+ "nil-token path returns nil event so the handler cannot accidentally persist a row with empty TokenID (FK violation)",)- require.NotNil(t, evt.UserAgent)- require.Equal(t, "curl/8.0.0", *evt.UserAgent)}