Skip to content

Fixed removal of user info for URLs that contain encoded @ characters #1138

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
merged 3 commits into from
Sep 13, 2024
Merged

Fixed removal of user info for URLs that contain encoded @ characters #1138

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17e0fd2
Fixed removal of user info for URLs that contain encoded @ characters
Lavamancer Feb 28, 2024
61343cd
Format with google-java-format
microkatz Sep 12, 2024
661f3de
Added note in release notes
microkatz Sep 12, 2024
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
Next Next commit
Fixed removal of user info for URLs that contain encoded @ characters
  • Loading branch information
@Lavamancer @microkatz
Lavamancer authored and microkatz committed Sep 12, 2024
commit 17e0fd22b12cceca8430a16578ec0935a409ea26
2 changes: 1 addition & 1 deletion libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMessageUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public static Uri removeUserInfo(Uri uri) {
}

// The Uri must include a "@" if the user info is non-null.
String authorityWithUserInfo = checkNotNull(uri.getAuthority());
String authorityWithUserInfo = checkNotNull(uri.getEncodedAuthority());
checkArgument(authorityWithUserInfo.contains("@"));
String authority = Util.split(authorityWithUserInfo, "@")[1];
return uri.buildUpon().encodedAuthority(authority).build();
Expand Down
7 changes: 7 additions & 0 deletions ...ries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMessageUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,13 @@ public void removeUserInfo_withNoUserInfo() {
.isEqualTo(Uri.parse("rtsp://foo.bar:5050/foo.mkv"));
}

@Test
public void removeUserInfo_withEncodedAtInUserInfo() {
Uri uri = Uri.parse("rtsp://user%40name:[email protected]/foo.mkv");
assertThat(RtspMessageUtil.removeUserInfo(uri))
.isEqualTo(Uri.parse("rtsp://foo.bar/foo.mkv"));
}

@Test
public void parseContentLengthHeader_withContentLengthOver31Bits_succeeds() throws Exception {
String line = "Content-Length: 1000000000000000";
Expand Down