From b7045fb3d9715efe202ac0c37e02da3ad002c82a Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sat, 31 Jan 2026 13:07:42 +0200 Subject: [PATCH] fix azure proxy --- lib/normalize_client_ip_middleware.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/normalize_client_ip_middleware.rb b/lib/normalize_client_ip_middleware.rb index 41be3377..5e382856 100644 --- a/lib/normalize_client_ip_middleware.rb +++ b/lib/normalize_client_ip_middleware.rb @@ -6,9 +6,16 @@ class NormalizeClientIpMiddleware end def call(env) - if env['HTTP_CLIENT_IP'].present? && env['HTTP_X_CLIENT_IP'].present? && - env['HTTP_CLIENT_IP'].starts_with?("#{env['HTTP_X_CLIENT_IP']}:") - env['HTTP_CLIENT_IP'] = env['HTTP_X_CLIENT_IP'] + if env['HTTP_CLIENT_IP'].present? + if env['HTTP_X_CLIENT_IP'].present? && + env['HTTP_CLIENT_IP'].starts_with?("#{env['HTTP_X_CLIENT_IP']}:") + env['HTTP_CLIENT_IP'] = env['HTTP_X_CLIENT_IP'] + end + + if env['HTTP_X_FORWARDED_FOR'].present? && + env['HTTP_X_FORWARDED_FOR'].sub(/:\d+\z/, '') == env['HTTP_CLIENT_IP'] + env['HTTP_X_FORWARDED_FOR'] = env['HTTP_CLIENT_IP'] + end end @app.call(env)