From 4b10e61ca65eb818137ec23d49fd8d9a2c58d298 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 May 2026 17:11:17 +0000 Subject: [PATCH 1/2] Bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.2.5 to 5.3.0. - [Release notes](https://github.com/go-chi/chi/releases) - [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md) - [Commits](https://github.com/go-chi/chi/compare/v5.2.5...v5.3.0) --- updated-dependencies: - dependency-name: github.com/go-chi/chi/v5 dependency-version: 5.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 91f3468b..5401cc47 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( codnect.io/chrono v1.1.3 github.com/bwmarrin/discordgo v0.29.0 github.com/cenkalti/backoff/v4 v4.3.0 - github.com/go-chi/chi/v5 v5.2.5 + github.com/go-chi/chi/v5 v5.3.0 github.com/hashicorp/vault/api v1.23.0 github.com/hashicorp/vault/api/auth/userpass v0.12.0 github.com/nats-io/nats-server/v2 v2.14.0 diff --git a/go.sum b/go.sum index 68330dc1..51b97f76 100644 --- a/go.sum +++ b/go.sum @@ -155,8 +155,8 @@ github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmV github.com/fxamacker/cbor/v2 v2.9.1 h1:2rWm8B193Ll4VdjsJY28jxs70IdDsHRWgQYAI80+rMQ= github.com/fxamacker/cbor/v2 v2.9.1/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug= -github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0= +github.com/go-chi/chi/v5 v5.3.0 h1:halUjDxhshgXHMrao5bB8eNBXo/rnzwr8m5m36glehM= +github.com/go-chi/chi/v5 v5.3.0/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= From 12e10aa0c89e641f916042b3a1a5252642d75307 Mon Sep 17 00:00:00 2001 From: Nikolay Eskov Date: Fri, 29 May 2026 02:41:36 +0300 Subject: [PATCH 2/2] Replace deprecated middleware. --- cmd/bots/internal/bots/api/api.go | 4 +++- pkg/api/api.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/bots/internal/bots/api/api.go b/cmd/bots/internal/bots/api/api.go index b4a1a0e6..e82ed587 100644 --- a/cmd/bots/internal/bots/api/api.go +++ b/cmd/bots/internal/bots/api/api.go @@ -59,7 +59,9 @@ func NewBotAPI( } r := chi.NewRouter() r.Use(middleware.RequestID) - r.Use(middleware.RealIP) + // For nginx/cloudflare specific headers. + r.Use(middleware.ClientIPFromHeader("X-Real-IP")) // Nginx with ngx_http_realip_module. + r.Use(middleware.ClientIPFromHeader("CF-Connecting-IP")) // Cloudflare. r.Use(middleware.RequestLogger(&middleware.DefaultLogFormatter{ Logger: newMWLog(logger), NoColor: !development, diff --git a/pkg/api/api.go b/pkg/api/api.go index 372d99a1..17828f55 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -77,7 +77,9 @@ func NewAPI( } r := chi.NewRouter() r.Use(middleware.RequestID) - r.Use(middleware.RealIP) + // For nginx/cloudflare specific headers. + r.Use(middleware.ClientIPFromHeader("X-Real-IP")) // Nginx with ngx_http_realip_module. + r.Use(middleware.ClientIPFromHeader("CF-Connecting-IP")) // Cloudflare. r.Use(middleware.RequestLogger(&middleware.DefaultLogFormatter{ Logger: newMWLog(logger), NoColor: !development,