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

Commit e618fd8f authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-team Robot
Browse files

Forbid content from MmsFileProvider in Bluetooth Share 

Bug: 179910660
Test: verified against POC
Change-Id: I8a888e67ba70d4a8b5721e4124bd8ccb671baaf7
(cherry picked from commit 2d679eea)
parent bb97a4de

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
@@ -448,6 +448,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.