Skip to content

HDDS-3765. Fluentd writing to secure Ozone S3 API fails with 500 Error. #1179

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
avijayanhwx merged 2 commits into from
Jul 15, 2020
Merged

HDDS-3765. Fluentd writing to secure Ozone S3 API fails with 500 Error. #1179

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
5e601e2
HDDS-3765. Fluentd writing to secure Ozone S3 API fails with 500 Error.
Jul 8, 2020
3a28b07
Add test case for leading '/'.
Jul 9, 2020
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
15 changes: 15 additions & 0 deletions hadoop-ozone/dist/src/main/smoketest/security/ozone-secure-s3.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Test Timeout 5 minutes

*** Variables ***
${ENDPOINT_URL} http://s3g:9878
${TEMPDIR} /tmp
${TEST_FILE} NOTICE.txt

*** Keywords ***
Setup volume names
Expand All @@ -38,6 +40,19 @@ Secure S3 test Success
${output} = Execute aws s3api --endpoint-url ${ENDPOINT_URL} list-buckets
Should contain ${output} bucket-test123

Secure S3 put-object test
${testFilePath} = Set Variable ${TEMPDIR}/${TEST_FILE}
Copy File ${TEST_FILE} ${testFilePath}
${output} = Execute aws s3api --endpoint ${ENDPOINT_URL} put-object --bucket=bucket-test123 --key=tmp1/tmp2/NOTICE.txt --body=${testFilePath}
${output} = Execute aws s3api --endpoint ${ENDPOINT_URL} list-objects --bucket=bucket-test123
Should contain ${output} tmp1/tmp2/NOTICE.txt
${output} = Execute aws s3api --endpoint ${ENDPOINT_URL} put-object --bucket=bucket-test123 --key=tmp3//tmp4/NOTICE.txt --body=${testFilePath}
${output} = Execute aws s3api --endpoint ${ENDPOINT_URL} list-objects --bucket=bucket-test123
Should contain ${output} tmp3//tmp4/NOTICE.txt
${output} = Execute aws s3api --endpoint ${ENDPOINT_URL} put-object --bucket=bucket-test123 --key=//tmp5/tmp6/NOTICE.txt --body=${testFilePath}
${output} = Execute aws s3api --endpoint ${ENDPOINT_URL} list-objects --bucket=bucket-test123
Should contain ${output} //tmp5/tmp6/NOTICE.txt

Secure S3 test Failure
Run Keyword Setup dummy credentials for S3
${rc} ${result} = Run And Return Rc And Output aws s3api --endpoint-url ${ENDPOINT_URL} create-bucket --bucket bucket-test123
Expand Down
8 changes: 1 addition & 7 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/AWSV4SignatureProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,7 @@ public void init()


this.queryMap = context.getUriInfo().getQueryParameters();
try {
this.uri = new URI(context.getUriInfo().getRequestUri()
.getPath().replaceAll("\\/+",
"/")).normalize().getPath();
} catch (URISyntaxException e) {
throw S3_AUTHINFO_CREATION_ERROR;
}
this.uri = context.getUriInfo().getRequestUri().getPath();

this.method = context.getMethod();
if (v4Header == null) {
Expand Down