mdbq 4.0.102__py3-none-any.whl → 4.0.104__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.102'
+VERSION = '4.0.104'

mdbq/auth/auth_backend.py

@@ -147,8 +147,8 @@ class StandaloneAuthManager:
                 ping=1,
                 charset='utf8mb4',
                 cursorclass=pymysql.cursors.DictCursor,
-                autocommit=True,  # 启用自动提交，避免锁冲突
-                init_command="SET time_zone = '+00:00'"
+                autocommit=True  # 启用自动提交，避免锁冲突
+                # 使用系统本地时区，不强制设置UTC
             )
             
         except Exception as e:
@@ -515,15 +515,15 @@ class StandaloneAuthManager:
                 }
             
             # 检查账户锁定状态
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             if locked_until:
                 if locked_until.tzinfo is None:
                     locked_until = locked_until.replace(tzinfo=timezone.utc)
                 elif locked_until.tzinfo != timezone.utc:
                     locked_until = locked_until.astimezone(timezone.utc)
                 
-                if locked_until > current_time_utc:
-                    remaining_seconds = int((locked_until - current_time_utc).total_seconds())
+                if locked_until > current_time:
+                    remaining_seconds = int((locked_until - current_time).total_seconds())
                     self._log_login_attempt(username_or_email, ip_address, user_agent, 'failure', 'account_locked', user_id)
                     self._record_ip_failure(ip_address, 'login')
                     return {
@@ -540,7 +540,7 @@ class StandaloneAuthManager:
                 
                 if login_attempts >= self.auth_config['max_login_attempts']:
                     lockout_duration = self.auth_config['lockout_duration']
-                    locked_until = current_time_utc + timedelta(seconds=lockout_duration)
+                    locked_until = current_time + timedelta(seconds=lockout_duration)
                     cursor.execute('''
                         UPDATE users SET login_attempts = %s, locked_until = %s WHERE id = %s
                     ''', (login_attempts, locked_until, user_id))
@@ -573,7 +573,7 @@ class StandaloneAuthManager:
             # 登录成功，重置尝试次数
             cursor.execute('''
                 UPDATE users SET login_attempts = 0, locked_until = NULL, last_login = %s WHERE id = %s
-            ''', (current_time_utc, user_id))
+            ''', (current_time, user_id))
             
             # 记录成功登录
             self._log_login_attempt(username_or_email, ip_address, user_agent, 'success', None, user_id)
@@ -586,7 +586,7 @@ class StandaloneAuthManager:
                 'email': email,
                 'role': role,
                 'permissions': self._safe_json_parse(permissions),
-                'last_login': current_time_utc.isoformat()
+                'last_login': current_time.isoformat()
             }
             
         finally:
@@ -595,16 +595,16 @@ class StandaloneAuthManager:
     
     def generate_access_token(self, user_info):
         """生成访问令牌"""
-        now_utc = datetime.now(timezone.utc)
-        exp_utc = now_utc + timedelta(seconds=self.auth_config['access_token_expires'])
+        now = datetime.now()
+        exp = now + timedelta(seconds=self.auth_config['access_token_expires'])
         
         payload = {
             'user_id': user_info['user_id'],
             'username': user_info['username'],
             'role': user_info['role'],
             'permissions': user_info['permissions'],
-            'iat': int(now_utc.timestamp()),
-            'exp': int(exp_utc.timestamp()),
+            'iat': int(now.timestamp()),
+            'exp': int(exp.timestamp()),
             'type': 'access'
         }
         
@@ -646,7 +646,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             # 软删除：将该用户在该域名下的相同设备指纹的所有活跃会话标记为非活跃
             cursor.execute('''
@@ -702,7 +702,7 @@ class StandaloneAuthManager:
                   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))
+                  ip_address, ip_address, user_agent, current_time))
             
             device_session_id = cursor.lastrowid
             
@@ -716,9 +716,9 @@ class StandaloneAuthManager:
         """生成刷新令牌"""
         token = secrets.token_urlsafe(64)
         token_hash = hashlib.sha256(token.encode()).hexdigest()
-        current_time_utc = datetime.now(timezone.utc)
-        expires_at = current_time_utc + timedelta(seconds=self.auth_config['refresh_token_expires'])
-        absolute_expires_at = current_time_utc + timedelta(days=self.auth_config['absolute_refresh_expires_days'])
+        current_time = datetime.now()
+        expires_at = current_time + timedelta(seconds=self.auth_config['refresh_token_expires'])
+        absolute_expires_at = current_time + timedelta(days=self.auth_config['absolute_refresh_expires_days'])
         
         conn = self.pool.connection()
         cursor = conn.cursor()
@@ -737,7 +737,7 @@ class StandaloneAuthManager:
                     rotation_count, max_rotations, created_at
                 ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
             ''', (token_hash, token, user_info['user_id'], device_session_id, expires_at,
-                  absolute_expires_at, 0, self.auth_config['max_refresh_rotations'], current_time_utc))
+                  absolute_expires_at, 0, self.auth_config['max_refresh_rotations'], current_time))
             
             return token
             
@@ -758,8 +758,7 @@ class StandaloneAuthManager:
             
             try:
                 # 验证刷新令牌
-                current_time_utc = datetime.now(timezone.utc)
-                current_time_naive = current_time_utc.replace(tzinfo=None)
+                current_time = datetime.now()
                 
                 cursor.execute('''
                     SELECT rt.user_id, rt.device_session_id, rt.expires_at, rt.absolute_expires_at,
@@ -775,7 +774,7 @@ class StandaloneAuthManager:
                       AND rt.rotation_count < rt.max_rotations
                       AND rt.is_revoked = 0
                       AND ds.is_active = 1
-                ''', (token_hash, current_time_naive, current_time_naive))
+                ''', (token_hash, current_time, current_time))
                 
                 result = cursor.fetchone()
                 
@@ -787,7 +786,7 @@ class StandaloneAuthManager:
                     UPDATE device_sessions 
                     SET last_activity = %s 
                     WHERE id = %s
-                ''', (current_time_utc, result['device_session_id']))
+                ''', (current_time, result['device_session_id']))
                 
                 # 生成新的tokens
                 user_info = {
@@ -803,7 +802,7 @@ class StandaloneAuthManager:
                 # 生成新的refresh token（轮换）
                 new_token = secrets.token_urlsafe(64)
                 new_token_hash = hashlib.sha256(new_token.encode()).hexdigest()
-                token_expires_at = current_time_utc + timedelta(seconds=self.auth_config['refresh_token_expires'])
+                token_expires_at = current_time + timedelta(seconds=self.auth_config['refresh_token_expires'])
                 
                 # 删除旧token并插入新token
                 cursor.execute('''
@@ -818,7 +817,7 @@ class StandaloneAuthManager:
                     ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
                 ''', (new_token_hash, new_token, result['user_id'], result['device_session_id'], 
                       token_expires_at, result['absolute_expires_at'],
-                      result['rotation_count'] + 1, result['max_rotations'], current_time_utc))
+                      result['rotation_count'] + 1, result['max_rotations'], current_time))
                 
                 return {
                     'access_token': access_token,
@@ -1013,7 +1012,7 @@ class StandaloneAuthManager:
             
             # 生成重置令牌
             reset_token = secrets.token_urlsafe(32)
-            expires_at = datetime.now(timezone.utc) + timedelta(hours=1)  # 1小时有效期
+            expires_at = datetime.now() + timedelta(hours=1)  # 1小时有效期
             
             # 保存重置令牌
             cursor.execute('''
@@ -1429,6 +1428,7 @@ class StandaloneAuthManager:
 
     def logout_device(self, user_id, device_id=None, ip_address=None, user_agent=None, device_info=None, login_domain=''):
         """
+        【已废弃】
         登出设备（支持两种识别方式）
         
         Args:
@@ -1522,6 +1522,140 @@ class StandaloneAuthManager:
             cursor.close()
             conn.close()
 
+    def logout_current_device(self, user_id, access_token=None):
+        """
+        退出当前设备（通过token识别）
+        
+        Args:
+            user_id: 用户ID
+            access_token: 当前的访问令牌（用于识别设备会话）
+        
+        Returns:
+            dict: 登出结果
+        """
+        conn = self.pool.connection()
+        cursor = conn.cursor()
+        
+        try:
+            current_time_utc = datetime.now(timezone.utc)
+            
+            if access_token:
+                # 方式1：通过access_token解析出设备会话信息
+                try:
+                    payload = self.verify_access_token(access_token)
+                    if not payload:
+                        return {'success': False, 'message': '无效的访问令牌'}
+                    
+                    # 查找该用户最近活跃的设备（作为当前设备的近似）
+                    cursor.execute('''
+                        SELECT ds.id, ds.device_name, rt.id as token_id
+                        FROM device_sessions ds
+                        LEFT JOIN refresh_tokens rt ON ds.id = rt.device_session_id AND rt.is_revoked = 0
+                        WHERE ds.user_id = %s AND ds.is_active = 1
+                        ORDER BY ds.last_activity DESC
+                        LIMIT 1
+                    ''', (user_id,))
+                    
+                except Exception:
+                    # token解析失败，使用备用方案
+                    cursor.execute('''
+                        SELECT id, device_name FROM device_sessions 
+                        WHERE user_id = %s AND is_active = 1
+                        ORDER BY last_activity DESC
+                        LIMIT 1
+                    ''', (user_id,))
+            else:
+                # 方式2：没有token时，登出最新活跃的设备
+                cursor.execute('''
+                    SELECT id, device_name FROM device_sessions 
+                    WHERE user_id = %s AND is_active = 1
+                    ORDER BY last_activity DESC
+                    LIMIT 1
+                ''', (user_id,))
+            
+            device = cursor.fetchone()
+            
+            if not device:
+                return {'success': False, 'message': '没有找到活跃的设备会话'}
+            
+            device_session_id = device['id']
+            device_name = device['device_name']
+            
+            # 撤销该设备的刷新令牌
+            cursor.execute('''
+                UPDATE refresh_tokens 
+                SET is_revoked = 1, revoked_at = %s, revoked_reason = 'current_device_logout' 
+                WHERE device_session_id = %s AND is_revoked = 0
+            ''', (current_time_utc, device_session_id))
+            
+            # 停用设备会话
+            cursor.execute('''
+                UPDATE device_sessions 
+                SET is_active = 0 
+                WHERE id = %s
+            ''', (device_session_id,))
+            
+            return {'success': True, 'message': f'已成功退出当前设备 "{device_name}"'}
+            
+        except Exception as e:
+            return {'success': False, 'message': f'退出当前设备失败: {str(e)}'}
+        finally:
+            cursor.close()
+            conn.close()
+
+    def logout_specific_device(self, user_id, device_id):
+        """
+        退出指定设备（通过device_id）
+        
+        Args:
+            user_id: 用户ID
+            device_id: 要退出的设备ID
+        
+        Returns:
+            dict: 登出结果
+        """
+        conn = self.pool.connection()
+        cursor = conn.cursor()
+        
+        try:
+            current_time_utc = datetime.now(timezone.utc)
+            
+            # 通过device_id查找设备，确保属于该用户
+            cursor.execute('''
+                SELECT id, device_name 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': '设备不存在或已退出'}
+            
+            device_session_id = device['id']
+            device_name = device['device_name']
+            
+            # 撤销该设备的刷新令牌
+            cursor.execute('''
+                UPDATE refresh_tokens 
+                SET is_revoked = 1, revoked_at = %s, revoked_reason = 'specific_device_logout' 
+                WHERE device_session_id = %s AND is_revoked = 0
+            ''', (current_time_utc, device_session_id))
+            
+            # 停用设备会话
+            cursor.execute('''
+                UPDATE device_sessions 
+                SET is_active = 0 
+                WHERE id = %s
+            ''', (device_session_id,))
+            
+            return {'success': True, 'message': f'已成功退出设备 "{device_name}"'}
+            
+        except Exception as e:
+            return {'success': False, 'message': f'退出指定设备失败: {str(e)}'}
+        finally:
+            cursor.close()
+            conn.close()
+
     def get_user_profile_stats(self, user_id):
         """获取用户资料统计信息"""
         conn = self.pool.connection()

{mdbq-4.0.102.dist-info → mdbq-4.0.104.dist-info}/METADATA

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

{mdbq-4.0.102.dist-info → mdbq-4.0.104.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=RTgyq2pXYRnoQ_rtGBIXhCHBV_vKdGed6k6q1avpjak,19
+mdbq/__version__.py,sha256=kxyPyk2WXu3DvipWC0icSn0MFXbrNZr1qZab1hWurG8,19
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
-mdbq/auth/auth_backend.py,sha256=8fXITCUqPgH4VAdtVx-KTlk9SHzIYTQXNuW9SAx_LWU,81833
+mdbq/auth/auth_backend.py,sha256=P3kaQqnT1TdZEHMeR5_UDqGzlx1v-7BWdsD3Uu7YYzo,86787
 mdbq/auth/rate_limiter.py,sha256=1m_Paxp8pDNpmyoFGRpFMVOJpbmeIvfVcfiQ2oH72qM,32850
 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.102.dist-info/METADATA,sha256=zCTfuWBJks6VnYkX8ccf-3iEe4PITuOzADcU0SH1NaA,365
-mdbq-4.0.102.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.0.102.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.102.dist-info/RECORD,,
+mdbq-4.0.104.dist-info/METADATA,sha256=EwEeO0P8TpW-CyVkRnnxB1FNSswUPgLik7H1jV8P4po,365
+mdbq-4.0.104.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.0.104.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.104.dist-info/RECORD,,