Re: [gentoo-portage-dev] [PATCH] _post_src_install_uid_fix: allow files with portage group permissions (bug 600804)

[Brian Dolbec]

On Tue, 29 Nov 2016 12:43:16 -0800
Zac Medico <zmedico@g.o> wrote:

> Allow ebuilds to install files with portage group permissions, as
> a means to restrict access to package manager resources.
>
> X-Gentoo-Bug: 600804
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600804
> ---
>  pym/portage/package/ebuild/doebuild.py | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/pym/portage/package/ebuild/doebuild.py
> b/pym/portage/package/ebuild/doebuild.py index 52dbf8b..4baae17 100644
> --- a/pym/portage/package/ebuild/doebuild.py
> +++ b/pym/portage/package/ebuild/doebuild.py
> @@ -2008,7 +2008,7 @@ def _postinst_bsdflags(mysettings):
>  def _post_src_install_uid_fix(mysettings, out):
>  	"""
>  	Files in $D with user and group bits that match the "portage"
> -	user or group are automatically mapped to PORTAGE_INST_UID
> and
> +	user and group are automatically mapped to PORTAGE_INST_UID
> and PORTAGE_INST_GID if necessary. The chown system call may clear
>  	S_ISUID and S_ISGID bits, so those bits are restored if
>  	necessary.
> @@ -2154,8 +2154,11 @@ def _post_src_install_uid_fix(mysettings, out):
>  					mystat.st_ino not in
> counted_inodes: counted_inodes.add(mystat.st_ino)
>  					size += mystat.st_size
> -				if mystat.st_uid != portage_uid and \
> -					mystat.st_gid != portage_gid:
> +
> +				# Only remap the UID/GID if both
> match the portage user,
> +				# in order to avoid interference
> with ebuilds that install
> +				# files with portage group
> permissions (see bug 600804).
> +				if (mystat.st_uid, mystat.st_gid) !=
> (portage_uid, portage_gid): continue
>  				myuid = -1
>  				mygid = -1

looks good to me

-- 
Brian Dolbec <dolsen>