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

{lesscode-flask-0.2.20 → lesscode_flask-0.2.22}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: lesscode-flask
-Version: 0.2.20
+Version: 0.2.22
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -26,6 +26,16 @@ 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.20 → lesscode_flask-0.2.22}/lesscode_flask/__init__.py

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

{lesscode-flask-0.2.20 → lesscode_flask-0.2.22}/lesscode_flask/app.py

@@ -24,6 +24,8 @@ from lesscode_flask.utils.decorator.sql_injection import contains_sql_injection
 from lesscode_flask.utils.helpers import inject_args, generate_uuid, app_config
 from lesscode_flask.utils.json.NotSortJSONProvider import NotSortJSONProvider
 from lesscode_flask.utils.limit import RedisRateLimiter
+from lesscode_flask.utils.limit.consecutive.consecutive_limiter_handler import ConsecutiveAccessLimitHandler
+from lesscode_flask.utils.limit.consecutive.redis_consecutive_limiter import RedisConsecutiveAccessLimiter
 from lesscode_flask.utils.limit.limit_util import get_rate_limit_info, get_count_limit_info, get_user_limit_policy
 from lesscode_flask.utils.limit.req.rate_limiter_handler import RateLimitHandler
 from lesscode_flask.utils.limit.req_count.count_limiter_handler import CountLimitHandler
@@ -62,10 +64,14 @@ class Lesscoder(Flask):
         self.register_error_handler(Exception, self.handle_exception)
         REDIS_RATE_LIMIT_ENABLE = self.config.get("RATE_LIMIT_ENABLE", False)
         if REDIS_RATE_LIMIT_ENABLE:
-            self.rateLimiter = RedisRateLimiter(self.config.get("RATE_LIMIT_KEY", "redis"))
+            self.rateLimiter = RedisRateLimiter(self.config.get("REDIS_LIMIT_KEY", "redis"))
         REDIS_COUNT_LIMIT_ENABLE = self.config.get("COUNT_LIMIT_ENABLE", False)
         if REDIS_COUNT_LIMIT_ENABLE:
-            self.countLimiter = RedisCountLimiter(self.config.get("COUNT_LIMIT_KEY", "redis"))
+            self.countLimiter = RedisCountLimiter(self.config.get("REDIS_LIMIT_KEY", "redis"))
+
+        REDIS_CONSECUTIVE_LIMIT_ENABLE = self.config.get("CONSECUTIVE_ACCESS_LIMIT_ENABLE", False)
+        if REDIS_CONSECUTIVE_LIMIT_ENABLE:
+            self.consecutiveAccessLimiter = RedisConsecutiveAccessLimiter(self.config.get("REDIS_LIMIT_KEY", "redis"))
 
     def preprocess_request(self) -> ft.ResponseReturnValue | None:
         v = super(Lesscoder, self).preprocess_request()
@@ -86,6 +92,14 @@ class Lesscoder(Flask):
                 rateLimitHandler = self.config.get("RATE_LIMIT_HANDLER", RateLimitHandler)
                 rateLimitHandler(request,delay, excess).response_handler()
 
+        if  hasattr(self, 'consecutiveAccessLimiter') and self.consecutiveAccessLimiter:
+            if not user_limit_policy:
+                user_limit_policy = get_user_limit_policy()
+            #  是否触发限流 延迟时间 超出数量
+            allowed,current_count =  self.consecutiveAccessLimiter.is_allowed(user_limit_policy)
+            if not allowed :
+                consecutiveAccessLimiter = self.config.get("CONSECUTIVE_ACCESS_LIMIT_HANDLER", ConsecutiveAccessLimitHandler)
+                consecutiveAccessLimiter(request,current_count).response_handler()
         if self.config.get("AUTHORIZATION_ENABLE"):  # 启动 AUTHORIZATION_ENABLE 才进行权限验证
             # 获取当前请求的url
             url = request.path

{lesscode-flask-0.2.20 → lesscode_flask-0.2.22}/lesscode_flask/model/user_limit_policy.py

@@ -17,6 +17,8 @@ class UserLimitPolicy():
     count_limit_enable: int = 0,
     count_limit_window_sec: int = 43200,
     count_limit_count: int = 500,
+    consecutive_limit_count = 30,  # 连续访问次数限制，默认30次
+    consecutive_limit_enable = 0,  # 连续访问限制是否启用，0-不启用，1-启用
     white_list: Union[str, list] = None,
     alert_webhook_url: str = None,
 ):
@@ -47,7 +49,8 @@ class UserLimitPolicy():
     self.count_limit_window_sec = int(count_limit_window_sec) if count_limit_window_sec is not None else 43200
     self.count_limit_count = int(count_limit_count) if count_limit_count is not None else 500
     self.alert_webhook_url = alert_webhook_url
-
+    self.consecutive_limit_count = int(consecutive_limit_count) if consecutive_limit_count is not None else 20  # 连续访问次数限制，默认20次
+    self.consecutive_limit_enable = int(consecutive_limit_enable) if consecutive_limit_enable is not None else 0  # 连续访问限制是否启用，0-不启用，1-启用
     # 修改后的 white_list 处理逻辑
     if isinstance(white_list, str):
         self.white_list = json.loads(white_list) if white_list else []

{lesscode-flask-0.2.20 → lesscode_flask-0.2.22}/lesscode_flask/setting/__init__.py

@@ -1,6 +1,7 @@
 import os
 import sys
 
+from lesscode_flask.utils.limit.consecutive.consecutive_limiter_handler import ConsecutiveAccessLimitHandler
 from lesscode_flask.utils.limit.req.rate_limiter_handler import RateLimitHandler
 from lesscode_flask.utils.limit.req_count.count_limiter_handler import CountLimitHandler
 
@@ -75,10 +76,9 @@ class BaseConfig:
     REDIS_CACHE_KEY = "redis"
     # 权限缓存key
     REDIS_OAUTH_KEY = "oauth2_redis"
-    # 限流频率缓存key
-    REDIS_RATE_LIMIT_KEY = "oauth2_redis"
-    # 限流计数缓存key
-    REDIS_COUNT_LIMIT_KEY = "oauth2_redis"
+    # 限流缓存key
+    REDIS_LIMIT_KEY = "oauth2_redis"
+
     ##**************权限控制相关*****************##
     # 是否启用权限验证
     AUTHORIZATION_ENABLE: bool = False
@@ -92,6 +92,7 @@ class BaseConfig:
     OAUTH2_REFRESH_TOKEN_GENERATOR = True
     # 是否启用限流频率验证
     RATE_LIMIT_ENABLE: bool = False
+
     # 触发限流的处理函数
     RATE_LIMIT_HANDLER = RateLimitHandler
     # # 限流频率窗口 单位是每秒
@@ -109,6 +110,11 @@ class BaseConfig:
     # COUNT_LIMIT_COUNT = 500
     # # 窗口期时长 单位秒
     # COUNT_LIMIT_TIME_WINDOW = 60*60*12
+
+    # 是否启用连续请求单一接口限流频率验证
+    CONSECUTIVE_ACCESS_LIMIT_ENABLE: bool = False
+    CONSECUTIVE_ACCESS_LIMIT_HANDLER = ConsecutiveAccessLimitHandler
+
     # 白名单
     LIMIT_WHITE_LIST: list = ["/ike2b/user/WXOA/login", "/ike2b/detail/company/node/get_note",
      "/ike2b/user/attention/attention_company_status",

{lesscode-flask-0.2.20 → lesscode_flask-0.2.22}/lesscode_flask/utils/decorator/cache.py

@@ -55,7 +55,7 @@ def deal_cache(func, ex, cache_key, *args, **params):
         end = datetime.datetime.now()
         logging.info("[组件：{}]！用时{}".format(func_name, end - start))
         # 接口时间小于0.6s不计入缓存
-        if (end - start).total_seconds() <= 0.6:
+        if (end - start).total_seconds() >= 0.6:
             # 插入缓存表
             logging.info("写入缓存")
             insert_cache(data, ex, cache_key)

lesscode_flask-0.2.22/lesscode_flask/utils/limit/consecutive/consecutive_limiter_handler.py

@@ -0,0 +1,56 @@
+import time
+import logging
+
+from flask import current_app, request
+
+from lesscode_flask.model.response_result import ResponseResult
+from lesscode_flask.model.user import flask_login
+from lesscode_flask.utils.fs_util import fs_webhook
+from lesscode_flask.utils.redis.redis_helper import RedisHelper
+
+logger = logging.getLogger(__name__)
+
+
+class ConsecutiveAccessLimitHandler:
+    """
+    限流后的处理函数实现
+    """
+    def __init__(self, req, current_count: int):
+        """
+         初始化
+        :param req:
+        :param current_count: 当前连续访问次数
+        """
+        self.req = req
+        self.current_count = current_count
+
+
+    def response_handler(self):
+        # 如果配置了飞书 webhook URL，则发送告警通知
+        limit_fs_webhook_url = current_app.config.get("LIMIT_FS_WEBHOOK_URL")
+        # 如果配置了飞书 webhook URL，则发送告警通知
+        if limit_fs_webhook_url:
+            content = []
+            current_user = flask_login.current_user
+            # 收集用户相关信息
+            content.append({"tag": "text","text": f"用户名称：{current_user.display_name}\n"})
+            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"})
+            token = request.headers.get("Authorization", "").replace("Bearer ", "")
+            if token:
+                FS_OAM_SERVICE_URL = current_app.config.get("FS_OAM_SERVICE_URL")
+                content.append({"tag": "text","text": f"运维处理：\n"})
+                lock_account_url = f"{FS_OAM_SERVICE_URL}/icp/authUser/lock_account?id={current_user.id}"
+                url = f"{FS_OAM_SERVICE_URL}/icp/oauth/logout_token?token={token}"
+                content.append({"tag": "a","text": "强制下线","href": f"{url}"})
+                content.append({"tag": "a", "text": "    禁止登录    ", "href": f"{lock_account_url}"})
+                ban_ip_url = f"{FS_OAM_SERVICE_URL}/icp/accessLog/ban_ip?ip={request.remote_addr}"
+                content.append({"tag": "a", "text": "封禁IP ", "href": f"{ban_ip_url}"})
+
+            # 发送飞书 webhook 告警
+            fs_webhook(limit_fs_webhook_url, "触发连续请求单一接口限流告警", content)
+        return ResponseResult.fail(status_code="403", http_code="403", message="请求过于频繁，请稍后再试！")
+
+

lesscode_flask-0.2.22/lesscode_flask/utils/limit/consecutive/redis_consecutive_limiter.py

@@ -0,0 +1,71 @@
+import logging
+from flask import request
+
+from lesscode_flask.model.user import flask_login
+from lesscode_flask.model.user_limit_policy import UserLimitPolicy
+from lesscode_flask.utils.redis.redis_helper import RedisHelper
+
+logger = logging.getLogger(__name__)
+
+class RedisConsecutiveAccessLimiter:
+    """Redis连续访问限流器实现"""
+
+    def __init__(self, redis_key):
+        self.redis_key = redis_key
+
+    def is_allowed(self, user_limit_policy: UserLimitPolicy):
+        """
+        检查是否允许请求（限制用户连续访问同一路径）
+        :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', [])
+
+        request_url = request.url_rule.rule if request.url_rule else ""
+
+        # 未启用连续访问限制 或者 在白名单中 直接返回允许
+        if consecutive_limit_enable == 0 or request_url in limit_white_list:
+            return True, 0
+
+        # 限流键 (包含用户标识和请求路径)
+        limit_key = None
+        # 1、获取当前用户
+        current_user = flask_login.current_user
+        if current_user and not current_user.is_anonymous_user:
+            # 拼接 key 用户id
+            limit_key = current_user.id
+        # 如果键为空，使用客户端IP
+        if not limit_key:
+            limit_key = f"{request.remote_addr}"
+        limit_key = f"{limit_key}"
+        key = f"limit_consecutive:{limit_key}:{request_url}"
+
+        try:
+            # 获取当前连续访问次数
+            current_count_str = RedisHelper(self.redis_key).sync_get(key)
+
+
+            if current_count_str is None:
+                keys = RedisHelper(self.redis_key).sync_keys(f"limit_consecutive:{limit_key}:*")
+                RedisHelper(self.redis_key).sync_delete(keys)
+
+                # 第一次访问，设置计数为1
+                current_count = 1
+                RedisHelper(self.redis_key).sync_set(key, current_count, 3600)  # 默认保存1小时
+            else:
+                # current_count = int(current_count_str) + 1
+                # 增加连续访问计数
+                current_count =  RedisHelper(self.redis_key).sync_incrby(name=key, amount=1)
+
+            # 检查是否超过限制
+            if current_count >= consecutive_limit_count:
+                # 超过限制
+                return False, current_count
+            else:
+                return True, current_count
+
+        except Exception as e:
+            # Redis出错时的降级处理
+            logger.error(f"Redis consecutive access limiter error: {e}")
+            return True, 0

{lesscode-flask-0.2.20 → lesscode_flask-0.2.22}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: lesscode-flask
-Version: 0.2.20
+Version: 0.2.22
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -26,6 +26,16 @@ 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.20 → lesscode_flask-0.2.22}/lesscode_flask.egg-info/SOURCES.txt

@@ -40,6 +40,8 @@ lesscode_flask/utils/file/file_utils.py
 lesscode_flask/utils/json/NotSortJSONProvider.py
 lesscode_flask/utils/limit/__init__.py
 lesscode_flask/utils/limit/limit_util.py
+lesscode_flask/utils/limit/consecutive/consecutive_limiter_handler.py
+lesscode_flask/utils/limit/consecutive/redis_consecutive_limiter.py
 lesscode_flask/utils/limit/req/rate_limiter_handler.py
 lesscode_flask/utils/limit/req/redis_rate_limiter.py
 lesscode_flask/utils/limit/req_count/count_limiter_handler.py