[patch] add sandboxing to recent version of prefix-portage

portage-2.2.00.14200-msb.patch (text/plain), 6.89 KB, created by Michael Weiser on 2009-10-25 12:50:03 UTC

--- prefix-portage-2.2.00.14200//pym/portage/__init__.py.msb	2009-09-05 15:36:26.000000000 +0200
+++ prefix-portage-2.2.00.14200//pym/portage/__init__.py	2009-09-19 19:13:32.000000000 +0200
@@ -100,7 +100,7 @@
 	from portage.const import VDB_PATH, PRIVATE_PATH, CACHE_PATH, DEPCACHE_PATH, \
 		USER_CONFIG_PATH, MODULES_FILE_PATH, CUSTOM_PROFILE_PATH, PORTAGE_BASE_PATH, \
 		PORTAGE_BIN_PATH, PORTAGE_PYM_PATH, PROFILE_PATH, LOCALE_DATA_PATH, \
-		EBUILD_SH_BINARY, SANDBOX_BINARY, BASH_BINARY, \
+		EBUILD_SH_BINARY, SANDBOX_BINARY, MACOSSANDBOX_BINARY, MACOSSANDBOX_PROFILE, BASH_BINARY, \
 		MOVE_BINARY, PRELINK_BINARY, WORLD_FILE, MAKE_CONF_FILE, MAKE_DEFAULTS_FILE, \
 		DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \
 		INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, CONFIG_MEMORY_FILE,\
@@ -2188,6 +2188,21 @@
 			if bsd_chflags:
 				self.features.add('chflags')
 
+			if not portage.process.macossandbox_capable and \
+				("macossandbox" in self.features or "macosusersandbox" in self.features):
+				if self.profile_path is not None and \
+					os.path.realpath(self.profile_path) == \
+					os.path.realpath(PROFILE_PATH):
+					""" Don't show this warning when running repoman and the
+					sandbox feature came from a profile that doesn't belong to
+					the user."""
+					writemsg(colorize("BAD", "!!! Problem with macos sandbox" + \
+						" binary. Disabling...\n\n"), noiselevel=-1)
+				if "macossandbox" in self.features:
+					self.features.remove("macossandbox")
+				if "macosusersandbox" in self.features:
+					self.features.remove("macosusersandbox")
+
 			self["FEATURES"] = " ".join(sorted(self.features))
 			self.backup_changes("FEATURES")
 			global _glep_55_enabled, _validate_cache_for_unsupported_eapis
@@ -3883,13 +3898,26 @@
 	# fake ownership/permissions will have to be converted to real
 	# permissions in the merge phase.
 	fakeroot = fakeroot and uid != 0 and portage.process.fakeroot_capable
+	macossandbox = ("macossandbox" in features or \
+		"macosusersandbox" in features)
 	if droppriv and not uid and portage_gid and portage_uid:
 		keywords.update({"uid":portage_uid,"gid":portage_gid,
 			"groups":userpriv_groups,"umask":002})
 	if not free:
-		free=((droppriv and "usersandbox" not in features) or \
+		free=((droppriv and "usersandbox" not in features and
+			"macosusersandbox" not in features) or \
 			(not droppriv and "sandbox" not in features and \
-			"usersandbox" not in features and not fakeroot))
+			"usersandbox" not in features and not fakeroot and \
+			not macossandbox))
+
+	# confining the process to a prefix sandbox is disabled by default, if
+	# a normal sandbox is requested a this point, it will be used, if no
+	# sandbox is requested, a prefix sandbox will be imposed if requested
+	# by the appropriate features
+	prefixsandbox = False
+	if free:
+		prefixsandbox = "macosprefixsandbox" in features
+		free = not prefixsandbox
 
 	if free or "SANDBOX_ACTIVE" in os.environ:
 		keywords["opt_name"] += " bash"
@@ -3898,6 +3926,25 @@
 		keywords["opt_name"] += " fakeroot"
 		keywords["fakeroot_state"] = os.path.join(mysettings["T"], "fakeroot.state")
 		spawn_func = portage.process.spawn_fakeroot
+	elif macossandbox:
+		keywords["opt_name"] += " macossandbox"
+		if prefixsandbox:
+			sbprefixpath = mysettings["EPREFIX"]
+		else:
+			sbprefixpath = mysettings["PORTAGE_BUILDDIR"]
+
+		# escape some characters with special meaning in re's
+		sbprefixre = sbprefixpath.replace("+", "\+")
+		sbprefixre = sbprefixre.replace("*", "\*")
+		sbprefixre = sbprefixre.replace("[", "\[")
+		sbprefixre = sbprefixre.replace("[", "\[")
+
+		sbprofile = MACOSSANDBOX_PROFILE
+		sbprofile = sbprofile.replace("@@WRITEABLE_PREFIX@@", sbprefixpath)
+		sbprofile = sbprofile.replace("@@WRITEABLE_PREFIX_RE@@", sbprefixre)
+
+		keywords["profile"] = sbprofile
+		spawn_func = portage.process.spawn_macossandbox
 	else:
 		keywords["opt_name"] += " sandbox"
 		spawn_func = portage.process.spawn_sandbox
@@ -6996,13 +7043,15 @@
 		restrict = mysettings["PORTAGE_RESTRICT"].split()
 		nosandbox = (("userpriv" in features) and \
 			("usersandbox" not in features) and \
+			("macosusersandbox" not in features) and \
 			"userpriv" not in restrict and \
 			"nouserpriv" not in restrict)
 		if nosandbox and ("userpriv" not in features or \
 			"userpriv" in restrict or \
 			"nouserpriv" in restrict):
 			nosandbox = ("sandbox" not in features and \
-				"usersandbox" not in features)
+				"usersandbox" not in features and \
+				"macosusersandbox" not in features)
 
 		sesandbox = mysettings.selinux_enabled() and \
 			"sesandbox" in mysettings.features
--- prefix-portage-2.2.00.14200//pym/portage/const.py.msb	2009-09-05 15:35:23.000000000 +0200
+++ prefix-portage-2.2.00.14200//pym/portage/const.py	2009-09-19 19:13:55.000000000 +0200
@@ -78,6 +78,31 @@
 BASH_BINARY              = PORTAGE_BASH
 MOVE_BINARY              = PORTAGE_MV
 PRELINK_BINARY           = EPREFIX + "/usr/sbin/prelink"
+MACOSSANDBOX_BINARY     = "/usr/bin/sandbox-exec"
+MACOSSANDBOX_PROFILE    = '''(version 1)
+
+(allow default)
+
+(deny file-write*)
+
+(allow file-read* file-write*
+  (literal
+    #"@@WRITEABLE_PREFIX@@"
+  )
+
+  (regex
+    #"^@@WRITEABLE_PREFIX_RE@@/"
+    #"^(/private)?/var/tmp"
+    #"^(/private)?/tmp"
+  )
+)
+
+(allow file-read-data file-write-data
+  (regex
+    #"^/dev/null$"
+    #"^(/private)?/var/run/syslog$"
+  )
+)'''
 
 INVALID_ENV_FILE         = "/etc/spork/is/not/valid/profile.env"
 REPO_NAME_FILE           = "repo_name"
--- prefix-portage-2.2.00.14200//pym/portage/process.py.msb	2009-08-24 11:37:45.000000000 +0200
+++ prefix-portage-2.2.00.14200//pym/portage/process.py	2009-09-19 19:13:32.000000000 +0200
@@ -17,7 +17,7 @@
 	'portage.util:dump_traceback',
 )
 
-from portage.const import BASH_BINARY, SANDBOX_BINARY, FAKEROOT_BINARY
+from portage.const import BASH_BINARY, SANDBOX_BINARY, MACOSSANDBOX_BINARY, FAKEROOT_BINARY
 from portage.exception import CommandNotFound
 
 try:
@@ -40,6 +40,9 @@
 fakeroot_capable = (os.path.isfile(FAKEROOT_BINARY) and
                     os.access(FAKEROOT_BINARY, os.X_OK))
 
+macossandbox_capable = (os.path.isfile(MACOSSANDBOX_BINARY) and
+                   os.access(MACOSSANDBOX_BINARY, os.X_OK))
+
 def spawn_bash(mycommand, debug=False, opt_name=None, **keywords):
 	"""
 	Spawns a bash shell running a specific commands
@@ -89,6 +92,19 @@
 	args.append(mycommand)
 	return spawn(args, opt_name=opt_name, **keywords)
 
+def spawn_macossandbox(mycommand, profile=None, opt_name=None, **keywords):
+	if not macossandbox_capable:
+		return spawn_bash(mycommand, opt_name=opt_name, **keywords)
+	args=[MACOSSANDBOX_BINARY]
+	if not opt_name:
+		opt_name = os.path.basename(mycommand.split()[0])
+	args.append("-p")
+	args.append(profile)
+	args.append(BASH_BINARY)
+	args.append("-c")
+	args.append(mycommand)
+	return spawn(args, opt_name=opt_name, **keywords)
+
 _exithandlers = []
 def atexit_register(func, *args, **kargs):
 	"""Wrapper around atexit.register that is needed in order to track