33
33
# django-ansible-base
34
34
from ansible_base .rest_filters .rest_framework .field_lookup_backend import FieldLookupBackend
35
35
from ansible_base .lib .utils .models import get_all_field_names
36
+ from ansible_base .lib .utils .requests import get_remote_host
36
37
from ansible_base .rbac .models import RoleEvaluation , RoleDefinition
37
38
from ansible_base .rbac .permission_registry import permission_registry
38
39
@@ -93,8 +94,9 @@ def get(self, request, *args, **kwargs):
93
94
94
95
def post (self , request , * args , ** kwargs ):
95
96
ret = super (LoggedLoginView , self ).post (request , * args , ** kwargs )
97
+ ip = get_remote_host (request ) # request.META.get('REMOTE_ADDR', None)
96
98
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 )))
98
100
ret .set_cookie (
99
101
'userLoggedIn' , 'true' , secure = getattr (settings , 'SESSION_COOKIE_SECURE' , False ), samesite = getattr (settings , 'USER_COOKIE_SAMESITE' , 'Lax' )
100
102
)
@@ -103,7 +105,7 @@ def post(self, request, *args, **kwargs):
103
105
return ret
104
106
else :
105
107
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 )))
107
109
ret .status_code = 401
108
110
return ret
109
111
@@ -211,11 +213,12 @@ def finalize_response(self, request, response, *args, **kwargs):
211
213
return response
212
214
213
215
if response .status_code >= 400 :
216
+ ip = get_remote_host (request ) # request.META.get('REMOTE_ADDR', None)
214
217
msg_data = {
215
218
'status_code' : response .status_code ,
216
219
'user_name' : request .user ,
217
220
'url_path' : request .path ,
218
- 'remote_addr' : request . META . get ( 'REMOTE_ADDR' , None ) ,
221
+ 'remote_addr' : ip ,
219
222
}
220
223
221
224
if type (response .data ) is dict :
0 commit comments