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

Commit 676f42c9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Block subdirs of Android for SAF and normalize the path" into tm-dev am: 26fa852f 

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



Change-Id: Icb51d071a80a0ff3d860fbd389f523c01e6575b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f72c6cef 26fa852f

core/java/com/android/internal/content/FileSystemProvider.java

+6 −0
Original line number Diff line number Diff line
@@ -414,6 +414,12 @@ public abstract class FileSystemProvider extends DocumentsProvider { 
        final File parent = getFileForDocId(parentDocumentId);

        final MatrixCursor result = new DirectoryCursor(

                resolveProjection(projection), parentDocumentId, parent);



        if (!filter.test(parent)) {

            Log.w(TAG, "No permission to access parentDocumentId: " + parentDocumentId);

            return result;

        }



        if (parent.isDirectory()) {

            for (File file : FileUtils.listFilesOrEmpty(parent)) {

                if (filter.test(file)) {

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

+26 −12
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import java.io.IOException; 
import java.io.PrintWriter;

import java.util.Collections;

import java.util.List;

import java.util.Locale;

import java.util.Objects;

import java.util.UUID;
@@ -318,13 +319,19 @@ public class ExternalStorageProvider extends FileSystemProvider { 
            }



            // Block Download folder from tree

            if (TextUtils.equals(Environment.DIRECTORY_DOWNLOADS.toLowerCase(),

                    path.toLowerCase())) {

            if (TextUtils.equals(Environment.DIRECTORY_DOWNLOADS.toLowerCase(Locale.ROOT),

                    path.toLowerCase(Locale.ROOT))) {

                return true;

            }



            if (TextUtils.equals(Environment.DIRECTORY_ANDROID.toLowerCase(),

                    path.toLowerCase())) {

            // Block /Android

            if (TextUtils.equals(Environment.DIRECTORY_ANDROID.toLowerCase(Locale.ROOT),

                    path.toLowerCase(Locale.ROOT))) {

                return true;

            }



            // Block /Android/data, /Android/obb, /Android/sandbox and sub dirs

            if (shouldHide(dir)) {

                return true;

            }
@@ -420,19 +427,21 @@ public class ExternalStorageProvider extends FileSystemProvider { 
    }



    @VisibleForTesting

    static String getPathFromDocId(String docId) {

    static String getPathFromDocId(String docId) throws IOException {

        final int splitIndex = docId.indexOf(':', 1);

        final String path = docId.substring(splitIndex + 1);

        final String docIdPath = docId.substring(splitIndex + 1);

        // Get CanonicalPath and remove the first "/"

        final String canonicalPath = new File(docIdPath).getCanonicalPath().substring(1);



        if (path.isEmpty()) {

            return path;

        if (canonicalPath.isEmpty()) {

            return canonicalPath;

        }



        // remove trailing "/"

        if (path.charAt(path.length() - 1) == '/') {

            return path.substring(0, path.length() - 1);

        if (canonicalPath.charAt(canonicalPath.length() - 1) == '/') {

            return canonicalPath.substring(0, canonicalPath.length() - 1);

        } else {

            return path;

            return canonicalPath;

        }

    }
@@ -463,7 +472,12 @@ public class ExternalStorageProvider extends FileSystemProvider { 
        if (!target.exists()) {

            target.mkdirs();

        }

        target = new File(target, path);

        try {

            target = new File(target, path).getCanonicalFile();

        } catch (IOException e) {

            throw new FileNotFoundException("Failed to canonicalize path " + path);

        }



        if (mustExist && !target.exists()) {

            throw new FileNotFoundException("Missing file for " + docId + " at " + target);

        }

packages/ExternalStorageProvider/tests/src/com/android/externalstorage/ExternalStorageProviderTest.java

+11 −0
Original line number Diff line number Diff line
@@ -67,5 +67,16 @@ public class ExternalStorageProviderTest { 


        docId = root + ":";

        assertTrue(getPathFromDocId(docId).isEmpty());



        docId = root + ":./" + path;

        assertEquals(getPathFromDocId(docId), path);



        final String dotPath = "abc/./def/ghi";

        docId = root + ":" + dotPath;

        assertEquals(getPathFromDocId(docId), path);



        final String twoDotPath = "abc/../abc/def/ghi";

        docId = root + ":" + twoDotPath;

        assertEquals(getPathFromDocId(docId), path);

    }

}