myagent-ai 1.31.3 → 1.32.2

package/core/browser_profile.py

@@ -99,9 +99,15 @@ class BrowserProfile:
             base_dir: Profile 根目录
             config: 预置配置（来自 PRESET_PROFILES）
         """
+        # [v1.32.2] 安全修复: 路径遍历防护
+        if ".." in name or "/" in name or "\\" in name or not name:
+            raise ValueError(f"无效的 Profile 名称: {name}")
         self.name = name
         self.base_dir = base_dir
-        self.profile_dir = base_dir / name
+        # 二次校验: 确保解析后的路径仍在 base_dir 内
+        self.profile_dir = (base_dir / name).resolve()
+        if not str(self.profile_dir).startswith(str(base_dir.resolve())):
+            raise ValueError(f"Profile 名称 '{name}' 导致路径逃逸: {self.profile_dir}")
         self.user_data_dir = self.profile_dir / "user_data"
         self.cookies_file = self.profile_dir / "cookies.json"
         self.config_file = self.profile_dir / "config.json"

package/core/web_control.py

@@ -713,17 +713,41 @@ class WebControlManager:
         if parsed.scheme not in ('http', 'https'):
             raise ValueError(f"Unsupported URL scheme: {parsed.scheme}")
 
-        # 禁止访问内网地址
+        # 禁止访问内网地址（防止 SSRF 攻击）
         hostname = parsed.hostname
-        if hostname and (
-            hostname in ('localhost', '127.0.0.1', '0.0.0.0', '::1') or
-            hostname.startswith('10.') or
-            hostname.startswith('192.168.') or
-            hostname.startswith('172.') or
-            hostname.endswith('.local')
-        ):
-            # 允许本地访问（开发环境需要）
-            pass  # 暂不禁用内网, 可通过配置控制
+        import ipaddress
+        if hostname:
+            # 解析 hostname 为 IP（处理 DNS Rebinding）
+            try:
+                import socket
+                resolved_ips = socket.getaddrinfo(hostname, parsed.port or 443, socket.AF_UNSPEC, socket.SOCK_STREAM)
+                for family, _, _, _, sockaddr in resolved_ips:
+                    ip = sockaddr[0]
+                    try:
+                        ip_obj = ipaddress.ip_address(ip)
+                        # 阻止所有内网地址
+                        if ip_obj.is_private or ip_obj.is_loopback or ip_obj.is_link_local or ip_obj.is_reserved or ip_obj.is_multicast:
+                            raise ValueError(f"SSRF blocked: {hostname} resolves to private/reserved IP {ip}")
+                    except ValueError:
+                        raise
+            except socket.gaierror:
+                pass
+            # 字符串级别的快速检查（防止绕过）
+            blocked = (
+                hostname in ('localhost', '127.0.0.1', '0.0.0.0', '::1', '::') or
+                hostname.endswith('.local') or
+                hostname.endswith('.internal') or
+                hostname.startswith('10.') or
+                hostname.startswith('192.168.') or
+                # 172.16.0.0 - 172.31.255.255
+                (hostname.startswith('172.') and len(hostname.split('.')) >= 3 and 16 <= int(hostname.split('.')[1]) <= 31) or
+                # 169.254.0.0/16 云元数据
+                hostname.startswith('169.254.') or
+                # 100.64.0.0/10 CGN
+                hostname.startswith('100.') and len(hostname.split('.')) >= 2 and 64 <= int(hostname.split('.')[1]) <= 127
+            )
+            if blocked:
+                raise ValueError(f"SSRF blocked: cannot access internal address {hostname}")
 
         # 检查缓存（仅对非 session 请求）
         cache_key = hashlib.md5(url.encode()).hexdigest()