big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-14114 S3A can no longer handle unencoded + in URIs. Contributed by Sean Mackrory.

Browse Source 
(cherry picked from commit ff87ca84418a710c6dc884fe8c70947fcc6489d5)
This commit is contained in:
Steve Loughran 2017-02-24 10:41:36 +00:00
parent 132f758e3d
commit 9c22a91662
No known key found for this signature in database
GPG Key ID: 950CC3E032B79CA2
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/S3xLoginHelper.java
View File

@ -48,6 +48,13 @@ private S3xLoginHelper() {
"The Filesystem URI contains login details."
+" This is insecure and may be unsupported in future.";
public static final String PLUS_WARNING =
"Secret key contains a special character that should be URL encoded! " +
"Attempting to resolve...";
public static final String PLUS_UNENCODED = "+";
public static final String PLUS_ENCODED = "%2B";
/**
* Build the filesystem URI. This can include stripping down of part
* of the URI.
@ -112,7 +119,13 @@ public static Login extractLoginDetails(URI name) {
int loginSplit = login.indexOf(':');
if (loginSplit > 0) {
String user = login.substring(0, loginSplit);
String password = URLDecoder.decode(login.substring(loginSplit + 1),
String encodedPassword = login.substring(loginSplit + 1);
if (encodedPassword.contains(PLUS_UNENCODED)) {
LOG.warn(PLUS_WARNING);
encodedPassword = encodedPassword.replaceAll("\\" + PLUS_UNENCODED,
PLUS_ENCODED);
}
String password = URLDecoder.decode(encodedPassword,
"UTF-8");
return new Login(user, password);
} else if (loginSplit == 0) {

28
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3native/TestS3xLoginHelper.java
View File

@ -32,9 +32,13 @@ public class TestS3xLoginHelper extends Assert {
public static final String BUCKET = "s3a://bucket";
private static final URI ENDPOINT = uri(BUCKET);
public static final String S = "%2f";
public static final String P = "%2b";
public static final String P_RAW = "+";
public static final String USER = "user";
public static final String PASS = "pass";
public static final String PASLASHSLASH = "pa" + S + S;
public static final String PAPLUS = "pa" + P;
public static final String PAPLUS_RAW = "pa" + P_RAW;
public static final URI WITH_USER_AND_PASS = uri("s3a://user:pass@bucket");
public static final Path PATH_WITH_LOGIN =
@ -42,6 +46,10 @@ public class TestS3xLoginHelper extends Assert {
public static final URI WITH_SLASH_IN_PASS = uri(
"s3a://user:" + PASLASHSLASH + "@bucket");
public static final URI WITH_PLUS_IN_PASS = uri(
"s3a://user:" + PAPLUS + "@bucket");
public static final URI WITH_PLUS_RAW_IN_PASS = uri(
"s3a://user:" + PAPLUS_RAW + "@bucket");
public static final URI USER_NO_PASS = uri("s3a://user@bucket");
public static final URI WITH_USER_AND_COLON = uri("s3a://user:@bucket");
public static final URI NO_USER = uri("s3a://:pass@bucket");
@ -116,6 +124,16 @@ public void testLoginWithSlashInPass() throws Throwable {
assertMatchesLogin(USER, "pa//", WITH_SLASH_IN_PASS);
}
@Test
public void testLoginWithPlusInPass() throws Throwable {
assertMatchesLogin(USER, "pa+", WITH_PLUS_IN_PASS);
}
@Test
public void testLoginWithPlusRawInPass() throws Throwable {
assertMatchesLogin(USER, "pa+", WITH_PLUS_RAW_IN_PASS);
}
@Test
public void testLoginWithUser() throws Throwable {
assertMatchesLogin(USER, "", USER_NO_PASS);
@ -151,6 +169,16 @@ public void testFsUriWithSlashInPass() throws Throwable {
assertMatchesEndpoint(WITH_SLASH_IN_PASS);
}
@Test
public void testFsUriWithPlusInPass() throws Throwable {
assertMatchesEndpoint(WITH_PLUS_IN_PASS);
}
@Test
public void testFsUriWithPlusRawInPass() throws Throwable {
assertMatchesEndpoint(WITH_PLUS_RAW_IN_PASS);
}
@Test
public void testFsUriWithUser() throws Throwable {
assertMatchesEndpoint(USER_NO_PASS);