mdbq 4.0.96__py3-none-any.whl → 4.0.97__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.96'
+VERSION = '4.0.97'

mdbq/auth/auth_backend.py

@@ -223,6 +223,7 @@ class StandaloneAuthManager:
                     user_id BIGINT UNSIGNED NOT NULL,
                     device_id VARCHAR(255) CHARACTER SET ascii NOT NULL,
                     device_fingerprint VARCHAR(255) CHARACTER SET ascii NOT NULL,
+                    login_domain VARCHAR(255) NOT NULL DEFAULT '' COMMENT '登录时的域名',
                     device_name VARCHAR(255) NOT NULL DEFAULT 'Unknown Device',
                     custom_name VARCHAR(255) DEFAULT NULL COMMENT '用户自定义设备名称',
                     device_type ENUM('mobile', 'desktop', 'tablet', 'unknown') NOT NULL DEFAULT 'unknown',
@@ -242,13 +243,15 @@ class StandaloneAuthManager:
                     trust_level ENUM('trusted', 'normal', 'suspicious') NOT NULL DEFAULT 'normal' COMMENT '设备信任级别',
                     
                     UNIQUE KEY uk_device_sessions_device_id (device_id),
-                    UNIQUE KEY uk_device_sessions_user_fingerprint (user_id, device_fingerprint),
+                    UNIQUE KEY uk_device_sessions_user_fingerprint_domain (user_id, device_fingerprint, login_domain),
                     KEY idx_device_sessions_user_id (user_id),
                     KEY idx_device_sessions_user_device (user_id, device_id),
                     KEY idx_device_sessions_last_activity (last_activity),
                     KEY idx_device_sessions_is_active (is_active),
                     KEY idx_device_sessions_fingerprint (device_fingerprint),
                     KEY idx_device_sessions_trust_level (trust_level),
+                    KEY idx_device_sessions_login_domain (login_domain),
+                    KEY idx_device_sessions_user_domain (user_id, login_domain),
                     
                     CONSTRAINT fk_device_sessions_user_id 
                         FOREIGN KEY (user_id) 
@@ -621,7 +624,7 @@ class StandaloneAuthManager:
         except jwt.InvalidTokenError:
             return None
     
-    def create_or_update_device_session(self, user_id, ip_address, user_agent, device_info=None):
+    def create_or_update_device_session(self, user_id, ip_address, user_agent, device_info=None, login_domain=''):
         """创建或更新设备会话"""
         # 解析用户代理获取基本信息
         parsed_ua = self._parse_user_agent(user_agent)
@@ -634,7 +637,8 @@ class StandaloneAuthManager:
             **(device_info or {})
         }
         
-        device_fingerprint = self._generate_device_fingerprint(full_device_info)
+        # 生成包含域名的设备指纹
+        device_fingerprint = self._generate_device_fingerprint(full_device_info, login_domain)
         device_id = secrets.token_urlsafe(32)
         
         conn = self.pool.connection()
@@ -643,11 +647,11 @@ class StandaloneAuthManager:
         try:
             current_time_utc = datetime.now(timezone.utc)
             
-            # 检查设备是否已存在
+            # 检查设备是否已存在（包含域名匹配）
             cursor.execute('''
                 SELECT id, device_id FROM device_sessions 
-                WHERE user_id = %s AND device_fingerprint = %s AND is_active = 1
-            ''', (user_id, device_fingerprint))
+                WHERE user_id = %s AND device_fingerprint = %s AND login_domain = %s AND is_active = 1
+            ''', (user_id, device_fingerprint, login_domain))
             
             existing_session = cursor.fetchone()
             
@@ -661,7 +665,7 @@ class StandaloneAuthManager:
                     SET current_ip = %s, user_agent = %s, last_activity = %s,
                         device_name = %s, device_type = %s, platform = %s, browser = %s,
                         browser_version = %s, screen_resolution = %s, timezone_offset = %s,
-                        language = %s, hardware_concurrency = %s
+                        language = %s, hardware_concurrency = %s, login_domain = %s
                     WHERE id = %s
                 ''', (ip_address, user_agent, current_time_utc,
                       full_device_info.get('device_name', 'Unknown Device'), 
@@ -673,6 +677,7 @@ class StandaloneAuthManager:
                       full_device_info.get('timezone_offset'),
                       full_device_info.get('language'),
                       full_device_info.get('hardware_concurrency'),
+                      login_domain,
                       device_session_id))
             else:
                 # 检查设备数量限制
@@ -699,11 +704,11 @@ class StandaloneAuthManager:
                 # 创建新设备会话
                 cursor.execute('''
                     INSERT INTO device_sessions (
-                        user_id, device_id, device_fingerprint, device_name, device_type,
+                        user_id, device_id, device_fingerprint, login_domain, device_name, device_type,
                         platform, browser, browser_version, screen_resolution, timezone_offset,
                         language, hardware_concurrency, current_ip, first_ip, user_agent, last_activity
-                    ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
-                ''', (user_id, device_id, device_fingerprint, 
+                    ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
+                ''', (user_id, device_id, device_fingerprint, login_domain,
                       full_device_info.get('device_name', 'Unknown Device'),
                       full_device_info.get('device_type', 'unknown'),
                       full_device_info.get('platform'), 
@@ -1253,9 +1258,9 @@ class StandaloneAuthManager:
             WHERE id = %s
         ''', (device_session_id,))
     
-    def _generate_device_fingerprint(self, device_info):
+    def _generate_device_fingerprint(self, device_info, login_domain=''):
         """
-        生成稳定的设备指纹
+        生成稳定的设备指纹（包含登录域名）
         
         Args:
             device_info (dict): 设备信息
@@ -1265,8 +1270,9 @@ class StandaloneAuthManager:
                 - language: 浏览器语言
                 - hardware_concurrency: CPU核心数
                 - platform: 平台信息
+            login_domain (str): 登录时的域名
         """
-        # 提取稳定的设备特征
+        # 提取稳定的设备特征（包含登录域名）
         stable_features = [
             device_info.get('user_agent', ''),
             device_info.get('screen_resolution', ''),
@@ -1274,6 +1280,7 @@ class StandaloneAuthManager:
             device_info.get('language', ''),
             str(device_info.get('hardware_concurrency', 0)),
             device_info.get('platform', ''),
+            login_domain or '',  # 登录域名作为设备指纹的一部分
         ]
         
         # 过滤空值并连接
@@ -1383,7 +1390,7 @@ class StandaloneAuthManager:
         
         try:
             cursor.execute('''
-                SELECT device_id, device_fingerprint, device_name, custom_name, device_type, 
+                SELECT device_id, device_fingerprint, login_domain, device_name, custom_name, device_type, 
                        platform, browser, browser_version, screen_resolution, timezone_offset,
                        language, hardware_concurrency, current_ip, first_ip, 
                        last_activity, created_at, is_active, trust_level
@@ -1408,6 +1415,7 @@ class StandaloneAuthManager:
                     'device_id': device['device_id'],
                     'device_name': display_name,
                     'custom_name': device['custom_name'],
+                    'login_domain': device['login_domain'],
                     'device_type': device['device_type'],
                     'platform': device['platform'],
                     'browser': device['browser'],

{mdbq-4.0.96.dist-info → mdbq-4.0.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mdbq
-Version: 4.0.96
+Version: 4.0.97
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-4.0.96.dist-info → mdbq-4.0.97.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=upYmcfx0UWjE76j0j97qCRGjDZGCKhrJ15LsMJQXb8E,18
+mdbq/__version__.py,sha256=Wugnfrfi17MIisDJ2bCMK15l65XkooAlWs6nIab3BTw,18
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
-mdbq/auth/auth_backend.py,sha256=R0qwedMEtJxbKcDUkl1ELl4lVTunFeiXsa_Xo3LHiQU,76455
+mdbq/auth/auth_backend.py,sha256=FYsBS2fvowfdfDkl4i2k64JwgN5PWOwVqNGjRoqtCLE,77215
 mdbq/auth/rate_limiter.py,sha256=e7K8pMQlZ1vm1N-c0HBH8tbAwzcmXSRiAl81JNZ369g,26192
 mdbq/js/__init__.py,sha256=hpMi3_ZKwIWkzc0LnKL-SY9AS-7PYFHq0izYTgEvxjc,30
 mdbq/js/jc.py,sha256=FOc6HOOTJwnoZLZmgmaE1SQo9rUnVhXmefhKMD2MlDA,13229
@@ -33,7 +33,7 @@ mdbq/route/routes.py,sha256=QVGfTvDgu0CpcKCvk1ra74H8uojgqTLUav1fnVAqLEA,29433
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
 mdbq/selenium/get_driver.py,sha256=1NTlVUE6QsyjTrVVVqTO2LOnYf578ccFWlWnvIXGtic,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.0.96.dist-info/METADATA,sha256=XQFXH6TeJlSgpYJN7v8h_H0x0-qUJyh36kV-X4TzOBc,364
-mdbq-4.0.96.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.0.96.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.96.dist-info/RECORD,,
+mdbq-4.0.97.dist-info/METADATA,sha256=6P2tfV2sppjE7Y0niKXl1bqeYLa_bYfcLqhSMNr1ygg,364
+mdbq-4.0.97.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.0.97.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.97.dist-info/RECORD,,