github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 用户异地登陆bug

pull/8745/head
feng626 2022-08-12 18:36:17 +08:00 committed by Jiangjie.Bai
parent 18af5e8c4a
commit 0eaaa7b4f6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/authentication/utils.py
View File

@ -1,8 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
import ipaddress
from urllib.parse import urljoin from urllib.parse import urljoin
from django.conf import settings from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from common.utils import validate_ip, get_ip_city, get_request_ip from common.utils import validate_ip, get_ip_city, get_request_ip
from common.utils import get_logger from common.utils import get_logger
@ -23,8 +25,9 @@ def check_different_city_login_if_need(user, request):
else: else:
city = get_ip_city(ip) or DEFAULT_CITY city = get_ip_city(ip) or DEFAULT_CITY
city_white = ['LAN', ] city_white = [_('LAN'), 'LAN']
if city not in city_white: is_private = ipaddress.ip_address(ip).is_private
if not is_private:
last_user_login = UserLoginLog.objects.exclude(city__in=city_white) \ last_user_login = UserLoginLog.objects.exclude(city__in=city_white) \
.filter(username=user.username, status=True).first() .filter(username=user.username, status=True).first()