# t4129 failure when sticky bit set 7 messages from 2020-12-30 to 2021-01-09. Participants: Kevin Daudt, Matheus Tavares, Junio C Hamano, Matheus Tavares Bernardino. Thread: https://gitlist.dev/t/54905 ## Kevin Daudt, 2020-12-30 12:05 Subject: t4129 failure when sticky bit set Message-ID: URL: https://gitlist.dev/e/X%2BxtAR87vWuNiLoE%40alpha ``` The new test (do not use core.sharedRepository for working tree files) in t4129-apply-sammode.sh does not account for sticky bits set: --- d_mode.expected 2020-12-30 11:56:11.869555700 +0000 +++ d_mode.actual 2020-12-30 11:56:11.872889055 +0000 @@ -1 +1 @@ -drwx------ +drwx--S--- This sticky bit (g+s) is set on my home dir and thus inherrited. ``` ## Matheus Tavares, 2020-12-30 14:52 Subject: [PATCH] t4129: don't fail if setgid is set in the parent directory Message-ID: <88398ff952a68e8d134dcd50ef0772bb6fc3b456.1609339792.git.matheus.bernardino@usp.br> URL: https://gitlist.dev/e/88398ff952a68e8d134dcd50ef0772bb6fc3b456.1609339792.git.matheus.bernardino%40usp.br In-Reply-To: ``` The last test of t4129 creates a directory and expects its setgid bit (g+s) to be off. But this makes the test fail when the parent directory has the bit set, as setgid's state is inherited by newly created subdirectories. Make the test more robust by accepting the presence of the setgid bit on the created directory. We only allow 'S' (setgid on but no executable permission) and not 's' (setgid on with executable permission) because the previous 'umask 0077' shouldn't allow the second scenario to happen. Note that only subdirectories inherit this bit, so we don't have to make the same change for the regular file that is also created by this test. But checking the permissions using grep instead of test_cmp makes the test a little simpler, so let's use it for the regular file as well. Also note that the sticky bit (+t) and the setuid bit (u+s) are not inherited, so we don't have to worry about those. Reported-by: Kevin Daudt Signed-off-by: Matheus Tavares --- t/t4129-apply-samemode.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh index 41818d8315..3818398ca9 100755 --- a/t/t4129-apply-samemode.sh +++ b/t/t4129-apply-samemode.sh @@ -90,12 +90,10 @@ test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree rm -rf d f1 && git apply patch-f1-and-f2.txt && - echo "-rw-------" >f1_mode.expected && - echo "drwx------" >d_mode.expected && - test_modebits f1 >f1_mode.actual && - test_modebits d >d_mode.actual && - test_cmp f1_mode.expected f1_mode.actual && - test_cmp d_mode.expected d_mode.actual + test_modebits f1 >f1_mode && + test_modebits d >d_mode && + grep "^-rw-------$" f1_mode && + grep "^drwx--[-S]---$" d_mode ) ' -- 2.29.2 ``` ## Kevin Daudt, 2020-12-30 21:05 Subject: Re: [PATCH] t4129: don't fail if setgid is set in the parent directory Message-ID: URL: https://gitlist.dev/e/X%2Bzrryp6ndOa5rOM%40alpha In-Reply-To: <88398ff952a68e8d134dcd50ef0772bb6fc3b456.1609339792.git.matheus.bernardino@usp.br> ``` On Wed, Dec 30, 2020 at 11:52:25AM -0300, Matheus Tavares wrote: > The last test of t4129 creates a directory and expects its setgid bit > (g+s) to be off. But this makes the test fail when the parent directory > has the bit set, as setgid's state is inherited by newly created > subdirectories. Make the test more robust by accepting the presence of > the setgid bit on the created directory. We only allow 'S' (setgid on > but no executable permission) and not 's' (setgid on with executable > permission) because the previous 'umask 0077' shouldn't allow the second > scenario to happen. > > Note that only subdirectories inherit this bit, so we don't have to make > the same change for the regular file that is also created by this test. > But checking the permissions using grep instead of test_cmp makes the > test a little simpler, so let's use it for the regular file as well. > > Also note that the sticky bit (+t) and the setuid bit (u+s) are not > inherited, so we don't have to worry about those. > > Reported-by: Kevin Daudt > Signed-off-by: Matheus Tavares > --- > t/t4129-apply-samemode.sh | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh > index 41818d8315..3818398ca9 100755 > --- a/t/t4129-apply-samemode.sh > +++ b/t/t4129-apply-samemode.sh > @@ -90,12 +90,10 @@ test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree > rm -rf d f1 && > git apply patch-f1-and-f2.txt && > > - echo "-rw-------" >f1_mode.expected && > - echo "drwx------" >d_mode.expected && > - test_modebits f1 >f1_mode.actual && > - test_modebits d >d_mode.actual && > - test_cmp f1_mode.expected f1_mode.actual && > - test_cmp d_mode.expected d_mode.actual > + test_modebits f1 >f1_mode && > + test_modebits d >d_mode && > + grep "^-rw-------$" f1_mode && > + grep "^drwx--[-S]---$" d_mode > ) > ' > > -- > 2.29.2 > Tested-by: Kevin Daudt ``` ## Junio C Hamano, 2021-01-04 23:57 Subject: Re: [PATCH] t4129: don't fail if setgid is set in the parent directory Message-ID: URL: https://gitlist.dev/e/xmqqpn2k1ci0.fsf%40gitster.c.googlers.com In-Reply-To: <88398ff952a68e8d134dcd50ef0772bb6fc3b456.1609339792.git.matheus.bernardino@usp.br> ``` Matheus Tavares writes: > diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh > index 41818d8315..3818398ca9 100755 > --- a/t/t4129-apply-samemode.sh > +++ b/t/t4129-apply-samemode.sh > @@ -90,12 +90,10 @@ test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree > rm -rf d f1 && > git apply patch-f1-and-f2.txt && > > - echo "-rw-------" >f1_mode.expected && > - echo "drwx------" >d_mode.expected && > - test_modebits f1 >f1_mode.actual && > - test_modebits d >d_mode.actual && > - test_cmp f1_mode.expected f1_mode.actual && > - test_cmp d_mode.expected d_mode.actual > + test_modebits f1 >f1_mode && > + test_modebits d >d_mode && > + grep "^-rw-------$" f1_mode && > + grep "^drwx--[-S]---$" d_mode > ) > ' It somehow feels to me that this approach would not scale well. Shouldn't this knowledge of inherited sticky gid bit hidden behind the test_modebits helper function? Thanks. ``` ## Matheus Tavares, 2021-01-05 15:47 Subject: [PATCH v2] t4129: don't fail if setgid is set in the test directory Message-ID: URL: https://gitlist.dev/e/b734425e3235651e738e6eac47eae0db7db92e7e.1609861567.git.matheus.bernardino%40usp.br In-Reply-To: <88398ff952a68e8d134dcd50ef0772bb6fc3b456.1609339792.git.matheus.bernardino@usp.br> ``` The last test of t4129 creates a directory and expects its setgid bit (g+s) to be off. But this makes the test fail when the parent directory has the bit set, as setgid's state is inherited by newly created subdirectories. One way to solve this problem is to allow the presence of this bit when comparing the return of `test_modebits` with the expected value. But then we may have the same problem in the future when other tests start using `test_modebits` on directories (currently t4129 is the only one) and forget about setgid. Instead, let's make the helper function more robust with respect to the state of the setgid bit in the test directory by removing this bit from the returning value. There should be no problem with existing callers as no one currently expects this bit to be on. Note that the sticky bit (+t) and the setuid bit (u+s) are not inherited, so we don't have to worry about those. Reported-by: Kevin Daudt Signed-off-by: Matheus Tavares --- t/test-lib-functions.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 999982fe4a..2f08ce7cba 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -367,9 +367,14 @@ test_chmod () { git update-index --add "--chmod=$@" } -# Get the modebits from a file or directory. +# Get the modebits from a file or directory, ignoring the setgid bit (g+s). +# This bit is inherited by subdirectories at their creation. So we remove it +# from the returning string to prevent callers from having to worry about the +# state of the bit in the test directory. +# test_modebits () { - ls -ld "$1" | sed -e 's|^\(..........\).*|\1|' + ls -ld "$1" | sed -e 's|^\(..........\).*|\1|' \ + -e 's|^\(......\)S|\1-|' -e 's|^\(......\)s|\1x|' } # Unset a configuration variable, but don't fail if it doesn't exist. -- 2.29.2 ``` ## Junio C Hamano, 2021-01-06 23:59 Subject: Re: [PATCH v2] t4129: don't fail if setgid is set in the test directory Message-ID: URL: https://gitlist.dev/e/xmqqlfd5obvx.fsf%40gitster.c.googlers.com In-Reply-To: ``` Matheus Tavares writes: > +# Get the modebits from a file or directory, ignoring the setgid bit (g+s). > +# This bit is inherited by subdirectories at their creation. So we remove it > +# from the returning string to prevent callers from having to worry about the > +# state of the bit in the test directory. > +# We probably do not use "chmod g+s" manually on regular files, so I may be being overly "correct", but shouldn't these be done only for directories? > test_modebits () { > - ls -ld "$1" | sed -e 's|^\(..........\).*|\1|' > + ls -ld "$1" | sed -e 's|^\(..........\).*|\1|' \ > + -e 's|^\(......\)S|\1-|' -e 's|^\(......\)s|\1x|' That is, -e 's|^\(d.....\)S|\1-|' -e 's|^\(d.....\)s|\1x|' instead of applying the rule to any filetype. Will queue as-is, as the distinction probably would not matter in practice. Thanks. ``` ## Matheus Tavares Bernardino, 2021-01-09 14:19 Subject: Re: [PATCH v2] t4129: don't fail if setgid is set in the test directory Message-ID: URL: https://gitlist.dev/e/CAHd-oW4Yus5E5U0dykUBfwYM7dryz94YZW_9OFUSZNA-6pp3UA%40mail.gmail.com In-Reply-To: ``` On Wed, Jan 6, 2021 at 8:59 PM Junio C Hamano wrote: > > Matheus Tavares writes: > > > +# Get the modebits from a file or directory, ignoring the setgid bit (g+s). > > +# This bit is inherited by subdirectories at their creation. So we remove it > > +# from the returning string to prevent callers from having to worry about the > > +# state of the bit in the test directory. > > +# > > We probably do not use "chmod g+s" manually on regular files, so I > may be being overly "correct", but shouldn't these be done only for > directories? > > > test_modebits () { > > - ls -ld "$1" | sed -e 's|^\(..........\).*|\1|' > > + ls -ld "$1" | sed -e 's|^\(..........\).*|\1|' \ > > + -e 's|^\(......\)S|\1-|' -e 's|^\(......\)s|\1x|' > > That is, > > -e 's|^\(d.....\)S|\1-|' -e 's|^\(d.....\)s|\1x|' > > instead of applying the rule to any filetype. Yeah, you're right. I ended up applying the rule on regular files as well just for standardization. That is, if some day, for some reason, a test script decides to use "chmod g+s" on a regular file and a directory, test_modebits would treat them equally to avoid any confusion. But I guess it's very unlikely that we will ever need to set the setgid bit on a test, anyway... > Will queue as-is, as the distinction probably would not matter in > practice. > > Thanks. ```