From fe3ae49cce770521a8dfd7d14762c5263ed170e5 Mon Sep 17 00:00:00 2001 From: Dan Cech Date: Tue, 13 Dec 2022 09:33:05 -0500 Subject: [PATCH] Backend: Consistently use context RemoteAddr function to determine remote address. (#60201) consistently use context RemoteAddr function to determine remote address --- pkg/api/login.go | 2 +- pkg/api/org_invite.go | 2 +- pkg/api/signup.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/api/login.go b/pkg/api/login.go index 9b23ad05b6e..17c23dcd745 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -195,7 +195,7 @@ func (hs *HTTPServer) LoginPost(c *models.ReqContext) response.Response { ReqContext: c, Username: cmd.User, Password: cmd.Password, - IpAddress: c.Req.RemoteAddr, + IpAddress: c.RemoteAddr(), Cfg: hs.Cfg, } diff --git a/pkg/api/org_invite.go b/pkg/api/org_invite.go index 9a1b7610dce..674c0d1f922 100644 --- a/pkg/api/org_invite.go +++ b/pkg/api/org_invite.go @@ -102,7 +102,7 @@ func (hs *HTTPServer) AddOrgInvite(c *models.ReqContext) response.Response { return response.Error(500, "Could not generate random string", err) } cmd.Role = inviteDto.Role - cmd.RemoteAddr = c.Req.RemoteAddr + cmd.RemoteAddr = c.RemoteAddr() if err := hs.tempUserService.CreateTempUser(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to save invite to database", err) diff --git a/pkg/api/signup.go b/pkg/api/signup.go index a654b8e5e22..c0bc0b02c68 100644 --- a/pkg/api/signup.go +++ b/pkg/api/signup.go @@ -56,7 +56,7 @@ func (hs *HTTPServer) SignUp(c *models.ReqContext) response.Response { if err != nil { return response.Error(500, "Failed to generate random string", err) } - cmd.RemoteAddr = c.Req.RemoteAddr + cmd.RemoteAddr = c.RemoteAddr() if err := hs.tempUserService.CreateTempUser(c.Req.Context(), &cmd); err != nil { return response.Error(500, "Failed to create signup", err)