@@ -1028,7 +1028,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { } private String parseHost() { - String authority = getAuthority(); + String authority = getEncodedAuthority(); if (authority == null) { return null; } @@ -1037,9 +1037,11 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { int userInfoSeparator = authority.indexOf('@'); int portSeparator = authority.indexOf(':', userInfoSeparator); - return portSeparator == NOT_FOUND + String encodedHost = portSeparator == NOT_FOUND ? authority.substring(userInfoSeparator + 1) : authority.substring(userInfoSeparator + 1, portSeparator); + + return decode(encodedHost); } private volatile int port = NOT_CALCULATED; @@ -1051,7 +1053,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { } private int parsePort() { - String authority = getAuthority(); + String authority = getEncodedAuthority(); if (authority == null) { return -1; } @@ -1065,7 +1067,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { return -1; } - String portString = authority.substring(portSeparator + 1); + String portString = decode(authority.substring(portSeparator + 1)); try { return Integer.parseInt(portString); } catch (NumberFormatException e) { core/java/android/net/Uri.java @@ -171,6 +171,11 @@ public class UriTest extends TestCase { assertEquals("bob lee", uri.getUserInfo()); assertEquals("bob%20lee", uri.getEncodedUserInfo()); + uri = Uri.parse("http://bob%40lee%3ajr@local%68ost:4%32"); + assertEquals("bob@lee:jr", uri.getUserInfo()); + assertEquals("localhost", uri.getHost()); + assertEquals(42, uri.getPort()); + uri = Uri.parse("http://localhost"); assertEquals("localhost", uri.getHost()); assertEquals(-1, uri.getPort()); tests/AndroidTests/src/com/android/unit_tests/UriTest.java f9d9cf1ec146d8edbb2094416a823cd7b43098d0 Kenny Root kenny@the-b.org http://github.com/android/platform_frameworks_base/commit/fc01794f33057862a361a0d0113630c58befc21b fc01794f33057862a361a0d0113630c58befc21b 2009-09-14T17:45:04-07:00 2009-07-12T08:33:28-07:00 Make Uri.parseUserPart, parseHost, and parsePort symmetric Currently parseUserPart uses the encoded authority to split the URI into user and non-user parts, but the parseHost and parsePort uses the decoded URI to split the URI into non-host, host, and port parts. This gives unexpected results when %40 ('@') and %3a (':') is used in a URI: Uri test = Uri.parse("http://bob%40lee%3ajr@example.com:42/"); test.getUserInfo() => "bob@lee:jr" test.getHost() => "lee:jr@example.com" (should be "example.com") test.getPort() => -1 (should be 42) 9f6096454c1ad47c4c3a9b5b2e2ef40517a02543 Jean-Baptiste Queru jbq@google.com