+ * APKs need to be world readable, so that the Android system installer + * is able to read it. Saving it into external storage to send it to the + * installer have access is insecure, because apps with permission to write + * to the external storage can overwrite the app between F-Droid asking for + * it to be installed and the installer actually installing it. + */ + private static Uri getSafeUri(Context context, SanitizedFile tempFile, boolean useContentUri) { if (useContentUri) { - // return a content Uri using support libs FileProvider - Uri apkUri = getUriForFile(context, AUTHORITY, tempApkFile); + Uri apkUri = getUriForFile(context, AUTHORITY, tempFile); context.grantUriPermission("org.fdroid.fdroid.privileged", apkUri, Intent.FLAG_GRANT_READ_URI_PERMISSION); context.grantUriPermission("com.android.bluetooth", apkUri, Intent.FLAG_GRANT_READ_URI_PERMISSION); return apkUri; } - // Need the apk to be world readable, so that the installer is able to read it. - // Note that saving it into external storage for the purpose of letting the installer - // have access is insecure, because apps with permission to write to the external - // storage can overwrite the app between F-Droid asking for it to be installed and - // the installer actually installing it. - tempApkFile.setReadable(true, false); + tempFile.setReadable(true, false); - return Uri.fromFile(tempApkFile); + return Uri.fromFile(tempFile); } } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java index e35ad48ae..222256377 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java @@ -24,8 +24,6 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.os.Build; - import org.fdroid.fdroid.data.Apk; /** @@ -82,10 +80,4 @@ public class DefaultInstaller extends Installer { protected boolean isUnattended() { return false; } - - @Override - protected boolean supportsContentUri() { - // Android N only supports content Uris - return Build.VERSION.SDK_INT >= 24; - } } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ExtensionInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/ExtensionInstaller.java index 3d0b11623..8b710e00a 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/ExtensionInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/ExtensionInstaller.java @@ -24,7 +24,6 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.net.Uri; - import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.privileged.install.InstallExtensionDialogActivity; @@ -33,11 +32,16 @@ import java.io.File; /** * Special Installer that is only useful to install the Privileged Extension apk - * as a privileged app into the system partition of Android. + * as a privileged app into the system partition of Android. It is deprecated + * because it cannot work on Android versions newer than {@code android-20} or so, + * due to increased SELinux enforcement that restricts what even root can do. *
* This is installer requires user interaction and thus install/uninstall directly * return PendingIntents. + * + * @see Chainfire talks Android Lollipop and the future of rooting */ +@Deprecated public class ExtensionInstaller extends Installer { ExtensionInstaller(Context context, Apk apk) { @@ -94,9 +98,4 @@ public class ExtensionInstaller extends Installer { protected boolean isUnattended() { return false; } - - @Override - protected boolean supportsContentUri() { - return false; - } } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java index edb82acd4..9356159aa 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/FileInstaller.java @@ -85,10 +85,4 @@ public class FileInstaller extends Installer { protected boolean isUnattended() { return false; } - - @Override - protected boolean supportsContentUri() { - return false; - } - } \ No newline at end of file diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java index e9299c49a..da6809c1a 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java @@ -31,7 +31,6 @@ import android.os.PatternMatcher; import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; - import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; @@ -144,7 +143,7 @@ public abstract class Installer { PackageManager pm = context.getPackageManager(); if (Build.VERSION.SDK_INT >= 24 && ( pm.getInstallerPackageName(apk.packageName).equals("com.android.packageinstaller") - || pm.getInstallerPackageName(apk.packageName).equals("com.google.android.packageinstaller"))) { + || pm.getInstallerPackageName(apk.packageName).equals("com.google.android.packageinstaller"))) { Utils.debugLog(TAG, "Falling back to default installer for uninstall"); Intent intent = new Intent(context, DefaultInstallerActivity.class); intent.setAction(DefaultInstallerActivity.ACTION_UNINSTALL_PACKAGE); @@ -195,7 +194,7 @@ public abstract class Installer { sendBroadcastUninstall(action, pendingIntent, null); } - void sendBroadcastUninstall(String action, PendingIntent pendingIntent, String errorMessage) { + private void sendBroadcastUninstall(String action, PendingIntent pendingIntent, String errorMessage) { Uri uri = Uri.fromParts("package", apk.packageName, null); Intent intent = new Intent(action); @@ -247,7 +246,7 @@ public abstract class Installer { try { // move apk file to private directory for installation and check hash - sanitizedUri = ApkFileProvider.getSafeUri(context, localApkUri, apk, supportsContentUri()); + sanitizedUri = ApkFileProvider.getSafeUri(context, localApkUri, apk); } catch (IOException e) { Log.e(TAG, e.getMessage(), e); sendBroadcastInstall(downloadUri, Installer.ACTION_INSTALL_INTERRUPTED, e.getMessage()); @@ -270,7 +269,7 @@ public abstract class Installer { Log.e(TAG, e.getMessage(), e); Log.e(TAG, "Falling back to AOSP DefaultInstaller!"); DefaultInstaller defaultInstaller = new DefaultInstaller(context, apk); - // https://code.google.com/p/android/issues/detail?id=205827 + // https://issuetracker.google.com/issues/37091886 if (Build.VERSION.SDK_INT >= 24) { // content scheme for N and above defaultInstaller.installPackageInternal(sanitizedUri, downloadUri); @@ -298,10 +297,4 @@ public abstract class Installer { * uninstall activities, without the system enforcing a user prompt. */ protected abstract boolean isUnattended(); - - /** - * @return true if the Installer supports content Uris and not just file Uris - */ - protected abstract boolean supportsContentUri(); - } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java index 389859587..0bc880887 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java @@ -27,7 +27,6 @@ import android.content.Intent; import android.content.ServiceConnection; import android.content.pm.PackageManager; import android.net.Uri; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -404,9 +403,4 @@ public class PrivilegedInstaller extends Installer { protected boolean isUnattended() { return true; } - - @Override - protected boolean supportsContentUri() { - return Build.VERSION.SDK_INT >= 24; - } }