Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba8b6aa8 authored by Kiran Ramachandra's avatar Kiran Ramachandra Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 1fd04218 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27696238



Change-Id: I75dc1d44cebebf8ea2d46b0c716903f1d8d5cedc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d03e3687 1fd04218

core/java/android/net/Uri.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -1391,7 +1391,11 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
         * @param scheme name or {@code null} if this is a relative Uri

         * @param scheme name or {@code null} if this is a relative Uri

         */

         */

        public Builder scheme(String scheme) {

        public Builder scheme(String scheme) {

            this.scheme = scheme;

            if (scheme != null) {

                this.scheme = scheme.replace("://", "");

            } else {

                this.scheme = null;

            }

            return this;

            return this;

        }

        }

core/tests/coretests/src/android/net/UriTest.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package android.net; 




import android.content.ContentUris;

import android.content.ContentUris;

import android.os.Parcel;

import android.os.Parcel;

import android.platform.test.annotations.AsbSecurityTest;





import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;
@@ -88,6 +89,16 @@ public class UriTest extends TestCase { 
        assertNull(u.getHost());

        assertNull(u.getHost());

    }

    }





    @AsbSecurityTest(cveBugId = 261721900)

    @SmallTest

    public void testSchemeSanitization() {

        Uri uri = new Uri.Builder()

                .scheme("http://https://evil.com:/te:st/")

                .authority("google.com").path("one/way").build();

        assertEquals("httphttpsevil.com:/te:st/", uri.getScheme());

        assertEquals("httphttpsevil.com:/te:st/://google.com/one/way", uri.toString());

    }



    @SmallTest

    @SmallTest

    public void testStringUri() {

    public void testStringUri() {

        assertEquals("bob lee",

        assertEquals("bob lee",