From 34e72bdd08ba007bdfdaecf2fb8d65c8cffcae19 Mon Sep 17 00:00:00 2001 From: Peter Sanchez Date: Wed, 18 Sep 2024 18:32:07 -0600 Subject: [PATCH] Fixing Remote IP extraction. --- cmd/api/main.go | 6 +----- cmd/links/main.go | 6 +----- cmd/list/main.go | 6 +----- cmd/short/main.go | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/cmd/api/main.go b/cmd/api/main.go index 3f6de7b..c1b1d6f 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -100,11 +100,7 @@ func run() error { e := echo.New() // https://echo.labstack.com/docs/ip-address // Deployed via Caddy at the moment which uses X-Forwarded-For header by default - e.IPExtractor = echo.ExtractIPFromXFFHeader( - echo.TrustLoopback(false), - echo.TrustLinkLocal(false), - echo.TrustPrivateNet(false), - ) + e.IPExtractor = echo.ExtractIPFromXFFHeader() // email work queue and service, general task queue eq := email.NewQueue() diff --git a/cmd/links/main.go b/cmd/links/main.go index 640a5f5..39689f9 100644 --- a/cmd/links/main.go +++ b/cmd/links/main.go @@ -170,11 +170,7 @@ func run() error { e := echo.New() // https://echo.labstack.com/docs/ip-address // Deployed via Caddy at the moment which uses X-Forwarded-For header by default - e.IPExtractor = echo.ExtractIPFromXFFHeader( - echo.TrustLoopback(false), - echo.TrustLinkLocal(false), - echo.TrustPrivateNet(false), - ) + e.IPExtractor = echo.ExtractIPFromXFFHeader() // email work queue and service, general task queue eq := email.NewQueue() diff --git a/cmd/list/main.go b/cmd/list/main.go index 8a440a8..79cc818 100644 --- a/cmd/list/main.go +++ b/cmd/list/main.go @@ -68,11 +68,7 @@ func run() error { e := echo.New() // https://echo.labstack.com/docs/ip-address // Deployed via Caddy at the moment which uses X-Forwarded-For header by default - e.IPExtractor = echo.ExtractIPFromXFFHeader( - echo.TrustLoopback(false), - echo.TrustLinkLocal(false), - echo.TrustPrivateNet(false), - ) + e.IPExtractor = echo.ExtractIPFromXFFHeader() eq := email.NewQueue() wq := work.NewQueue("general") diff --git a/cmd/short/main.go b/cmd/short/main.go index f6941b5..f975d04 100644 --- a/cmd/short/main.go +++ b/cmd/short/main.go @@ -66,11 +66,7 @@ func run() error { e := echo.New() // https://echo.labstack.com/docs/ip-address // Deployed via Caddy at the moment which uses X-Forwarded-For header by default - e.IPExtractor = echo.ExtractIPFromXFFHeader( - echo.TrustLoopback(false), - echo.TrustLinkLocal(false), - echo.TrustPrivateNet(false), - ) + e.IPExtractor = echo.ExtractIPFromXFFHeader() eq := email.NewQueue() wq := work.NewQueue("general") -- 2.45.2