Skip to content

[fix](load) fix s3 load connection check failed #56123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 2 commits into from
Sep 19, 2025
Merged

[fix](load) fix s3 load connection check failed #56123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d6c378
[fix](load) fix s3 load connection check failed
liaoxin01 Sep 16, 2025
d03068f
add case
liaoxin01 Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/LoadStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,11 @@ public RedirectStatus getRedirectStatus() {
private void checkEndpoint(String endpoint) throws UserException {
HttpURLConnection connection = null;
try {
String urlStr = "http://" + endpoint;
String urlStr = endpoint;
// Add default protocol if not specified
if (!endpoint.startsWith("http://") && !endpoint.startsWith("https://")) {
urlStr = "http://" + endpoint;
}
SecurityChecker.getInstance().startSSRFChecking(urlStr);
URL url = new URL(urlStr);
connection = (HttpURLConnection) url.openConnection();
Expand All @@ -599,7 +603,13 @@ private void checkEndpoint(String endpoint) throws UserException {
if (e instanceof UserException) {
msg = ((UserException) e).getDetailMessage();
} else {
msg = e.getMessage();
msg = String.format("%s: %s", e.getClass().getSimpleName(),
e.getMessage() != null ? e.getMessage() : "Unknown error");
if (e.getCause() != null) {
msg += String.format(" (Caused by: %s: %s)",
e.getCause().getClass().getSimpleName(),
e.getCause().getMessage() != null ? e.getCause().getMessage() : "Unknown cause");
}
}
throw new UserException(InternalErrorCode.GET_REMOTE_DATA_ERROR,
"Failed to access object storage, message=" + msg, e);
Expand Down Expand Up @@ -638,6 +648,8 @@ public void checkS3Param() throws UserException {
}

public void checkWhiteList(String endpoint) throws UserException {
endpoint = endpoint.replaceFirst("^http://", "");
endpoint = endpoint.replaceFirst("^https://", "");
List<String> whiteList = new ArrayList<>(Arrays.asList(Config.s3_load_endpoint_white_list));
whiteList.removeIf(String::isEmpty);
if (!whiteList.isEmpty() && !whiteList.contains(endpoint)) {
Expand Down
43 changes: 43 additions & 0 deletions ...ession-test/suites/load_p0/broker_load/test_domain_connection_and_ak_sk_correction.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,49 @@ suite("test_domain_connection_and_ak_sk_correction", "load_p0") {
"""
logger.info("the first sql result is {}", result)

def endpoint = getS3Endpoint().replace("http://", "").replace("https://", "")
def httpEndpoint = "http://" + endpoint
label = UUID.randomUUID().toString().replace("-", "")
result = sql """
LOAD LABEL ${label}
(
DATA INFILE("s3://${getS3BucketName()}/regression/tpch/sf1/part.tbl")
INTO TABLE ${tableName}
COLUMNS TERMINATED BY "|"
(p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment, temp)
)
WITH S3
(
"AWS_ENDPOINT" = "${httpEndpoint}",
"AWS_ACCESS_KEY" = "${getS3AK()}",
"AWS_SECRET_KEY" = "${getS3SK()}",
"AWS_REGION" = "${getS3Region()}",
"PROVIDER" = "${getS3Provider()}"
);
"""
logger.info("the first sql result is {}", result)

def httpsEndpoint = "https://" + endpoint
label = UUID.randomUUID().toString().replace("-", "")
result = sql """
LOAD LABEL ${label}
(
DATA INFILE("s3://${getS3BucketName()}/regression/tpch/sf1/part.tbl")
INTO TABLE ${tableName}
COLUMNS TERMINATED BY "|"
(p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment, temp)
)
WITH S3
(
"AWS_ENDPOINT" = "${httpsEndpoint}",
"AWS_ACCESS_KEY" = "${getS3AK()}",
"AWS_SECRET_KEY" = "${getS3SK()}",
"AWS_REGION" = "${getS3Region()}",
"PROVIDER" = "${getS3Provider()}"
);
"""
logger.info("the first sql result is {}", result)

label = UUID.randomUUID().toString().replace("-", "")
try {
result = sql """
Expand Down