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

mdbq/__version__.py

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

mdbq/auth/auth_backend.py

@@ -221,24 +221,37 @@ class StandaloneAuthManager:
                 CREATE TABLE IF NOT EXISTS device_sessions (
                     id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
                     user_id BIGINT UNSIGNED NOT NULL,
-                    device_id VARCHAR(64) CHARACTER SET ascii NOT NULL,
-                    device_fingerprint VARCHAR(128) CHARACTER SET ascii NOT NULL,
-                    device_name VARCHAR(100) NOT NULL DEFAULT 'Unknown Device',
+                    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',
                     platform VARCHAR(50) DEFAULT NULL,
                     browser VARCHAR(50) DEFAULT NULL,
-                    ip_address VARCHAR(45) NOT NULL,
+                    browser_version VARCHAR(40) DEFAULT NULL,
+                    screen_resolution VARCHAR(40) DEFAULT NULL COMMENT '屏幕分辨率',
+                    timezone_offset INT DEFAULT NULL COMMENT '时区偏移（分钟）',
+                    language VARCHAR(20) DEFAULT NULL COMMENT '浏览器语言',
+                    hardware_concurrency TINYINT UNSIGNED DEFAULT NULL COMMENT 'CPU核心数',
+                    current_ip VARCHAR(45) NOT NULL COMMENT '当前IP地址',
+                    first_ip VARCHAR(45) NOT NULL COMMENT '首次登录IP',
                     user_agent TEXT NOT NULL,
                     last_activity TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
                     created_at TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
                     is_active TINYINT(1) NOT NULL DEFAULT 1,
+                    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_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) 
@@ -611,10 +624,21 @@ class StandaloneAuthManager:
         except jwt.InvalidTokenError:
             return None
     
-    def create_or_update_device_session(self, user_id, ip_address, user_agent):
+    def create_or_update_device_session(self, user_id, ip_address, user_agent, device_info=None, login_domain=''):
         """创建或更新设备会话"""
-        device_fingerprint = self._generate_device_fingerprint(user_agent, ip_address)
-        device_info = self._parse_user_agent(user_agent)
+        # 解析用户代理获取基本信息
+        parsed_ua = self._parse_user_agent(user_agent)
+        
+        # 合并设备信息
+        full_device_info = {
+            'user_agent': user_agent,
+            'platform': parsed_ua.get('platform'),
+            **parsed_ua,
+            **(device_info or {})
+        }
+        
+        # 生成包含域名的设备指纹
+        device_fingerprint = self._generate_device_fingerprint(full_device_info, login_domain)
         device_id = secrets.token_urlsafe(32)
         
         conn = self.pool.connection()
@@ -623,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()
             
@@ -638,12 +662,23 @@ class StandaloneAuthManager:
                 
                 cursor.execute('''
                     UPDATE device_sessions 
-                    SET ip_address = %s, user_agent = %s, last_activity = %s,
-                        device_name = %s, device_type = %s, platform = %s, browser = %s
+                    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, login_domain = %s
                     WHERE id = %s
                 ''', (ip_address, user_agent, current_time_utc,
-                      device_info['device_name'], device_info['device_type'],
-                      device_info['platform'], device_info['browser'], device_session_id))
+                      full_device_info.get('device_name', 'Unknown Device'), 
+                      full_device_info.get('device_type', 'unknown'),
+                      full_device_info.get('platform'), 
+                      full_device_info.get('browser'),
+                      full_device_info.get('browser_version'),
+                      full_device_info.get('screen_resolution'),
+                      full_device_info.get('timezone_offset'),
+                      full_device_info.get('language'),
+                      full_device_info.get('hardware_concurrency'),
+                      login_domain,
+                      device_session_id))
             else:
                 # 检查设备数量限制
                 cursor.execute('''
@@ -669,16 +704,25 @@ class StandaloneAuthManager:
                 # 创建新设备会话
                 cursor.execute('''
                     INSERT INTO device_sessions (
-                        user_id, device_id, device_fingerprint, device_name, device_type,
-                        platform, browser, ip_address, user_agent, last_activity
-                    ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
-                ''', (user_id, device_id, device_fingerprint, device_info['device_name'],
-                      device_info['device_type'], device_info['platform'], device_info['browser'],
-                      ip_address, user_agent, current_time_utc))
+                        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, %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'), 
+                      full_device_info.get('browser'),
+                      full_device_info.get('browser_version'),
+                      full_device_info.get('screen_resolution'),
+                      full_device_info.get('timezone_offset'),
+                      full_device_info.get('language'),
+                      full_device_info.get('hardware_concurrency'),
+                      ip_address, ip_address, user_agent, current_time_utc))
                 
                 device_session_id = cursor.lastrowid
             
-            return device_session_id, device_id, device_info['device_name']
+            return device_session_id, device_id, full_device_info.get('device_name', 'Unknown Device')
             
         finally:
             cursor.close()
@@ -1214,10 +1258,36 @@ class StandaloneAuthManager:
             WHERE id = %s
         ''', (device_session_id,))
     
-    def _generate_device_fingerprint(self, user_agent, ip_address):
-        """生成设备指纹"""
-        fingerprint_data = f"{user_agent}:{ip_address}:{datetime.now().strftime('%Y%m%d')}"
-        return hashlib.sha256(fingerprint_data.encode()).hexdigest()[:32]
+    def _generate_device_fingerprint(self, device_info, login_domain=''):
+        """
+        生成稳定的设备指纹（包含登录域名）
+        
+        Args:
+            device_info (dict): 设备信息
+                - user_agent: 用户代理
+                - screen_resolution: 屏幕分辨率
+                - timezone_offset: 时区偏移
+                - language: 浏览器语言
+                - hardware_concurrency: CPU核心数
+                - platform: 平台信息
+            login_domain (str): 登录时的域名
+        """
+        # 提取稳定的设备特征（包含登录域名）
+        stable_features = [
+            device_info.get('user_agent', ''),
+            device_info.get('screen_resolution', ''),
+            str(device_info.get('timezone_offset', 0)),
+            device_info.get('language', ''),
+            str(device_info.get('hardware_concurrency', 0)),
+            device_info.get('platform', ''),
+            login_domain or '',  # 登录域名作为设备指纹的一部分
+        ]
+        
+        # 过滤空值并连接
+        fingerprint_data = ':'.join(filter(None, stable_features))
+        
+        # 生成SHA256哈希
+        return hashlib.sha256(fingerprint_data.encode('utf-8')).hexdigest()[:32]
     
     def _parse_user_agent(self, user_agent):
         """解析User-Agent获取设备信息"""
@@ -1320,8 +1390,10 @@ class StandaloneAuthManager:
         
         try:
             cursor.execute('''
-                SELECT device_id, device_fingerprint, device_name, device_type, platform, browser,
-                       ip_address, last_activity, created_at, is_active
+                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
                 FROM device_sessions 
                 WHERE user_id = %s AND is_active = 1
                 ORDER BY last_activity DESC
@@ -1336,13 +1408,25 @@ class StandaloneAuthManager:
                 if is_current:
                     current_device_id = device['device_id']
                 
+                # 生成显示名称（优先使用自定义名称）
+                display_name = device['custom_name'] or device['device_name']
+                
                 devices_list.append({
                     'device_id': device['device_id'],
-                    'device_name': device['device_name'],
+                    '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'],
-                    'ip_address': device['ip_address'],
+                    'browser_version': device['browser_version'],
+                    'screen_resolution': device['screen_resolution'],
+                    'timezone_offset': device['timezone_offset'],
+                    'language': device['language'],
+                    'hardware_concurrency': device['hardware_concurrency'],
+                    'current_ip': device['current_ip'],
+                    'first_ip': device['first_ip'],
+                    'trust_level': device['trust_level'],
                     'last_activity': device['last_activity'].isoformat() if device['last_activity'] else None,
                     'created_at': device['created_at'].isoformat() if device['created_at'] else None,
                     'is_current': is_current
@@ -1528,6 +1612,73 @@ class StandaloneAuthManager:
             cursor.close()
             conn.close()
 
+    def rename_device(self, user_id, device_id, custom_name):
+        """重命名设备"""
+        conn = self.pool.connection()
+        cursor = conn.cursor()
+        
+        try:
+            # 验证设备是否属于该用户
+            cursor.execute('''
+                SELECT id FROM device_sessions 
+                WHERE user_id = %s AND device_id = %s AND is_active = 1
+            ''', (user_id, device_id))
+            
+            device = cursor.fetchone()
+            
+            if not device:
+                return {'success': False, 'message': '设备不存在或已失效'}
+            
+            # 更新自定义名称
+            cursor.execute('''
+                UPDATE device_sessions 
+                SET custom_name = %s 
+                WHERE id = %s
+            ''', (custom_name.strip() if custom_name else None, device['id']))
+            
+            return {'success': True, 'message': '设备重命名成功'}
+            
+        except Exception as e:
+            return {'success': False, 'message': f'设备重命名失败: {str(e)}'}
+        finally:
+            cursor.close()
+            conn.close()
+
+    def set_device_trust_level(self, user_id, device_id, trust_level):
+        """设置设备信任级别"""
+        if trust_level not in ['trusted', 'normal', 'suspicious']:
+            return {'success': False, 'message': '无效的信任级别'}
+        
+        conn = self.pool.connection()
+        cursor = conn.cursor()
+        
+        try:
+            # 验证设备是否属于该用户
+            cursor.execute('''
+                SELECT id FROM device_sessions 
+                WHERE user_id = %s AND device_id = %s AND is_active = 1
+            ''', (user_id, device_id))
+            
+            device = cursor.fetchone()
+            
+            if not device:
+                return {'success': False, 'message': '设备不存在或已失效'}
+            
+            # 更新信任级别
+            cursor.execute('''
+                UPDATE device_sessions 
+                SET trust_level = %s 
+                WHERE id = %s
+            ''', (trust_level, device['id']))
+            
+            return {'success': True, 'message': '设备信任级别更新成功'}
+            
+        except Exception as e:
+            return {'success': False, 'message': f'设备信任级别更新失败: {str(e)}'}
+        finally:
+            cursor.close()
+            conn.close()
+
 
 # Flask集成装饰器
 def require_auth(auth_manager):

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

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

{mdbq-4.0.95.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=_cjJRgt5f4NvaVHrfLAZ5D43gJ6Uuxh9IhEFJwJ5Kc0,18
+mdbq/__version__.py,sha256=Wugnfrfi17MIisDJ2bCMK15l65XkooAlWs6nIab3BTw,18
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
-mdbq/auth/auth_backend.py,sha256=54xSg9pDw5W7otm1dcvksQiJLRGDKuNRb83whUOjI_0,69933
+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.95.dist-info/METADATA,sha256=n82sUxYXuss5vPMrmpxRv3IQtOOjGlam91iAgYv8n5w,364
-mdbq-4.0.95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.0.95.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.95.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,,