@@ -695,12 +695,14 @@ def __user_is_authorized(self, user, password):
695
695
:param User user: User instance
696
696
:param str password: Password
697
697
"""
698
+ remote_addr = request .headers .get ("X-Forwarded-For" , request .remote_addr ).split ("," )[0 ].strip ()
699
+ self .logger .info ("Remote IP is %s" % remote_addr )
698
700
# Check if IP blacklisted
699
701
if self .ip_blacklist_duration > 0 :
700
- entry = ip_blacklist .lookup (request . remote_addr )
702
+ entry = ip_blacklist .lookup (remote_addr )
701
703
count = entry ['value' ] if entry else 0
702
704
if count >= self .ip_blacklist_max_attempt_count :
703
- self .logger .info ("IP %s is blacklisted with %s attempts" % (request . remote_addr , count ))
705
+ self .logger .info ("IP %s is blacklisted with %s attempts" % (remote_addr , count ))
704
706
return False , i18n .t ('auth.ip_blacklisted' )
705
707
706
708
if user is None or user .password_hash is None :
@@ -724,10 +726,10 @@ def __user_is_authorized(self, user, password):
724
726
725
727
# add to ip blacklist
726
728
if self .ip_blacklist_duration > 0 :
727
- entry = ip_blacklist .lookup (request . remote_addr )
729
+ entry = ip_blacklist .lookup (remote_addr )
728
730
count = entry ['value' ] if entry else 0
729
- ip_blacklist .set (request . remote_addr , count + 1 , self .ip_blacklist_duration )
730
- self .logger .info ("Attempt count for IP %s: %s" % (request . remote_addr , count + 1 ))
731
+ ip_blacklist .set (remote_addr , count + 1 , self .ip_blacklist_duration )
732
+ self .logger .info ("Attempt count for IP %s: %s" % (remote_addr , count + 1 ))
731
733
732
734
# increase failed login attempts counter
733
735
user .failed_sign_in_count += 1
0 commit comments