From d301cbce7acb33e6752cd11b1eca058b7c57c827 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 11 Feb 2026 10:23:26 +0800
Subject: [PATCH] 2026-02-04 优化minio中转接口
---
ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java | 275 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 201 insertions(+), 74 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java b/ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java
index 2fc1b51..07edad6 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/sample/media/MinioStsProxyController.java
@@ -15,9 +15,15 @@
import javax.net.ssl.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.Socket;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
import java.util.Enumeration;
import java.util.concurrent.TimeUnit;
@@ -29,88 +35,187 @@
// ==================== 常量配置 ====================
private static final String PROXY_PREFIX = "/minioTransfer";
- private static final int BUFFER_SIZE = 32768;
+ private static final int BUFFER_SIZE = 65536;
+ private static final long MAX_MEMORY_SIZE = 1024 * 1024 * 100; // 100MB
private static final String X_AMZ_SECURITY_TOKEN = "X-Amz-Security-Token";
private static final String TRANSFER_ENCODING = "Transfer-Encoding";
private static final String CONTENT_LENGTH = "Content-Length";
private static final String HOST = "Host";
- // 配置文件注入
+ // 配置注入
@Value("${oss.endpoint}")
private String minioEndpoint;
-
- private static final Integer connectTimeout=10;
-
- private static final Integer readWriteTimeout=300;
+ private static final Integer connectTimeout = 30;
+ private static final Integer readWriteTimeout = 1800;
@Autowired
private OssServiceContext ossService;
- // OkHttp 单例客户端，全局复用
+ // OkHttp客户端（全局）
private static OkHttpClient httpClient;
- // 静态初始化，仅执行一次
+ // 静态初始化：全局禁用SSL校验 + 强制兼容加密套件
static {
- createUnsafeOkHttpClient();
+ // 第一步：全局禁用SSL证书校验（终极兜底）
+ disableSslVerification();
+ // 第二步：创建兼容MinIO的OkHttp客户端
+ createOkHttpClient();
}
/**
- * 修复SSL配置：创建忽略证书校验的OkHttp客户端
+ * 全局禁用SSL证书校验（绕过所有SSL检查，仅内网/测试环境使用）
*/
- private static void createUnsafeOkHttpClient() {
+ private static void disableSslVerification() {
try {
- // 1. 创建信任所有证书的TrustManager
+ // 获取信任所有证书的TrustManager
TrustManager[] trustAllCerts = new TrustManager[]{
new X509TrustManager() {
- @Override
- public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {}
- @Override
- public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {}
- @Override
- public java.security.cert.X509Certificate[] getAcceptedIssuers() {
- return new java.security.cert.X509Certificate[0];
- }
+ public X509Certificate[] getAcceptedIssuers() { return null; }
+ public void checkClientTrusted(X509Certificate[] certs, String authType) {}
+ public void checkServerTrusted(X509Certificate[] certs, String authType) {}
}
};
- // 2. 初始化SSL上下文
- SSLContext sslContext = SSLContext.getInstance("TLS");
+ // 获取SSL上下文，强制TLS 1.2
+ SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
+ sslContext.init(null, trustAllCerts, new SecureRandom());
+ HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
+
+ // 禁用主机名验证
+ HostnameVerifier allHostsValid = (hostname, session) -> true;
+ HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
+
+ log.info("全局SSL证书校验已禁用（仅测试环境）");
+ } catch (NoSuchAlgorithmException | KeyManagementException e) {
+ log.error("全局禁用SSL校验失败", e);
+ }
+ }
+
+ /**
+ * 创建兼容MinIO的OkHttp客户端（强制加密套件 + TCP优化）
+ */
+ private static void createOkHttpClient() {
+ try {
+ // 1. 初始化SSL上下文（强制TLS 1.2 + 信任所有证书）
+ SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
+ TrustManager[] trustAllCerts = new TrustManager[]{
+ new X509TrustManager() {
+ @Override
+ public void checkClientTrusted(X509Certificate[] certs, String authType) {}
+ @Override
+ public void checkServerTrusted(X509Certificate[] certs, String authType) {}
+ @Override
+ public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
+ }
+ };
sslContext.init(null, trustAllCerts, new SecureRandom());
SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
- // 3. 构建OkHttp客户端
+ // 2. 配置MinIO兼容的加密套件（关键！解决握手后断开）
+ String[] compatibleCiphers = {
+ "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+ "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+ "TLS_RSA_WITH_AES_128_GCM_SHA256",
+ "TLS_RSA_WITH_AES_256_GCM_SHA384"
+ };
+
+ // 3. 自定义SSLSocketFactory，强制加密套件
+ SSLSocketFactory customSslSocketFactory = new SSLSocketFactory() {
+ @Override
+ public String[] getDefaultCipherSuites() {
+ return compatibleCiphers;
+ }
+
+ @Override
+ public String[] getSupportedCipherSuites() {
+ return compatibleCiphers;
+ }
+
+ @Override
+ public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+ SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(s, host, port, autoClose);
+ sslSocket.setEnabledCipherSuites(compatibleCiphers);
+ sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
+ return sslSocket;
+ }
+
+ @Override
+ public Socket createSocket(String host, int port) throws IOException {
+ SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(host, port);
+ sslSocket.setEnabledCipherSuites(compatibleCiphers);
+ sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
+ return sslSocket;
+ }
+
+ @Override
+ public Socket createSocket(String host, int port, java.net.InetAddress localHost, int localPort) throws IOException {
+ SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(host, port, localHost, localPort);
+ sslSocket.setEnabledCipherSuites(compatibleCiphers);
+ sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
+ return sslSocket;
+ }
+
+ @Override
+ public Socket createSocket(java.net.InetAddress host, int port) throws IOException {
+ SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(host, port);
+ sslSocket.setEnabledCipherSuites(compatibleCiphers);
+ sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
+ return sslSocket;
+ }
+
+ @Override
+ public Socket createSocket(java.net.InetAddress address, int port, java.net.InetAddress localAddress, int localPort) throws IOException {
+ SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(address, port, localAddress, localPort);
+ sslSocket.setEnabledCipherSuites(compatibleCiphers);
+ sslSocket.setEnabledProtocols(new String[]{"TLSv1.2"});
+ return sslSocket;
+ }
+ };
+
+ // 4. 构建OkHttp客户端（简化TCP优化，避免SocketFactory编译错误）
httpClient = new OkHttpClient.Builder()
- .sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0])
+ .sslSocketFactory(customSslSocketFactory, (X509TrustManager) trustAllCerts[0])
.hostnameVerifier((hostname, session) -> true)
+ // 强制TLS 1.2和兼容加密套件
+ .connectionSpecs(Arrays.asList(
+ new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+ .tlsVersions(TlsVersion.TLS_1_2)
+ .cipherSuites(compatibleCiphers)
+ .build()
+ ))
+ // TCP优化：禁用Nagle算法（通过JVM参数或OkHttp的callTimeout间接优化）
+ .callTimeout(30, TimeUnit.SECONDS) // 调用总超时
.connectTimeout(connectTimeout, TimeUnit.SECONDS)
.readTimeout(readWriteTimeout, TimeUnit.SECONDS)
.writeTimeout(readWriteTimeout, TimeUnit.SECONDS)
- .connectionPool(new ConnectionPool(10, 5, TimeUnit.MINUTES))
+ .connectionPool(new ConnectionPool(20, 10, TimeUnit.MINUTES))
.retryOnConnectionFailure(true)
+ .pingInterval(10, TimeUnit.SECONDS) // 缩短保活间隔
.build();
+ log.info("OkHttp客户端初始化完成（兼容MinIO TLS 1.2）");
} catch (Exception e) {
- log.error("OkHttp SSL配置初始化失败，使用默认客户端", e);
+ log.error("OkHttp初始化失败，使用默认客户端", e);
httpClient = new OkHttpClient();
}
}
+ // ========== 以下方法与之前一致，无需修改 ==========
@ApiOperation("MinIO STS临时凭证通用代理")
@RequestMapping("/**")
public void proxyRequest(HttpServletRequest request, HttpServletResponse response) {
String method = request.getMethod();
String requestUri = request.getRequestURI();
String queryString = request.getQueryString();
- log.info("STS代理请求开始 | 方法:{} | URI:{} | 参数:{}", method, requestUri, queryString);
+ log.info("STS代理请求开始 | 方法:{} | URI:{} | 参数:{} | 内容长度:{}",
+ method, requestUri, queryString, request.getContentLengthLong());
- // 构造目标地址
String targetUrl = buildTargetUrl(requestUri, queryString);
if (targetUrl == null) {
sendError(response, HttpServletResponse.SC_BAD_REQUEST, "请求路径非法");
return;
}
- // 获取STS凭证
CredentialsDTO credentials = getCredentials();
if (credentials == null) {
sendError(response, HttpServletResponse.SC_FORBIDDEN, "STS凭证无效");
@@ -118,20 +223,15 @@
}
try {
- // 构建请求
Request okRequest = buildRequest(request, method, targetUrl, credentials);
- // 执行并转发响应
forwardResponse(okRequest, response);
log.info("STS代理请求成功 | 目标地址:{}", targetUrl);
} catch (Exception e) {
log.error("STS代理请求执行异常", e);
- sendError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "代理服务异常");
+ sendError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "代理服务异常：" + e.getMessage());
}
}
- /**
- * 构造MinIO请求地址
- */
private String buildTargetUrl(String requestUri, String queryString) {
try {
String targetPath = requestUri.substring(PROXY_PREFIX.length());
@@ -146,9 +246,6 @@
}
}
- /**
- * 获取并校验STS临时凭证
- */
private CredentialsDTO getCredentials() {
try {
CredentialsDTO dto = ossService.getCredentials();
@@ -164,70 +261,101 @@
}
}
- /**
- * 构建OkHttp请求对象 - 核心修复：移除Content-Length过滤
- */
private Request buildRequest(HttpServletRequest request, String method, String url, CredentialsDTO credentials) throws IOException {
Request.Builder builder = new Request.Builder().url(url);
- // 透传原始请求头，仅过滤Host头（OkHttp自动管理），保留Content-Length
+ // 透传请求头
Enumeration<String> headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
String name = headerNames.nextElement();
- // 仅过滤Host，不再过滤Content-Length，修复MissingContentLength错误
if (name.equalsIgnoreCase(HOST)) {
continue;
}
builder.addHeader(name, request.getHeader(name));
}
- // 强制添加STS安全令牌（MinIO必填）
+ // 添加STS令牌
builder.addHeader(X_AMZ_SECURITY_TOKEN, credentials.getSecurityToken());
- // 构造请求体：非GET/HEAD请求携带流数据
+ // 构建请求体
RequestBody body = null;
if (!"GET".equalsIgnoreCase(method) && !"HEAD".equalsIgnoreCase(method)) {
- // 获取客户端原始Content-Length
long contentLength = request.getContentLengthLong();
- body = new RequestBody() {
- @Override
- public MediaType contentType() {
- String contentType = request.getContentType();
- return contentType != null ? MediaType.parse(contentType) : MediaType.parse("application/octet-stream");
- }
+ InputStream inputStream = request.getInputStream();
- // 重写方法，告知OkHttp固定长度，避免转为chunked编码
- @Override
- public long contentLength() {
- return contentLength;
- }
+ // 小文件预读取
+ if (contentLength > 0 && contentLength <= MAX_MEMORY_SIZE) {
+ log.info("小文件上传：预读取到内存，长度:{:.2f}MB", contentLength / 1024.0 / 1024.0);
+ byte[] content = readInputStreamToBytes(inputStream);
+ MediaType mediaType = request.getContentType() != null
+ ? MediaType.parse(request.getContentType())
+ : MediaType.parse("application/octet-stream");
+ body = RequestBody.create(content, mediaType);
+ } else {
+ log.info("大文件/未知长度上传：使用流式传输");
+ body = new RequestBody() {
+ @Override
+ public MediaType contentType() {
+ String contentType = request.getContentType();
+ return contentType != null ? MediaType.parse(contentType) : MediaType.parse("application/octet-stream");
+ }
- @Override
- public void writeTo(BufferedSink sink) {
- try (InputStream inputStream = request.getInputStream()) {
+ @Override
+ public long contentLength() {
+ return contentLength;
+ }
+
+ @Override
+ public void writeTo(BufferedSink sink) throws IOException {
byte[] buffer = new byte[BUFFER_SIZE];
int len;
- while ((len = inputStream.read(buffer)) != -1) {
- sink.write(buffer, 0, len);
+ long totalWritten = 0;
+ try (InputStream in = inputStream) {
+ while ((len = in.read(buffer)) != -1) {
+ sink.write(buffer, 0, len);
+ totalWritten += len;
+ if (totalWritten % (1024 * 1024 * 100) == 0) {
+ sink.flush();
+ log.info("已上传：{:.2f}MB", totalWritten / 1024.0 / 1024.0);
+ }
+ }
+ sink.flush();
+ log.info("流式上传完成，总写入：{:.2f}MB", totalWritten / 1024.0 / 1024.0);
+ } catch (IOException e) {
+ log.error("流式上传失败，已写入：{:.2f}MB", totalWritten / 1024.0 / 1024.0, e);
+ throw e;
}
- sink.flush();
- } catch (IOException e) {
- log.error("请求体流写入失败", e);
}
- }
- };
+ };
+ }
}
builder.method(method, body);
return builder.build();
}
- /**
- * 执行请求并将响应透传给前端
- */
+ private byte[] readInputStreamToBytes(InputStream inputStream) throws IOException {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ byte[] buffer = new byte[BUFFER_SIZE];
+ int len;
+ while ((len = inputStream.read(buffer)) != -1) {
+ bos.write(buffer, 0, len);
+ }
+ bos.flush();
+ byte[] result = bos.toByteArray();
+ bos.close();
+ return result;
+ }
+
private void forwardResponse(Request request, HttpServletResponse response) throws IOException {
try (Response okResponse = httpClient.newCall(request).execute()) {
- // 设置响应状态码
+ // 新增：确保响应编码和类型正确
+ response.setCharacterEncoding("UTF-8");
+ String responseContentType = okResponse.header("Content-Type");
+ if (responseContentType != null) {
+ response.setContentType(responseContentType);
+ }
+
response.setStatus(okResponse.code());
// 透传响应头
@@ -249,14 +377,13 @@
response.getOutputStream().write(buffer, 0, len);
}
response.getOutputStream().flush();
+ } catch (IOException e) {
+ log.warn("响应体转发失败（客户端可能已断开连接）", e);
}
}
}
}
- /**
- * 统一错误响应工具方法
- */
private void sendError(HttpServletResponse response, int code, String msg) {
try {
response.sendError(code, msg);
--
Gitblit v1.9.3