Skip to content

Commit 0a03f47

Browse files
dmzoneilldjyasin
authored andcommitted
Replace REMOTE_ADDR with ansible_base.lib.utils.requests.get_remote_host (ansible#15175)
1 parent cad82d4 commit 0a03f47

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

awx/api/generics.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
# django-ansible-base
3434
from ansible_base.rest_filters.rest_framework.field_lookup_backend import FieldLookupBackend
3535
from ansible_base.lib.utils.models import get_all_field_names
36+
from ansible_base.lib.utils.requests import get_remote_host
3637
from ansible_base.rbac.models import RoleEvaluation, RoleDefinition
3738
from ansible_base.rbac.permission_registry import permission_registry
3839

@@ -93,8 +94,9 @@ def get(self, request, *args, **kwargs):
9394

9495
def post(self, request, *args, **kwargs):
9596
ret = super(LoggedLoginView, self).post(request, *args, **kwargs)
97+
ip = get_remote_host(request) # request.META.get('REMOTE_ADDR', None)
9698
if request.user.is_authenticated:
97-
logger.info(smart_str(u"User {} logged in from {}".format(self.request.user.username, request.META.get('REMOTE_ADDR', None))))
99+
logger.info(smart_str(u"User {} logged in from {}".format(self.request.user.username, ip)))
98100
ret.set_cookie(
99101
'userLoggedIn', 'true', secure=getattr(settings, 'SESSION_COOKIE_SECURE', False), samesite=getattr(settings, 'USER_COOKIE_SAMESITE', 'Lax')
100102
)
@@ -103,7 +105,7 @@ def post(self, request, *args, **kwargs):
103105
return ret
104106
else:
105107
if 'username' in self.request.POST:
106-
logger.warning(smart_str(u"Login failed for user {} from {}".format(self.request.POST.get('username'), request.META.get('REMOTE_ADDR', None))))
108+
logger.warning(smart_str(u"Login failed for user {} from {}".format(self.request.POST.get('username'), ip)))
107109
ret.status_code = 401
108110
return ret
109111

@@ -211,11 +213,12 @@ def finalize_response(self, request, response, *args, **kwargs):
211213
return response
212214

213215
if response.status_code >= 400:
216+
ip = get_remote_host(request) # request.META.get('REMOTE_ADDR', None)
214217
msg_data = {
215218
'status_code': response.status_code,
216219
'user_name': request.user,
217220
'url_path': request.path,
218-
'remote_addr': request.META.get('REMOTE_ADDR', None),
221+
'remote_addr': ip,
219222
}
220223

221224
if type(response.data) is dict:

0 commit comments

Comments
 (0)