fix: 修复会话header和body字段配置不生效的问题

lanshuizhiyue · lanshuizhiyue · commit 730ce842c932 · 2025-12-24T15:53:27.000+08:00
- SessionHeaderManager: 添加_load_from_database方法,初始化时从数据库加载会话请求头
- SessionBodyFieldManager: 添加_load_from_database方法,初始化时从数据库加载会话body字段
- body_field_processor: 修复浅拷贝问题,改用深拷贝确保多字段修改不互相影响
- body_field_processor: 添加JSONPath不可用时的回退处理和详细日志
- Task.apply_header_rules: 修复未传递target_url导致作用域匹配失效
- pyproject.toml: 添加jsonpath-ng依赖支持JSONPath匹配策略
diff --git a/src/backEnd/config.py b/src/backEnd/config.py
@@ -4,4 +4,4 @@
 MAX_TASKS_COUNT_LOCK = threading.Lock()
 
 
-VERSION = "1.8.7"
+VERSION = "1.8.8"
diff --git a/src/backEnd/model/Task.py b/src/backEnd/model/Task.py
@@ -147,7 +147,7 @@ def apply_header_rules(self):
             # 处理请求头
             logger.debug(f"[{self.taskid}] Processing headers with {len(self.headers)} original headers")
             processed_headers, applied_rules = HeaderProcessor.process_headers(
-                self.headers, persistent_rules, session_headers
+                self.headers, persistent_rules, session_headers, self.scanUrl
             )
             logger.debug(f"[{self.taskid}] Processed headers: {len(processed_headers)}, Applied rules: {len(applied_rules)}")
             
diff --git a/src/backEnd/pyproject.toml b/src/backEnd/pyproject.toml
@@ -10,6 +10,7 @@ thirdparty = [
     "fastapi[standard]",
     "apscheduler",
     "psutil",
+    "jsonpath-ng",
 ]
 
 [[tool.uv.index]]
diff --git a/src/backEnd/utils/body_field_processor.py b/src/backEnd/utils/body_field_processor.py
@@ -7,6 +7,7 @@
 
 import re
 import json
+import copy
 import urllib.parse
 from typing import List, Dict, Optional, Tuple, Any
 
@@ -193,7 +194,7 @@ def apply_rules_to_json(cls, json_obj: dict, fields: List[SessionBodyField], tar
         applicable_fields.sort(key=lambda x: x.priority, reverse=True)
         
         # 应用规则
-        modified_obj = json_obj.copy()
+        modified_obj = copy.deepcopy(json_obj)  # 使用深拷贝避免嵌套对象修改问题
         applied_rules = []
         
         for field in applicable_fields:
@@ -204,6 +205,8 @@ def apply_rules_to_json(cls, json_obj: dict, fields: List[SessionBodyField], tar
                     continue
             
             try:
+                logger.debug(f"Processing field '{field.field_name}' with strategy {field.match_strategy}, pattern '{field.match_pattern}'")
+                
                 # 根据匹配策略定位字段
                 if field.match_strategy == MatchStrategy.JSONPATH and field.match_pattern:
                     if JSONPATH_AVAILABLE:
@@ -217,7 +220,21 @@ def apply_rules_to_json(cls, json_obj: dict, fields: List[SessionBodyField], tar
                                     existing_value, field.field_value, field.replace_strategy
                                 )
                                 match.full_path.update(modified_obj, new_value)
+                                logger.debug(f"JSONPath matched '{field.field_name}': '{existing_value}' -> '{new_value}'")
                             applied_rules.append(f"BodyField: {field.field_name}")
+                        else:
+                            logger.debug(f"JSONPath '{field.match_pattern}' found no matches for field '{field.field_name}'")
+                    else:
+                        # JSONPath不可用时，回退到关键字匹配
+                        logger.warning(f"jsonpath-ng not available, falling back to keyword match for field '{field.field_name}'")
+                        if field.field_name in modified_obj:
+                            existing_value = modified_obj[field.field_name]
+                            new_value = cls.apply_replace_strategy(
+                                existing_value, field.field_value, field.replace_strategy
+                            )
+                            modified_obj[field.field_name] = new_value
+                            applied_rules.append(f"BodyField: {field.field_name} (keyword fallback)")
+                            logger.debug(f"Keyword fallback matched '{field.field_name}': '{existing_value}' -> '{new_value}'")
                 
                 elif field.match_strategy == MatchStrategy.KEYWORD:
                     # 直接访问字典key
@@ -228,6 +245,9 @@ def apply_rules_to_json(cls, json_obj: dict, fields: List[SessionBodyField], tar
                         )
                         modified_obj[field.field_name] = new_value
                         applied_rules.append(f"BodyField: {field.field_name}")
+                        logger.debug(f"Keyword matched '{field.field_name}': '{existing_value}' -> '{new_value}'")
+                    else:
+                        logger.debug(f"Field '{field.field_name}' not found in JSON object")
                 
             except Exception as e:
                 logger.error(f"Failed to apply field rule '{field.field_name}': {e}")
@@ -301,7 +321,7 @@ def apply_rules_to_urlencoded(cls, params: dict, fields: List[SessionBodyField],
         applicable_fields.sort(key=lambda x: x.priority, reverse=True)
         
         # 应用规则
-        modified_params = params.copy()
+        modified_params = copy.deepcopy(params)  # 使用深拷贝
         applied_rules = []
         
         for field in applicable_fields:
diff --git a/src/backEnd/utils/session_body_field_manager.py b/src/backEnd/utils/session_body_field_manager.py
@@ -33,11 +33,145 @@ def __init__(self):
         self._lock = threading.Lock()
         self._id_counter = 1  # ID计数器
         logger.debug("SessionBodyFieldManager initialized")
+        # 从数据库加载已有的会话字段
+        self._load_from_database()
         
     def _get_db(self):
         """获取请求头数据库连接"""
         return DataStore.header_db
     
+    def _load_from_database(self):
+        """从数据库加载所有未过期的会话Body字段"""
+        try:
+            db = self._get_db()
+            if db is None:
+                logger.debug("Database not available, skipping load from database")
+                return
+            
+            # 获取当前时间
+            current_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+            
+            # 查询所有未过期的会话字段
+            cursor = db.only_execute("""
+                SELECT id, client_ip, field_name, field_value, match_strategy, match_pattern,
+                       replace_strategy, content_types, priority, is_active, 
+                       expires_at, created_at, updated_at, scope_config
+                FROM session_body_fields
+                WHERE expires_at > ?
+            """, (current_time,))
+            
+            if cursor is None:
+                logger.debug("No cursor returned from database")
+                return
+            
+            loaded_count = 0
+            max_id = 0
+            
+            for row in cursor:
+                try:
+                    (field_id, client_ip, field_name, field_value, match_strategy_str, match_pattern,
+                     replace_strategy_str, content_types_json, priority, is_active,
+                     expires_at_str, created_at_str, updated_at_str, scope_config_json) = row
+                    
+                    # 跟踪最大ID
+                    if field_id and field_id > max_id:
+                        max_id = field_id
+                    
+                    # 解析匹配策略
+                    try:
+                        match_strategy = MatchStrategy(match_strategy_str)
+                    except ValueError:
+                        match_strategy = MatchStrategy.KEYWORD
+                    
+                    # 解析替换策略
+                    try:
+                        replace_strategy = ReplaceStrategy(replace_strategy_str)
+                    except ValueError:
+                        replace_strategy = ReplaceStrategy.REPLACE
+                    
+                    # 解析content_types
+                    content_types = None
+                    if content_types_json:
+                        try:
+                            content_types = json.loads(content_types_json)
+                        except json.JSONDecodeError:
+                            content_types = None
+                    
+                    # 解析expires_at
+                    expires_at = None
+                    if expires_at_str:
+                        try:
+                            expires_at = datetime.strptime(expires_at_str, '%Y-%m-%d %H:%M:%S')
+                        except ValueError:
+                            expires_at = None
+                    
+                    # 解析created_at
+                    created_at = None
+                    if created_at_str:
+                        try:
+                            created_at = datetime.strptime(created_at_str, '%Y-%m-%d %H:%M:%S')
+                        except ValueError:
+                            created_at = datetime.now()
+                    
+                    # 解析updated_at
+                    updated_at = None
+                    if updated_at_str:
+                        try:
+                            updated_at = datetime.strptime(updated_at_str, '%Y-%m-%d %H:%M:%S')
+                        except ValueError:
+                            updated_at = None
+                    
+                    # 解析scope_config
+                    scope = None
+                    if scope_config_json:
+                        try:
+                            from model.HeaderScope import HeaderScope
+                            scope_dict = json.loads(scope_config_json)
+                            scope = HeaderScope.from_dict(scope_dict)
+                        except (json.JSONDecodeError, Exception) as e:
+                            logger.debug(f"Failed to parse scope config: {e}")
+                            scope = None
+                    
+                    # 创建 SessionBodyField 对象
+                    session_field = SessionBodyField(
+                        id=field_id,
+                        field_name=field_name,
+                        field_value=field_value,
+                        match_strategy=match_strategy,
+                        match_pattern=match_pattern,
+                        replace_strategy=replace_strategy,
+                        content_types=content_types,
+                        priority=priority or 50,
+                        is_active=bool(is_active),
+                        expires_at=expires_at,
+                        created_at=created_at,
+                        updated_at=updated_at,
+                        source_ip=client_ip,
+                        scope=scope
+                    )
+                    
+                    # 加载到内存
+                    if client_ip not in self._session_body_fields:
+                        self._session_body_fields[client_ip] = {}
+                    self._session_body_fields[client_ip][field_name] = session_field
+                    loaded_count += 1
+                    
+                except Exception as e:
+                    logger.error(f"Failed to load session body field from row: {e}")
+                    continue
+            
+            # 更新ID计数器
+            if max_id > 0:
+                self._id_counter = max_id + 1
+            
+            if loaded_count > 0:
+                logger.info(f"Loaded {loaded_count} session body fields from database")
+            else:
+                logger.debug("No active session body fields found in database")
+                
+        except Exception as e:
+            logger.error(f"Failed to load session body fields from database: {e}")
+    
     def _generate_id(self) -> int:
         """生成唯一ID"""
         self._id_counter += 1
diff --git a/src/backEnd/utils/session_header_manager.py b/src/backEnd/utils/session_header_manager.py
@@ -21,11 +21,127 @@ def __init__(self):
         self._lock = threading.Lock()
         self._id_counter = 1  # ID计数器
         logger.debug("SessionHeaderManager initialized")
+        # 从数据库加载已有的会话请求头
+        self._load_from_database()
         
     def _get_db(self):
         """获取请求头数据库连接"""
         return DataStore.header_db
     
+    def _load_from_database(self):
+        """从数据库加载所有未过期的会话请求头"""
+        try:
+            db = self._get_db()
+            if db is None:
+                logger.debug("Database not available, skipping load from database")
+                return
+            
+            # 获取当前时间
+            current_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+            
+            # 查询所有未过期的会话请求头
+            cursor = db.only_execute("""
+                SELECT id, client_ip, header_name, header_value, replace_strategy, priority,
+                       is_active, expires_at, created_at, updated_at, scope_config
+                FROM session_headers
+                WHERE expires_at > ?
+            """, (current_time,))
+            
+            if cursor is None:
+                logger.debug("No cursor returned from database")
+                return
+            
+            loaded_count = 0
+            max_id = 0
+            
+            for row in cursor:
+                try:
+                    (header_id, client_ip, header_name, header_value, replace_strategy_str,
+                     priority, is_active, expires_at_str, created_at_str, updated_at_str,
+                     scope_config_json) = row
+                    
+                    # 跟踪最大ID
+                    if header_id and header_id > max_id:
+                        max_id = header_id
+                    
+                    # 解析替换策略
+                    try:
+                        replace_strategy = ReplaceStrategy(replace_strategy_str)
+                    except ValueError:
+                        replace_strategy = ReplaceStrategy.REPLACE
+                    
+                    # 解析expires_at
+                    expires_at = None
+                    if expires_at_str:
+                        try:
+                            expires_at = datetime.strptime(expires_at_str, '%Y-%m-%d %H:%M:%S')
+                        except ValueError:
+                            expires_at = None
+                    
+                    # 解析created_at
+                    created_at = None
+                    if created_at_str:
+                        try:
+                            created_at = datetime.strptime(created_at_str, '%Y-%m-%d %H:%M:%S')
+                        except ValueError:
+                            created_at = datetime.now()
+                    
+                    # 解析updated_at
+                    updated_at = None
+                    if updated_at_str:
+                        try:
+                            updated_at = datetime.strptime(updated_at_str, '%Y-%m-%d %H:%M:%S')
+                        except ValueError:
+                            updated_at = None
+                    
+                    # 解析scope_config
+                    scope = None
+                    if scope_config_json:
+                        try:
+                            from model.HeaderScope import HeaderScope
+                            scope_dict = json.loads(scope_config_json)
+                            scope = HeaderScope.from_dict(scope_dict)
+                        except (json.JSONDecodeError, Exception) as e:
+                            logger.debug(f"Failed to parse scope config: {e}")
+                            scope = None
+                    
+                    # 创建 SessionHeader 对象
+                    session_header = SessionHeader(
+                        id=header_id,
+                        header_name=header_name,
+                        header_value=header_value,
+                        replace_strategy=replace_strategy,
+                        priority=priority or 50,
+                        is_active=bool(is_active),
+                        expires_at=expires_at,
+                        created_at=created_at,
+                        updated_at=updated_at,
+                        source_ip=client_ip,
+                        scope=scope
+                    )
+                    
+                    # 加载到内存
+                    if client_ip not in self._session_headers:
+                        self._session_headers[client_ip] = {}
+                    self._session_headers[client_ip][header_name] = session_header
+                    loaded_count += 1
+                    
+                except Exception as e:
+                    logger.error(f"Failed to load session header from row: {e}")
+                    continue
+            
+            # 更新ID计数器
+            if max_id > 0:
+                self._id_counter = max_id + 1
+            
+            if loaded_count > 0:
+                logger.info(f"Loaded {loaded_count} session headers from database")
+            else:
+                logger.debug("No active session headers found in database")
+                
+        except Exception as e:
+            logger.error(f"Failed to load session headers from database: {e}")
+    
     def _generate_id(self) -> int:
         """生成唯一ID"""
         self._id_counter += 1
diff --git a/src/backEnd/uv.lock b/src/backEnd/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`	`MAX_TASKS_COUNT_LOCK = threading.Lock()`
`5`	`5`
`6`	`6`
`7`		`-VERSION = "1.8.7"`
	`7`	`+VERSION = "1.8.8"`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ def apply_header_rules(self):`
`147`	`147`	`# 处理请求头`
`148`	`148`	`logger.debug(f"[{self.taskid}] Processing headers with {len(self.headers)} original headers")`
`149`	`149`	`processed_headers, applied_rules = HeaderProcessor.process_headers(`
`150`		`- self.headers, persistent_rules, session_headers`
	`150`	`+ self.headers, persistent_rules, session_headers, self.scanUrl`
`151`	`151`	`)`
`152`	`152`	`logger.debug(f"[{self.taskid}] Processed headers: {len(processed_headers)}, Applied rules: {len(applied_rules)}")`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ thirdparty = [`
`10`	`10`	`"fastapi[standard]",`
`11`	`11`	`"apscheduler",`
`12`	`12`	`"psutil",`
	`13`	`+ "jsonpath-ng",`
`13`	`14`	`]`
`14`	`15`
`15`	`16`	`[[tool.uv.index]]`