Merge 'feature/rds_del_host' into 'integration_2026-04-02_1133415429890'

fix(core): URL encode presigned URL query parameter values

See merge request: !949

Author: bytestarter

volcengine-java-sdk-core/src/main/java/com/volcengine/feature/rds/auth/ConnectUtils.java

@@ -70,8 +70,6 @@ public static String buildAuthToken(ApiClient apiClient, String dbUser, String i
 
         RequestInterceptorContext reqCtx = context.getRequestContext();
         reqCtx.setPresigned(true);
-        reqCtx.setSchema(schema);
-        reqCtx.setHost(endpoint);
         reqCtx.setMethod("GET");
         reqCtx.setServiceInfo(new ServiceInfo(SERVICE_NAME, "GET"));
         reqCtx.setHeaderParams(new HashMap<>());
@@ -82,6 +80,7 @@ public static String buildAuthToken(ApiClient apiClient, String dbUser, String i
         queryParams.add(new Pair("X-Expires", String.valueOf(expires)));
         queryParams.add(new Pair("DBUser", dbUser));
         queryParams.add(new Pair("InstanceId", instanceId));
+        queryParams.add(new Pair("X-Host", schema + "://" + endpoint));
         reqCtx.setQueryParams(queryParams);
 
         // Execute sign interceptor for presigning

volcengine-java-sdk-core/src/main/java/com/volcengine/interceptor/SignRequestInterceptor.java

@@ -14,6 +14,8 @@
 import org.apache.commons.lang.StringUtils;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.*;
 
 public class SignRequestInterceptor implements RequestInterceptor {
@@ -28,7 +30,7 @@ public String name() {
     @Override
     public InterceptorContext intercept(InterceptorContext context) throws ApiException {
         String path = context.getRequestContext().getPath();
-        String method=context.getRequestContext().getMethod();
+        String method = context.getRequestContext().getMethod();
         Map<String, String> headerParams = context.getRequestContext().getHeaderParams();
         List<Pair> queryParams = context.getRequestContext().getQueryParams();
         ServiceInfo serviceInfo = context.getRequestContext().getServiceInfo();
@@ -75,8 +77,7 @@ public InterceptorContext intercept(InterceptorContext context) throws ApiExcept
             String host = context.getRequestContext().getHost();
             try {
                 Map<String, String> presignedParams = volcengineSign.presign(queryParamsMap, host);
-                String presignedUrl = buildPresignedUrl(
-                        context.getRequestContext().getSchema(), host, presignedParams);
+                String presignedUrl = buildPresignedUrl(context.getRequestContext().getSchema(), host, presignedParams);
                 context.getRequestContext().setPresignedUrl(presignedUrl);
             } catch (Exception e) {
                 throw new ApiException(e);
@@ -125,15 +126,23 @@ public InterceptorContext intercept(InterceptorContext context) throws ApiExcept
 
     private static String buildPresignedUrl(String scheme, String host, Map<String, String> presignedParams) {
         StringBuilder url = new StringBuilder();
-        url.append(scheme).append("://").append(host).append("?");
+        if (StringUtils.isNotEmpty(scheme) && StringUtils.isNotEmpty(host)) {
+            url.append(scheme).append("://").append(host).append("?");
+        }
 
         List<String> keys = new ArrayList<>(presignedParams.keySet());
         Collections.sort(keys);
 
         for (int i = 0; i < keys.size(); i++) {
             String key = keys.get(i);
             String value = presignedParams.get(key);
-            url.append(key).append("=").append(value);
+            try {
+                url.append(key)
+                   .append("=")
+                   .append(URLEncoder.encode(value, "UTF-8").replace("+", "%20"));
+            } catch (UnsupportedEncodingException e) {
+                url.append(key).append("=").append(value);
+            }
             if (i < keys.size() - 1) {
                 url.append("&");
             }