feat: update code

Author: msslulu

base/src/main/java/com/tinyengine/it/mcp/tools/GitFileReaderService.java

@@ -21,6 +21,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.annotation.ToolParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,19 +64,19 @@ public class GitFileReaderService {
 	 * @param url The URL of the file to be read.
 	 * @return A JSON string representing the result of the operation, or an error message if the process fails.
 	 */
-	@Tool(name="bundle_create",description = "给定的 文件URL 读取内容.")
-	public String readFileFromRepo(String url) {
+	@Tool(name="bundle_create",description = "通过给定的bundle.json文件URL同步物料库")
+	public String readFileFromRepo(@ToolParam(description = "bundle.json文件地址，必须是可以在地址栏请求到的")String url) {
 		try {
-			urlValidateUtil.validateFinalUrl(url);
 			log.info("准备从  URL  {} 中读取文件内容", url);
-
+			URL url1 = new URL(url);
+			urlValidateUtil.validateHost(url1.getHost());
+			log.info("URL  {} 的主机验证通过", url);
 			//1.从给定的  URL 读取内容
-			byte[] fileBytes = fetchBytes(url);
+			byte[] fileBytes = fetchBytes(url1);
 
 			// 2. 获取文件名和json内容
 			JsonFile jsonFile = new JsonFile();
-			URI uri = new URI(url);
-			String path = uri.getPath();  // 获取路径部分，例如 /opentiny/tiny-engine/main/designer-demo/public/mock/bundle.json
+			String path = url1.getPath();
 			if (path == null || path.isEmpty()) {
 				return "";
 			}
@@ -165,13 +166,11 @@ public String readFileFromRepo(String url) {
 	/**
 	 * Fetches the content of a file from a given URL as a byte array.
 	 *
-	 * @param urlString The URL of the file.
+	 * @param url The URL of the file.
 	 * @return The file content as a byte array.
 	 * @throws IOException If a network or I/O error occurs.
 	 */
-	public static byte[] fetchBytes(String urlString) throws IOException {
-		log.info("开始从 URL  {} 中读取内容", urlString);
-		URL url = new URL(urlString);
+	public static byte[] fetchBytes(URL url) throws IOException {
 		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 		connection.setRequestMethod("GET");
 		connection.setInstanceFollowRedirects(false);
@@ -439,7 +438,10 @@ public FileResult bulkCreate(List<Component> componentList) {
 				// 更新记录
 				component.setId(queryComponent.get(0).getId());
 				component.setLastUpdatedTime(LocalDateTime.now());
-				baseMapper.updateComponentById(component);
+				Integer i = baseMapper.updateComponentById(component);
+				if(i != 1) {
+					throw new IllegalStateException("updateComponentById failed: " + i);
+				}
 				updateNum = updateNum + 1;
 			}
 		}

base/src/main/java/com/tinyengine/it/mcp/utils/UrlValidateUtil.java

@@ -18,19 +18,8 @@ public UrlValidateUtil(OpenAIConfig config) {
 	}
 
 
-	public void validateFinalUrl(String finalUrl) {
-		if(finalUrl == null || finalUrl.isEmpty()) {
-			throw new ServiceException("400", "baseUrl cannot be null or empty");
-		}
-
-		URI uri;
-		try {
-			uri = new URI(finalUrl);
-		} catch (URISyntaxException e) {
-			throw new ServiceException("400", "Invalid baseUrl format");
-		}
+	public void validateHost(String host) {
 
-		String host = uri.getHost();
 		if (host == null || host.isEmpty()) {
 			throw new ServiceException("400", "Invalid baseUrl: missing host");
 		}
@@ -44,7 +33,6 @@ public void validateFinalUrl(String finalUrl) {
 				throw new ServiceException("500", "No AI allowed hosts configured");
 			}
 
-			enforceHttpsAndIpCheck(uri, host);
 			return;
 		}
 
@@ -59,94 +47,9 @@ public void validateFinalUrl(String finalUrl) {
 			throw new ServiceException("400", "Loopback addresses are not allowed for custom baseUrl");
 		}
 
-		enforceHttpsAndIpCheck(uri, host);
-	}
-
-	void enforceHttpsAndIpCheck(URI uri, String host) {
-		String scheme = uri.getScheme();
-		if (scheme == null || !"https".equalsIgnoreCase(scheme)) {
-			throw new ServiceException("400", "Only HTTPS protocol is allowed for custom baseUrl");
-		}
-
-		try {
-			InetAddress[] addresses = resolveHostAddresses(host);
-			boolean hasBlockedAddress = Arrays.stream(addresses).anyMatch(this::isBlockedAddress);
-			if (hasBlockedAddress) {
-				throw new ServiceException("400", "Internal network addresses are not allowed");
-			}
-		} catch (UnknownHostException e) {
-			throw new ServiceException("400", "Unable to resolve host: " + host);
-		}
-	}
-
-	InetAddress[] resolveHostAddresses(String host) throws UnknownHostException {
-		return InetAddress.getAllByName(host);
-	}
-
-	boolean isBlockedAddress(InetAddress address) {
-		if (address.isLoopbackAddress()
-			|| address.isSiteLocalAddress()
-			|| address.isLinkLocalAddress()
-			|| address.isAnyLocalAddress()
-			|| address.isMulticastAddress()) {
-			return true;
-		}
-
-		if (address instanceof Inet4Address) {
-			return isBlockedIpv4((Inet4Address) address);
-		}
-		if (address instanceof Inet6Address) {
-			return isBlockedIpv6((Inet6Address) address);
-		}
-		return false;
 	}
 
-	private boolean isBlockedIpv4(Inet4Address address) {
-		byte[] octets = address.getAddress();
-		int first = octets[0] & 0xFF;
-		int second = octets[1] & 0xFF;
-		int third = octets[2] & 0xFF;
 
-		if (first == 0) {
-			return true;
-		}
-		if (first == 100 && second >= 64 && second <= 127) {
-			return true;
-		}
-		if (first == 192 && second == 0 && third == 0) {
-			return true;
-		}
-		if (first == 192 && second == 0 && third == 2) {
-			return true;
-		}
-		if (first == 198 && (second == 18 || second == 19)) {
-			return true;
-		}
-		if (first == 198 && second == 51 && third == 100) {
-			return true;
-		}
-		if (first == 203 && second == 0 && third == 113) {
-			return true;
-		}
-		return first >= 240;
-	}
 
-	private boolean isBlockedIpv6(Inet6Address address) {
-		byte[] octets = address.getAddress();
-		int first = octets[0] & 0xFF;
-		int second = octets[1] & 0xFF;
-
-		if ((first & 0xFE) == 0xFC) {
-			return true;
-		}
-		if (first == 0x20 && second == 0x01) {
-			int third = octets[2] & 0xFF;
-			int fourth = octets[3] & 0xFF;
-			if (third == 0x0D && fourth == 0xB8) {
-				return true;
-			}
-		}
-		return first == 0xFF;
-	}
 
 }