Merge "Allow packages.list access with new GID." into klp-dev (8a65f5b8) · Commits · e / os / android_frameworks_base

core/java/android/os/FileUtils.java

+84 −2

Original line number	Diff line number	Diff line
		@@ -17,10 +17,17 @@
		package android.os;

		import android.util.Log;
		import android.util.Slog;

		import libcore.io.ErrnoException;
		import libcore.io.IoUtils;
		import libcore.io.Libcore;
		import libcore.io.OsConstants;

		import java.io.BufferedInputStream;
		import java.io.ByteArrayOutputStream;
		import java.io.File;
		import java.io.FileDescriptor;
		import java.io.FileInputStream;
		import java.io.FileNotFoundException;
		import java.io.FileOutputStream;
		@@ -58,9 +65,84 @@ public class FileUtils {
		/** Regular expression for safe filenames: no spaces or metacharacters */
		private static final Pattern SAFE_FILENAME_PATTERN = Pattern.compile("[\\w%+,./=_-]+");

		public static native int setPermissions(String file, int mode, int uid, int gid);
		/**
		* Set owner and mode of of given {@link File}.
		*
		* @param mode to apply through {@code chmod}
		* @param uid to apply through {@code chown}, or -1 to leave unchanged
		* @param gid to apply through {@code chown}, or -1 to leave unchanged
		* @return 0 on success, otherwise errno.
		*/
		public static int setPermissions(File path, int mode, int uid, int gid) {
		return setPermissions(path.getAbsolutePath(), mode, uid, gid);
		}

		/**
		* Set owner and mode of of given path.
		*
		* @param mode to apply through {@code chmod}
		* @param uid to apply through {@code chown}, or -1 to leave unchanged
		* @param gid to apply through {@code chown}, or -1 to leave unchanged
		* @return 0 on success, otherwise errno.
		*/
		public static int setPermissions(String path, int mode, int uid, int gid) {
		try {
		Libcore.os.chmod(path, mode);
		} catch (ErrnoException e) {
		Slog.w(TAG, "Failed to chmod(" + path + "): " + e);
		return e.errno;
		}

		if (uid >= 0 \|\| gid >= 0) {
		try {
		Libcore.os.chown(path, uid, gid);
		} catch (ErrnoException e) {
		Slog.w(TAG, "Failed to chown(" + path + "): " + e);
		return e.errno;
		}
		}

		return 0;
		}

		/**
		* Set owner and mode of of given {@link FileDescriptor}.
		*
		* @param mode to apply through {@code chmod}
		* @param uid to apply through {@code chown}, or -1 to leave unchanged
		* @param gid to apply through {@code chown}, or -1 to leave unchanged
		* @return 0 on success, otherwise errno.
		*/
		public static int setPermissions(FileDescriptor fd, int mode, int uid, int gid) {
		try {
		Libcore.os.fchmod(fd, mode);
		} catch (ErrnoException e) {
		Slog.w(TAG, "Failed to fchmod(): " + e);
		return e.errno;
		}

		public static native int getUid(String file);
		if (uid >= 0 \|\| gid >= 0) {
		try {
		Libcore.os.fchown(fd, uid, gid);
		} catch (ErrnoException e) {
		Slog.w(TAG, "Failed to fchown(): " + e);
		return e.errno;
		}
		}

		return 0;
		}

		/**
		* Return owning UID of given path, otherwise -1.
		*/
		public static int getUid(String path) {
		try {
		return Libcore.os.stat(path).st_uid;
		} catch (ErrnoException e) {
		return -1;
		}
		}

		/** returns the FAT file system volume ID for the volume mounted
		* at the given mount point, or -1 for failure

core/java/android/os/Process.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -99,12 +99,6 @@ public class Process {
		*/
		public static final int DRM_UID = 1019;

		/**
		* Defines the GID for the group that allows write access to the SD card.
		* @hide
		*/
		public static final int SDCARD_RW_GID = 1015;

		/**
		* Defines the UID/GID for the group that controls VPN services.
		* @hide
		@@ -129,12 +123,19 @@ public class Process {
		*/
		public static final int MEDIA_RW_GID = 1023;

		/**
		* Access to installed package details
		* @hide
		*/
		public static final int PACKAGE_INFO_GID = 1032;

		/**
		* Defines the start of a range of UIDs (and GIDs), going from this
		* number to {@link #LAST_APPLICATION_UID} that are reserved for assigning
		* to applications.
		*/
		public static final int FIRST_APPLICATION_UID = 10000;

		/**
		* Last of application-specific UIDs starting at
		* {@link #FIRST_APPLICATION_UID}.

core/java/com/android/internal/os/ZygoteInit.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -499,7 +499,7 @@ public class ZygoteInit {
		String args[] = {
		"--setuid=1000",
		"--setgid=1000",
		"--setgroups=1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1018,3001,3002,3003,3006,3007",
		"--setgroups=1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1018,1032,3001,3002,3003,3006,3007",
		"--capabilities=" + capabilities + "," + capabilities,
		"--runtime-init",
		"--nice-name=system_server",

core/jni/android_os_FileUtils.cpp

+0 −42

Original line number	Diff line number	Diff line
		@@ -33,46 +33,6 @@

		namespace android {

		jint android_os_FileUtils_setPermissions(JNIEnv* env, jobject clazz,
		jstring file, jint mode,
		jint uid, jint gid)
		{
		const jchar* str = env->GetStringCritical(file, 0);
		String8 file8;
		if (str) {
		file8 = String8(str, env->GetStringLength(file));
		env->ReleaseStringCritical(file, str);
		}
		if (file8.size() <= 0) {
		return ENOENT;
		}
		if (uid >= 0 \|\| gid >= 0) {
		int res = chown(file8.string(), uid, gid);
		if (res != 0) {
		return errno;
		}
		}
		return chmod(file8.string(), mode) == 0 ? 0 : errno;
		}

		jint android_os_FileUtils_getUid(JNIEnv* env, jobject clazz, jstring file)
		{
		struct stat stats;
		const jchar* str = env->GetStringCritical(file, 0);
		String8 file8;
		if (str) {
		file8 = String8(str, env->GetStringLength(file));
		env->ReleaseStringCritical(file, str);
		}
		if (file8.size() <= 0) {
		return ENOENT;
		}
		if (stat(file8.string(), &stats) < 0) {
		return -1;
		}
		return stats.st_uid;
		}

		jint android_os_FileUtils_getFatVolumeId(JNIEnv* env, jobject clazz, jstring path)
		{
		if (path == NULL) {
		@@ -95,8 +55,6 @@ jint android_os_FileUtils_getFatVolumeId(JNIEnv* env, jobject clazz, jstring pat
		}

		static const JNINativeMethod methods[] = {
		{"setPermissions", "(Ljava/lang/String;III)I", (void*)android_os_FileUtils_setPermissions},
		{"getUid", "(Ljava/lang/String;)I", (void*)android_os_FileUtils_getUid},
		{"getFatVolumeId", "(Ljava/lang/String;)I", (void*)android_os_FileUtils_getFatVolumeId},
		};

services/java/com/android/server/pm/Settings.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED
		import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
		import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
		import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
		import static android.os.Process.SYSTEM_UID;
		import static android.os.Process.PACKAGE_INFO_GID;

		import android.content.IntentFilter;
		import android.content.pm.ActivityInfo;
		@@ -117,6 +119,7 @@ final class Settings {
		private final File mPackageListFilename;
		private final File mStoppedPackagesFilename;
		private final File mBackupStoppedPackagesFilename;

		final HashMap<String, PackageSetting> mPackages =
		new HashMap<String, PackageSetting>();
		// List of replaced system applications
		@@ -201,6 +204,8 @@ final class Settings {
		mSettingsFilename = new File(mSystemDir, "packages.xml");
		mBackupSettingsFilename = new File(mSystemDir, "packages-backup.xml");
		mPackageListFilename = new File(mSystemDir, "packages.list");
		FileUtils.setPermissions(mPackageListFilename, 0660, SYSTEM_UID, PACKAGE_INFO_GID);

		// Deprecated: Needed for migration
		mStoppedPackagesFilename = new File(mSystemDir, "packages-stopped.xml");
		mBackupStoppedPackagesFilename = new File(mSystemDir, "packages-stopped-backup.xml");
		@@ -1369,13 +1374,15 @@ final class Settings {
		-1, -1);

		// Write package list file now, use a JournaledFile.
		//
		File tempFile = new File(mPackageListFilename.toString() + ".tmp");
		File tempFile = new File(mPackageListFilename.getAbsolutePath() + ".tmp");
		JournaledFile journal = new JournaledFile(mPackageListFilename, tempFile);

		fstr = new FileOutputStream(journal.chooseForWrite());
		final File writeTarget = journal.chooseForWrite();
		fstr = new FileOutputStream(writeTarget);
		str = new BufferedOutputStream(fstr);
		try {
		FileUtils.setPermissions(fstr.getFD(), 0660, SYSTEM_UID, PACKAGE_INFO_GID);

		StringBuilder sb = new StringBuilder();
		for (final PackageSetting pkg : mPackages.values()) {
		ApplicationInfo ai = pkg.pkg.applicationInfo;
		@@ -1400,6 +1407,7 @@ final class Settings {
		// DO NOT MODIFY THIS FORMAT UNLESS YOU CAN ALSO MODIFY ITS USERS
		// FROM NATIVE CODE. AT THE MOMENT, LOOK AT THE FOLLOWING SOURCES:
		// system/core/run-as/run-as.c
		// system/core/sdcard/sdcard.c
		//
		sb.setLength(0);
		sb.append(ai.packageName);
		@@ -1421,11 +1429,6 @@ final class Settings {
		journal.rollback();
		}

		FileUtils.setPermissions(mPackageListFilename.toString(),
		FileUtils.S_IRUSR\|FileUtils.S_IWUSR
		\|FileUtils.S_IRGRP\|FileUtils.S_IWGRP,
		-1, -1);

		writeAllUsersPackageRestrictionsLPr();
		return;