lesscode-flask 0.2.22__tar.gz → 0.2.24__tar.gz

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.2.22
+Version: 0.2.24
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -26,16 +26,6 @@ Requires-Dist: gevent==25.5.1
 Requires-Dist: openpyxl==3.1.5
 Requires-Dist: iputil==0.3.1
 Requires-Dist: phone==0.4.5
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: platform
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # lesscode-flask
 

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.22'
+__version__ = '0.2.24'
 
 import functools
 import logging

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/lesscode_flask/utils/limit/consecutive/consecutive_limiter_handler.py

@@ -37,7 +37,7 @@ class ConsecutiveAccessLimitHandler:
             phone_no = current_user.phone_no if current_user.phone_no is not None else "-"
             content.append({"tag": "text","text": f"手机号：{phone_no}\n"})
             content.append({"tag": "text","text": f"用户IP：{request.remote_addr}\n"})
-            content.append({"tag": "text","text": f"资源地址：{request.url_rule.rule}\n"})
+            content.append({"tag": "text","text": f"资源地址：{request.path}\n"})
             token = request.headers.get("Authorization", "").replace("Bearer ", "")
             if token:
                 FS_OAM_SERVICE_URL = current_app.config.get("FS_OAM_SERVICE_URL")

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/lesscode_flask/utils/limit/consecutive/redis_consecutive_limiter.py

@@ -18,11 +18,11 @@ class RedisConsecutiveAccessLimiter:
         检查是否允许请求（限制用户连续访问同一路径）
         :return: (allowed, current_count)
         """
-        consecutive_limit_count = getattr(user_limit_policy, 'consecutive_limit_count', 20)
-        consecutive_limit_enable = getattr(user_limit_policy, 'consecutive_limit_enable', 0)
-        limit_white_list = getattr(user_limit_policy, 'white_list', [])
+        consecutive_limit_count = user_limit_policy.consecutive_limit_count
+        consecutive_limit_enable = user_limit_policy.consecutive_limit_enable
+        limit_white_list = user_limit_policy.white_list
 
-        request_url = request.url_rule.rule if request.url_rule else ""
+        request_url = request.path
 
         # 未启用连续访问限制 或者 在白名单中 直接返回允许
         if consecutive_limit_enable == 0 or request_url in limit_white_list:

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/lesscode_flask/utils/limit/limit_util.py

@@ -12,7 +12,7 @@ def limit_key_encode() -> str:
     limit_key = None
     # 白名单
     limit_white_list = app_config.get("LIMIT_WHITE_LIST", [])
-    request_url = request.url_rule.rule
+    request_url = request.path
     if request_url in limit_white_list:
         # 白名单访问 直接返回None
         return None
@@ -95,7 +95,8 @@ def get_user_limit_policy():
         # 如果没有策略就构建默认策略
         REDIS_RATE_LIMIT_ENABLE = app_config.get("RATE_LIMIT_ENABLE", False)
         REDIS_COUNT_LIMIT_ENABLE = app_config.get("COUNT_LIMIT_ENABLE", False)
+        CONSECUTIVE_ACCESS_LIMIT_ENABLE = app_config.get("CONSECUTIVE_ACCESS_LIMIT_ENABLE", False)
         LIMIT_WHITE_LIST = app_config.get("LIMIT_WHITE_LIST", False)
-        return UserLimitPolicy(rate_limit_enable=int(REDIS_RATE_LIMIT_ENABLE),
+        return UserLimitPolicy(rate_limit_enable=int(REDIS_RATE_LIMIT_ENABLE),consecutive_limit_enable=int(CONSECUTIVE_ACCESS_LIMIT_ENABLE),
                                count_limit_enable=int(REDIS_COUNT_LIMIT_ENABLE),white_list=LIMIT_WHITE_LIST)
 

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/lesscode_flask/utils/limit/req/rate_limiter_handler.py

@@ -39,7 +39,7 @@ class RateLimitHandler:
             phone_no = current_user.phone_no if current_user.phone_no is not None else "-"
             content.append({"tag": "text","text": f"手机号：{phone_no}\n"})
             content.append({"tag": "text","text": f"用户IP：{request.remote_addr}\n"})
-            content.append({"tag": "text","text": f"资源地址：{request.url_rule.rule}\n"})
+            content.append({"tag": "text","text": f"资源地址：{request.path}\n"})
             token = request.headers.get("Authorization", "").replace("Bearer ", "")
             if token:
                 FS_OAM_SERVICE_URL = current_app.config.get("FS_OAM_SERVICE_URL")

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/lesscode_flask/utils/limit/req/redis_rate_limiter.py

@@ -30,7 +30,7 @@ class RedisRateLimiter:
         time_window: int = user_limit_policy.rate_limit_window_sec
         rate_limit_enable = user_limit_policy.rate_limit_enable
         limit_white_list = user_limit_policy.white_list
-        request_url = request.url_rule.rule
+        request_url = request.path
         # 未启用限流 或者 在白名单中 直接返回允许
         if rate_limit_enable == 0 or  request_url in limit_white_list:
             # 白名单访问 直接返回None

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/lesscode_flask/utils/limit/req_count/count_limiter_handler.py

@@ -41,7 +41,7 @@ class CountLimitHandler:
             phone_no = current_user.phone_no if current_user.phone_no is not None else "-"
             content.append({"tag": "text","text": f"手机号：{phone_no}\n"})
             content.append({"tag": "text","text": f"用户IP：{request.remote_addr}\n"})
-            content.append({"tag": "text","text": f"资源地址：{request.url_rule.rule}\n"})
+            content.append({"tag": "text","text": f"资源地址：{request.path}\n"})
             token = request.headers.get("Authorization", "").replace("Bearer ", "")
             if token:
                 FS_OAM_SERVICE_URL = current_app.config.get("FS_OAM_SERVICE_URL")

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/lesscode_flask/utils/limit/req_count/redis_count_limiter.py

@@ -24,11 +24,11 @@ class RedisCountLimiter:
         count_limit_enable = user_limit_policy.count_limit_enable
         limit_white_list = user_limit_policy.white_list
         cost = 1 # 每次消耗一次数
-        request_url = request.url_rule.rule
+        request_url = request.path
         # 未启用限流 或者 在白名单中 直接返回允许
         if count_limit_enable == 0 or request_url in limit_white_list:
             # 白名单访问 直接返回None
-            return True, 0, 0
+            return True, 0
         #  限流键
         key = f"limit_count:{limit_key(request_url)}"
 

{lesscode_flask-0.2.22 → lesscode_flask-0.2.24}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.2.22
+Version: 0.2.24
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -26,16 +26,6 @@ Requires-Dist: gevent==25.5.1
 Requires-Dist: openpyxl==3.1.5
 Requires-Dist: iputil==0.3.1
 Requires-Dist: phone==0.4.5
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: platform
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # lesscode-flask