lesscode-flask 0.2.14__tar.gz → 0.2.15__tar.gz

{lesscode_flask-0.2.14 → lesscode_flask-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.2.14
+Version: 0.2.15
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.2.14 → lesscode_flask-0.2.15}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.14'
+__version__ = '0.2.15'
 
 import functools
 import logging

{lesscode_flask-0.2.14 → lesscode_flask-0.2.15}/lesscode_flask/model/user_limit_policy.py

@@ -11,8 +11,8 @@ class UserLimitPolicy():
     policy_name: str= None,
     client_id: str= None,
     rate_limit_enable: int = 0,
-    rate_limit_window_sec: int = 10,
-    rate_limit_rate: int = 5,
+    rate_limit_window_sec: int = 1,
+    rate_limit_rate: int = 1,
     rate_limit_burst: int = 0,
     count_limit_enable: int = 0,
     count_limit_window_sec: int = 43200,

{lesscode_flask-0.2.14 → lesscode_flask-0.2.15}/lesscode_flask/setting/__init__.py

@@ -122,7 +122,8 @@ class BaseConfig:
 
     # 飞书 webhook URL 常量定义  用于向指定的飞书机器人发送消息的 webhook 地址
     LIMIT_FS_WEBHOOK_URL = "https://open.feishu.cn/open-apis/bot/v2/hook/545140ef-8234-4167-9f0c-8ee72abae430"
-
+    # 在飞书运维聊天框中处理
+    FS_OAM_SERVICE_URL = "http://oam-service.internal:8080"
     # sql 注入验证器开关
     SQL_INJECTION_ENABLE = False
     #

{lesscode_flask-0.2.14 → lesscode_flask-0.2.15}/lesscode_flask/utils/fs_util.py

@@ -6,33 +6,33 @@ import requests
 
 logger = logging.getLogger(__name__)
 
-def fs_webhook(webhook_url:str,title:str, content:[str,list]):
+def fs_webhook(webhook_url:str,title:str, fs_content:list):
     """
     发送飞书 webhook 消息
 
     参数:
         webhook_url (str): 飞书 webhook 的 URL 地址
         title (str): 消息的标题
-        content (str or list): 消息内容，可以是字符串或字符串列表
+        fs_content (str or list): 消息内容，可以是字符串或字符串列表
 
     返回值:
         无返回值，直接发送 HTTP 请求
     """
     headers = {'Content-Type': 'application/json;charset=utf-8'}
 
-    # 根据内容类型构建飞书消息格式
-    if isinstance(content, list):
-        fs_content = []
-        for i in content:
-            fs_content.append({
-                "tag": "text",
-                "text": f"{i}\n"
-            })
-    else:
-        fs_content = [{
-            "tag": "text",
-            "text": f"{content}\n"
-        }]
+    # # 根据内容类型构建飞书消息格式
+    # if isinstance(content, list):
+    #     fs_content = []
+    #     for i in content:
+    #         fs_content.append({
+    #             "tag": "text",
+    #             "text": f"{i}\n"
+    #         })
+    # else:
+    #     fs_content = [{
+    #         "tag": "text",
+    #         "text": f"{content}\n"
+    #     }]
 
     # 构造飞书消息的 JSON 结构
     json_text = {

{lesscode_flask-0.2.14 → lesscode_flask-0.2.15}/lesscode_flask/utils/limit/req/rate_limiter_handler.py

@@ -35,12 +35,25 @@ class RateLimitHandler:
             content = []
             current_user = flask_login.current_user
             # 收集用户相关信息
-            content.append(f"用户名称：{current_user.display_name}")
+            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(f"手机号：{phone_no}")
-            content.append(f"用户IP：{request.remote_addr}")
-            content.append(f"资源地址：{request.url_rule.rule}")
+            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="请求过于频繁，请稍后再试！")
+        return ResponseResult.fail(status_code="403", http_code="403", message="请求过于频繁，请稍后再试！")
+
+

{lesscode_flask-0.2.14 → lesscode_flask-0.2.15}/lesscode_flask/utils/limit/req_count/count_limiter_handler.py

@@ -35,12 +35,22 @@ class CountLimitHandler:
             content = []
             current_user = flask_login.current_user
             # 收集用户相关信息
-            content.append(f"用户名称：{current_user.display_name}")
+            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(f"手机号：{phone_no}")
-            content.append(f"用户IP：{request.remote_addr}")
-            content.append(f"资源地址：{request.url_rule.rule}")
-
+            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:
+                content.append({"tag": "text","text": f"运维处理：\n"})
+                lock_account_url = f"http://127.0.0.1:8976/icp/authUser/lock_account?id={current_user.id}"
+                url = f"http://127.0.0.1:8976/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"http://127.0.0.1:8976/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.14 → lesscode_flask-0.2.15}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.2.14
+Version: 0.2.15
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy