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

mdbq/__version__.py

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

mdbq/auth/auth_backend.py

@@ -516,13 +516,7 @@ class StandaloneAuthManager:
             
             # 检查账户锁定状态
             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:
+            if locked_until and 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')
@@ -849,7 +843,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             # 先查询要登出的设备数量
             cursor.execute('''
@@ -864,7 +858,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = 'logout' 
                 WHERE user_id = %s AND is_revoked = 0
-            ''', (current_time_utc, user_id))
+            ''', (current_time, user_id))
             
             # 停用用户的所有设备会话
             cursor.execute('''
@@ -919,7 +913,7 @@ class StandaloneAuthManager:
             new_salt = secrets.token_hex(32)
             new_password_hash = self._hash_password(new_password, new_salt)
             
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             # 更新密码
             cursor.execute('''
@@ -934,7 +928,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = 'password_changed' 
                 WHERE user_id = %s AND is_revoked = 0
-            ''', (current_time_utc, user_id))
+            ''', (current_time, user_id))
             
             # 停用所有设备会话
             cursor.execute('''
@@ -1055,7 +1049,7 @@ class StandaloneAuthManager:
             if len(new_password) < 6:
                 return {'success': False, 'message': '新密码至少需要6个字符'}
             
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             # 查找有效的重置令牌
             cursor.execute('''
@@ -1064,7 +1058,7 @@ class StandaloneAuthManager:
                 WHERE password_reset_token = %s 
                   AND password_reset_expires > %s
                   AND is_active = 1
-            ''', (reset_token, current_time_utc))
+            ''', (reset_token, current_time))
             
             user = cursor.fetchone()
             if not user:
@@ -1088,7 +1082,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = 'password_reset' 
                 WHERE user_id = %s AND is_revoked = 0
-            ''', (current_time_utc, user['id']))
+            ''', (current_time, user['id']))
             
             # 停用所有设备会话
             cursor.execute('''
@@ -1133,16 +1127,10 @@ class StandaloneAuthManager:
             
             locked_until = record['locked_until']
             
-            current_time_utc = datetime.now(timezone.utc)
-            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())
-                    return {
+            current_time = datetime.now()
+            if locked_until and locked_until > current_time:
+                remaining_seconds = int((locked_until - current_time).total_seconds())
+                return {
                         'blocked': True, 
                         'remaining_time': remaining_seconds,
                         'reason': f'IP被锁定，剩余时间: {remaining_seconds}秒'
@@ -1163,7 +1151,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            now = datetime.now(timezone.utc)
+            now = datetime.now()
             
             cursor.execute('''
                 SELECT failure_count, first_failure, lockout_count
@@ -1179,7 +1167,7 @@ class StandaloneAuthManager:
                 window_start = now - timedelta(minutes=window_minutes)
                 first_failure = record['first_failure']
                 
-                if first_failure and first_failure.replace(tzinfo=timezone.utc) <= window_start:
+                if first_failure and first_failure <= window_start:
                     # 重置计数器
                     cursor.execute('''
                         UPDATE ip_rate_limits 
@@ -1225,14 +1213,14 @@ class StandaloneAuthManager:
     
     def _revoke_device_session(self, cursor, device_session_id, reason='manual'):
         """撤销设备会话"""
-        current_time_utc = datetime.now(timezone.utc)
+        current_time = datetime.now()
         
         # 撤销设备相关的refresh token
         cursor.execute('''
             UPDATE refresh_tokens 
             SET is_revoked = 1, revoked_at = %s, revoked_reason = %s 
             WHERE device_session_id = %s AND is_revoked = 0
-        ''', (current_time_utc, reason, device_session_id))
+        ''', (current_time, reason, device_session_id))
         
         # 停用设备会话
         cursor.execute('''
@@ -1446,7 +1434,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             if device_id:
                 # 方式1：通过device_id查找设备（用于设备管理界面）
@@ -1504,7 +1492,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = %s 
                 WHERE device_session_id = %s AND is_revoked = 0
-            ''', (current_time_utc, logout_reason, device_session_id))
+            ''', (current_time, logout_reason, device_session_id))
             
             # 停用设备会话
             cursor.execute('''
@@ -1537,7 +1525,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             if access_token:
                 # 方式1：通过access_token解析出设备会话信息
@@ -1586,7 +1574,7 @@ class StandaloneAuthManager:
                 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))
+            ''', (current_time, device_session_id))
             
             # 停用设备会话
             cursor.execute('''
@@ -1618,7 +1606,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             # 通过device_id查找设备，确保属于该用户
             cursor.execute('''
@@ -1639,7 +1627,7 @@ class StandaloneAuthManager:
                 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))
+            ''', (current_time, device_session_id))
             
             # 停用设备会话
             cursor.execute('''
@@ -1735,8 +1723,8 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
-            threshold_time = current_time_utc - timedelta(days=days_threshold)
+            current_time = datetime.now()
+            threshold_time = current_time - timedelta(days=days_threshold)
             
             # 查找不活跃的设备
             cursor.execute('''
@@ -1757,7 +1745,7 @@ class StandaloneAuthManager:
                     WHERE device_session_id IN ({})
                       AND is_revoked = 0
                 '''.format(','.join(['%s'] * len(device_session_ids))), 
-                [current_time_utc] + device_session_ids)
+                [current_time] + device_session_ids)
                 
                 # 停用设备会话
                 cursor.execute('''
@@ -1891,8 +1879,8 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
-            threshold_time = current_time_utc - timedelta(days=days_threshold)
+            current_time = datetime.now()
+            threshold_time = current_time - timedelta(days=days_threshold)
             
             if user_id:
                 # 清理特定用户的旧记录

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

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

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

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=kxyPyk2WXu3DvipWC0icSn0MFXbrNZr1qZab1hWurG8,19
+mdbq/__version__.py,sha256=D8LsxsVI3wBXABgysGteyLWTKv98AvjXhp7NcQYnB98,19
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
-mdbq/auth/auth_backend.py,sha256=P3kaQqnT1TdZEHMeR5_UDqGzlx1v-7BWdsD3Uu7YYzo,86787
+mdbq/auth/auth_backend.py,sha256=ZxKRXPXa2t9ngRZEXKM72MzcMvN-0OtiVDOhZRTrm3w,85948
 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.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,,
+mdbq-4.0.105.dist-info/METADATA,sha256=xvRe6sntR1Gvef1GsuiDUohdy5CHz8XsP4OogQVsBc4,365
+mdbq-4.0.105.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.0.105.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.105.dist-info/RECORD,,