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

Commit 6066a28a authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Forbid content from MmsFileProvider in Bluetooth Share am: 2d679eea am: bf2d02e4 am: 1861bc0f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/14296216

Change-Id: I681e083754992fa4e0aa13bcbcb6e97d5060ab8b
parents a4e345be 1861bc0f

android/app/src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -110,6 +110,12 @@ public class BluetoothOppSendFileInfo { 
        // This will allow more 3rd party applications to share files via

        // bluetooth

        if ("content".equals(scheme)) {

            if (fromExternal && BluetoothOppUtility.isForbiddenContent(uri)) {

                EventLog.writeEvent(0x534e4554, "179910660", -1, uri.toString());

                Log.e(TAG, "Content from forbidden URI is not allowed.");

                return SEND_FILE_INFO_ERROR;

            }



            contentType = contentResolver.getType(uri);

            Cursor metadataCursor;

            try {

android/app/src/com/android/bluetooth/opp/BluetoothOppUtility.java

+7 −0
Original line number Diff line number Diff line
@@ -429,6 +429,13 @@ public class BluetoothOppUtility { 
        return isSameOrSubDirectory(Environment.getExternalStorageDirectory(), file);

    }



    static boolean isForbiddenContent(Uri uri) {

        if ("com.android.bluetooth.map.MmsFileProvider".equals(uri.getHost())) {

            return true;

        }

        return false;

    }



    /**

     * Checks, whether the child directory is the same as, or a sub-directory of the base

     * directory. Neither base nor child should be null.