4 files changed, 30 insertions(+), 0 deletions(-)

M cmd/api/main.go
M cmd/links/main.go
M cmd/list/main.go
M cmd/short/main.go

@@ 79,6 79,13 @@ 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),
+	)
 
 	// email work queue and service, general task queue
 	eq := email.NewQueue()

@@ 162,6 162,13 @@ func run() error {
 	tlsman := cmd.LoadAutoTLS(config, db, models.DomainServiceLinks)
 
 	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),
+	)
 
 	// email work queue and service, general task queue
 	eq := email.NewQueue()

@@ 66,6 66,14 @@ func run() error {
 	defer db.Close()
 
 	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),
+	)
+
 	eq := email.NewQueue()
 	wq := work.NewQueue("general")
 

@@ 64,6 64,14 @@ func run() error {
 	defer db.Close()
 
 	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),
+	)
+
 	eq := email.NewQueue()
 	wq := work.NewQueue("general")