mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-12-17 17:42:37 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
79600e25f1 | ||
|
|
2604f35bb8 |
@@ -59,6 +59,10 @@ def check_different_city_login(user, request):
|
|||||||
else:
|
else:
|
||||||
city = get_ip_city(ip) or DEFAULT_CITY
|
city = get_ip_city(ip) or DEFAULT_CITY
|
||||||
|
|
||||||
last_user_login = UserLoginLog.objects.filter(username=user.username, status=True).first()
|
city_white = ['LAN', ]
|
||||||
if last_user_login and last_user_login.city != city:
|
if city not in city_white:
|
||||||
DifferentCityLoginMessage(user, ip, city).publish_async()
|
last_user_login = UserLoginLog.objects.exclude(city__in=city_white) \
|
||||||
|
.filter(username=user.username, status=True).first()
|
||||||
|
|
||||||
|
if last_user_login and last_user_login.city != city:
|
||||||
|
DifferentCityLoginMessage(user, ip, city).publish_async()
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import threading
|
|||||||
import json
|
import json
|
||||||
from redis.exceptions import ConnectionError
|
from redis.exceptions import ConnectionError
|
||||||
from channels.generic.websocket import JsonWebsocketConsumer
|
from channels.generic.websocket import JsonWebsocketConsumer
|
||||||
|
from django.db import close_old_connections
|
||||||
|
|
||||||
from common.utils import get_logger
|
from common.utils import get_logger
|
||||||
from .site_msg import SiteMessageUtil
|
from .site_msg import SiteMessageUtil
|
||||||
@@ -65,8 +66,11 @@ class SiteMsgWebsocket(JsonWebsocketConsumer):
|
|||||||
logger.debug('Decode json error: ', e)
|
logger.debug('Decode json error: ', e)
|
||||||
except ConnectionError:
|
except ConnectionError:
|
||||||
logger.debug('Redis chan closed')
|
logger.debug('Redis chan closed')
|
||||||
|
finally:
|
||||||
|
close_old_connections()
|
||||||
|
|
||||||
def disconnect(self, close_code):
|
def disconnect(self, close_code):
|
||||||
if self.chan is not None:
|
if self.chan is not None:
|
||||||
self.chan.close()
|
self.chan.close()
|
||||||
self.close()
|
self.close()
|
||||||
|
close_old_connections()
|
||||||
|
|||||||
Reference in New Issue
Block a user