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

androidx · Sep 12, 2024 · 17e0fd2 · 17e0fd2
1 parent f133e8d
commit 17e0fd2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMessageUtil.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMessageUtil.java
@@ -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();

diff --git a/...ries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMessageUtilTest.java b/...ries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMessageUtilTest.java
@@ -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:pass@foo.bar/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";