# [PATCH v2 1/1] t6300: fix match with insecure memory 13 messages from 2023-08-21 to 2023-08-23. Participants: Christian Hesse, Kousik Sanagavarapu, Junio C Hamano, Eric Sunshine. Thread: https://gitlist.dev/t/60141 ## Christian Hesse, 2023-08-21 20:25 Subject: [PATCH v2 1/1] t6300: fix match with insecure memory Message-ID: <20230821202606.49067-1-list@eworm.de> URL: https://gitlist.dev/e/20230821202606.49067-1-list%40eworm.de In-Reply-To: <20230821222448.1524a5fc@leda.eworm.net> ``` From: Christian Hesse Running the tests in a build environment makes gnupg print a warning: gpg: Warning: using insecure memory! This warning breaks the match, as `head` misses one line. Let's strip the line, make `head` return what is expected and fix the match. Signed-off-by: Christian Hesse --- t/t6300-for-each-ref.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 5b434ab451..0f9981798e 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -1764,12 +1764,13 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' ' test_expect_success GPG2 'bare signature atom' ' git verify-commit first-signed 2>out.raw && - grep -Ev "checking the trustdb|PGP trust model" out.raw >out && + grep -Ev "checking the trustdb|PGP trust model|using insecure memory" out.raw >out && head -3 out >expect && tail -1 out >>expect && echo >>expect && git for-each-ref refs/tags/first-signed \ - --format="%(signature)" >actual && + --format="%(signature)" >out.raw && + grep -Ev "using insecure memory" out.raw >actual && test_cmp expect actual ' -- 2.41.0 ``` ## Christian Hesse, 2023-08-21 20:24 Subject: Re: [PATCH 1/1] t6300: fix match with insecure memory Message-ID: <20230821222448.1524a5fc@leda.eworm.net> URL: https://gitlist.dev/e/20230821222448.1524a5fc%40leda.eworm.net In-Reply-To: <20230821200645.36796-1-list@eworm.de> ``` Christian Hesse on Mon, 2023/08/21 22:06: > From: Christian Hesse > > Running the tests in a build environment makes gnupg print a warning: > > gpg: Warning: using insecure memory! > > This warning breaks the match, as `head` misses one line. Let's strip > the line, make `head` return what is expected and fix the match. Ups, my fingers are typing too fast... Of course this one was incomplete. See the follow up... -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Best regards my address: */=0;b=c[a++];) putchar(b-1/(/* Chris cc -ox -xc - && ./x */b/42*2-3)*42);} ``` ## Kousik Sanagavarapu, 2023-08-22 07:54 Subject: Re: [PATCH v2 1/1] t6300: fix match with insecure memory Message-ID: URL: https://gitlist.dev/e/ZORpucPcjzm-dhjP%40five231003 In-Reply-To: <20230821202606.49067-1-list@eworm.de> ``` Christian Hesse wrote: > From: Christian Hesse > > Running the tests in a build environment makes gnupg print a warning: > > gpg: Warning: using insecure memory! > > This warning breaks the match, as `head` misses one line. Let's strip > the line, make `head` return what is expected and fix the match. > > Signed-off-by: Christian Hesse I think a bit of an explanation about why this warning is showing up in the commit message would be good. "man gpg" gives me On older systems this program should be installed as setuid(root). This is necessary to lock memory pages. Locking memory pages prevents the operating system from writing memory pages (which may contain passphrases or other sensitive material) to disk. If you get no warning message about insecure memory your operating system supports locking without being root. The program drops root privileges as soon as locked memory is allocated. Note also that some systems (especially laptops) have the ability to ``suspend to disk'' (also known as ``safe sleep'' or ``hibernate''). This writes all memory to disk before going into a low power or even powered off mode. Unless measures are taken in the operating system to protect the saved memory, passphrases or other sensitive material may be recoverable from it later. So it seems that this warning will pop up if gpg is writing memory pages to disk which is bad because as stated above we don't want these pages written to disk which is a security risk. > --- > t/t6300-for-each-ref.sh | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh > index 5b434ab451..0f9981798e 100755 > --- a/t/t6300-for-each-ref.sh > +++ b/t/t6300-for-each-ref.sh > @@ -1764,12 +1764,13 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' ' > > test_expect_success GPG2 'bare signature atom' ' > git verify-commit first-signed 2>out.raw && > - grep -Ev "checking the trustdb|PGP trust model" out.raw >out && > + grep -Ev "checking the trustdb|PGP trust model|using insecure memory" out.raw >out && > head -3 out >expect && > tail -1 out >>expect && > echo >>expect && > git for-each-ref refs/tags/first-signed \ > - --format="%(signature)" >actual && > + --format="%(signature)" >out.raw && > + grep -Ev "using insecure memory" out.raw >actual && > test_cmp expect actual > ' > > -- > 2.41.0 We skip "checking the trustdb" and "PGP trust model" lines (which are not warnings) here because we don't really need those from the output that GPG produces here but skipping a warning too seems kind of a question mark. It also seems that one could use "--no-secmem-warning" to suppress such a warning. So a better place to make a change would not be in t/t6300 but in t/lib-gpg from where the prereq GPG2 comes from. Although I'm against this, because we don't really want to suppress any warnings. I think it is a good thing this test is breaking because it informs us about the security risk. I have Cc'ed people who might have a thought on this. So it's better to wait for their response. Thanks ``` ## Christian Hesse, 2023-08-22 09:04 Subject: Re: [PATCH v2 1/1] t6300: fix match with insecure memory Message-ID: <20230822110404.1c002dcf@leda.eworm.net> URL: https://gitlist.dev/e/20230822110404.1c002dcf%40leda.eworm.net In-Reply-To: ``` Kousik Sanagavarapu on Tue, 2023/08/22 13:24: > Christian Hesse wrote: > > > From: Christian Hesse > > > > Running the tests in a build environment makes gnupg print a warning: > > > > gpg: Warning: using insecure memory! > > > > This warning breaks the match, as `head` misses one line. Let's strip > > the line, make `head` return what is expected and fix the match. > > > > Signed-off-by: Christian Hesse > > I think a bit of an explanation about why this warning is showing up in the > commit message would be good. > > "man gpg" gives me > > So it seems that this warning will pop up if gpg is writing memory pages to > disk which is bad because as stated above we don't want these pages written > to disk which is a security risk. The Arch Linux packages are built inside a clean container, started via systemd-nspawn. Within the container the system call @memlock is not allowed by default, for security reasons. There's an upstream systemd issue on this topic: https://github.com/systemd/systemd/issues/9414 Note this is only true at build time. If the packages are installed on the actual system the @memlock system call is available and things work as expected without issues. > > --- > > t/t6300-for-each-ref.sh | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh > > index 5b434ab451..0f9981798e 100755 > > --- a/t/t6300-for-each-ref.sh > > +++ b/t/t6300-for-each-ref.sh > > @@ -1764,12 +1764,13 @@ test_expect_success GPGSSH 'setup for signature > > atom using ssh' ' > > test_expect_success GPG2 'bare signature atom' ' > > git verify-commit first-signed 2>out.raw && > > - grep -Ev "checking the trustdb|PGP trust model" out.raw >out && > > + grep -Ev "checking the trustdb|PGP trust model|using insecure > > memory" out.raw >out && head -3 out >expect && > > tail -1 out >>expect && > > echo >>expect && > > git for-each-ref refs/tags/first-signed \ > > - --format="%(signature)" >actual && > > + --format="%(signature)" >out.raw && > > + grep -Ev "using insecure memory" out.raw >actual && > > test_cmp expect actual > > ' > > > > -- > > 2.41.0 > > We skip "checking the trustdb" and "PGP trust model" lines (which are not > warnings) here because we don't really need those from the output that GPG > produces here but skipping a warning too seems kind of a question mark. > > It also seems that one could use "--no-secmem-warning" to suppress such a > warning. So a better place to make a change would not be in t/t6300 but in > t/lib-gpg from where the prereq GPG2 comes from. Although I'm against this, > because we don't really want to suppress any warnings. > > I think it is a good thing this test is breaking because it informs us about > the security risk. I have Cc'ed people who might have a thought on this. So > it's better to wait for their response. Well, after all I just want to change the tests to succeed with our build environment, let's take a detailed look at the issue. All command below are inside the build environment, so including the warning about insecure memory. The output of `git verify-commit first-signed` is: ---- >8 ---- gpg: Warning: using insecure memory! gpg: Signature made Tue Aug 22 08:46:43 2023 UTC gpg: using DSA key 73D758744BE721698EC54E8713B6F51ECDDE430D gpg: issuer "committer@example.com" gpg: checking the trustdb gpg: marginals needed: 3 completes needed: 1 trust model: pgp gpg: depth: 0 valid: 1 signed: 0 trust: 0-, 0q, 0n, 0m, 0f, 1u gpg: Good signature from "C O Mitter " [ultimate] ---- >8 ---- Whereas `git for-each-ref refs/tags/first-signed --format="%(signature)"` gives: ---- >8 ---- gpg: Warning: using insecure memory! gpg: Signature made Tue Aug 22 08:46:43 2023 UTC gpg: using DSA key 73D758744BE721698EC54E8713B6F51ECDDE430D gpg: issuer "committer@example.com" gpg: Good signature from "C O Mitter " [ultimate] ---- >8 ---- Running `head -3` on first output causes the warning to be included, but the issuer line to be removed. That is what finally differs between `expect` and `actual`. Just changing the number of lines brings other issues I guess... As far as I known the output on issuer was added recently with a gnupg release. So we need a set of commands to bring the output of both command in line, with or without warning on insecure memory. -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Best regards my address: */=0;b=c[a++];) putchar(b-1/(/* Chris cc -ox -xc - && ./x */b/42*2-3)*42);} ``` ## Christian Hesse, 2023-08-22 13:01 Subject: Re: [PATCH v2 1/1] t6300: fix match with insecure memory Message-ID: <20230822150149.541ccb35@leda.eworm.net> URL: https://gitlist.dev/e/20230822150149.541ccb35%40leda.eworm.net In-Reply-To: <20230822110404.1c002dcf@leda.eworm.net> ``` Christian Hesse on Tue, 2023/08/22 11:04: > So we need a set of commands to bring the output of both command in line, > with or without warning on insecure memory. I think I found a clean solution... Running a trustdb update earlier makes the extra lines go away, and we do not need to filter them. See the follow up... -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Best regards my address: */=0;b=c[a++];) putchar(b-1/(/* Chris cc -ox -xc - && ./x */b/42*2-3)*42);} ``` ## Christian Hesse, 2023-08-22 13:03 Subject: [PATCH 1/2] t/lib-gpg: forcibly run a trustdb update Message-ID: <20230822130315.71259-1-list@eworm.de> URL: https://gitlist.dev/e/20230822130315.71259-1-list%40eworm.de In-Reply-To: <20230822150149.541ccb35@leda.eworm.net> ``` From: Christian Hesse We want to compare output later, so randomly popping up 'gpg: checking the trustdb' breaks the tests. Run the trustdb update forcibly. Signed-off-by: Christian Hesse --- t/lib-gpg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 4eebd9c2b5..83b83c9abb 100644 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -45,6 +45,7 @@ test_lazy_prereq GPG ' "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && gpg --homedir "${GNUPGHOME}" --import-ownertrust \ "$TEST_DIRECTORY"/lib-gpg/ownertrust && + gpg --homedir "${GNUPGHOME}" --update-trustdb && gpg --homedir "${GNUPGHOME}" /dev/null \ --sign -u committer@example.com ;; -- 2.42.0 ``` ## Christian Hesse, 2023-08-22 13:03 Subject: [PATCH 2/2] t/t6300: drop magic filtering Message-ID: <20230822130315.71259-2-list@eworm.de> URL: https://gitlist.dev/e/20230822130315.71259-2-list%40eworm.de In-Reply-To: <20230822130315.71259-1-list@eworm.de> ``` From: Christian Hesse Now that we ran a trustdb check forcibly it does no longer pullute the output. Filtering is no longer required... Signed-off-by: Christian Hesse --- t/t6300-for-each-ref.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 5b434ab451..aa3c7c03c4 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -1763,10 +1763,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' ' ' test_expect_success GPG2 'bare signature atom' ' - git verify-commit first-signed 2>out.raw && - grep -Ev "checking the trustdb|PGP trust model" out.raw >out && - head -3 out >expect && - tail -1 out >>expect && + git verify-commit first-signed 2>expect && echo >>expect && git for-each-ref refs/tags/first-signed \ --format="%(signature)" >actual && -- 2.42.0 ``` ## Junio C Hamano, 2023-08-22 15:50 Subject: Re: [PATCH v2 1/1] t6300: fix match with insecure memory Message-ID: URL: https://gitlist.dev/e/xmqqcyzfm5yp.fsf%40gitster.g In-Reply-To: <20230822110404.1c002dcf@leda.eworm.net> ``` Christian Hesse writes: > Kousik Sanagavarapu on Tue, 2023/08/22 13:24: >> Christian Hesse wrote: >> >> > From: Christian Hesse >> > >> > Running the tests in a build environment makes gnupg print a warning: >> > >> > gpg: Warning: using insecure memory! >> > >> > This warning breaks the match, as `head` misses one line. Let's strip >> > the line, make `head` return what is expected and fix the match. >> > >> > Signed-off-by: Christian Hesse >> >> I think a bit of an explanation about why this warning is showing up in the >> commit message would be good. >> >> "man gpg" gives me >> >> So it seems that this warning will pop up if gpg is writing memory pages to >> disk which is bad because as stated above we don't want these pages written >> to disk which is a security risk. > > The Arch Linux packages are built inside a clean container, started via > systemd-nspawn. Within the container the system call @memlock is not allowed > by default, for security reasons. Thanks for Kousik and Christian for discussing this. The phrase "in a build environment" in the proposed log message puzzled me, as the program does not seem to print such warning in my build environment. And environments where memlock is disabled are probably not limited to containers used to build Arch's packages. "in a build environment" -> "in an enviornment where memlock is disabled" would have avoided puzzling readers. ``` ## Eric Sunshine, 2023-08-22 16:43 Subject: Re: [PATCH 2/2] t/t6300: drop magic filtering Message-ID: URL: https://gitlist.dev/e/CAPig%2BcTFrroZGo%3DKOXu0aCxeJvNz7eaHAK%2B%2BHXELZ0ZheJhw9w%40mail.gmail.com In-Reply-To: <20230822130315.71259-2-list@eworm.de> ``` On Tue, Aug 22, 2023 at 9:03 AM Christian Hesse wrote: > Now that we ran a trustdb check forcibly it does no longer pullute the > output. Filtering is no longer required... s/pullute/pollute/ > Signed-off-by: Christian Hesse ``` ## Christian Hesse, 2023-08-23 06:52 Subject: [PATCH v2 2/2] t/t6300: drop magic filtering Message-ID: <20230823065300.21961-1-list@eworm.de> URL: https://gitlist.dev/e/20230823065300.21961-1-list%40eworm.de In-Reply-To: ``` From: Christian Hesse Now that we ran a trustdb check forcibly it does no longer pollute the output. Filtering is no longer required... Signed-off-by: Christian Hesse --- t/t6300-for-each-ref.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 5b434ab451..aa3c7c03c4 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -1763,10 +1763,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' ' ' test_expect_success GPG2 'bare signature atom' ' - git verify-commit first-signed 2>out.raw && - grep -Ev "checking the trustdb|PGP trust model" out.raw >out && - head -3 out >expect && - tail -1 out >>expect && + git verify-commit first-signed 2>expect && echo >>expect && git for-each-ref refs/tags/first-signed \ --format="%(signature)" >actual && -- 2.42.0 ``` ## Kousik Sanagavarapu, 2023-08-23 13:20 Subject: Re: [PATCH v2 2/2] t/t6300: drop magic filtering Message-ID: URL: https://gitlist.dev/e/ZOYHjwOFdFGjFm1W%40five231003 In-Reply-To: <20230823065300.21961-1-list@eworm.de> ``` On Wed, Aug 23, 2023 at 08:52:17AM +0200, Christian Hesse wrote: > From: Christian Hesse > > Now that we ran a trustdb check forcibly it does no longer pollute the > output. Filtering is no longer required... s/forcibly/forcibly, s/it does no longer pollute/it no longer pollutes Also, maybe instead of "... the output.", "...the output when we encounter a signature check and hence filtering is no longer required." or along similar lines. > Signed-off-by: Christian Hesse > --- > t/t6300-for-each-ref.sh | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh > index 5b434ab451..aa3c7c03c4 100755 > --- a/t/t6300-for-each-ref.sh > +++ b/t/t6300-for-each-ref.sh > @@ -1763,10 +1763,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' ' > ' > > test_expect_success GPG2 'bare signature atom' ' > - git verify-commit first-signed 2>out.raw && > - grep -Ev "checking the trustdb|PGP trust model" out.raw >out && > - head -3 out >expect && > - tail -1 out >>expect && > + git verify-commit first-signed 2>expect && > echo >>expect && > git for-each-ref refs/tags/first-signed \ > --format="%(signature)" >actual && > -- > 2.42.0 The code looks really clean now, wow. Although I'm curious why both the changes weren't in a single commit. Is it because 1/2 is applicable generally and not only to this specific test? Thanks ``` ## Junio C Hamano, 2023-08-23 16:02 Subject: Re: [PATCH 2/2] t/t6300: drop magic filtering Message-ID: URL: https://gitlist.dev/e/xmqq8ra1hhmv.fsf%40gitster.g In-Reply-To: ``` Eric Sunshine writes: > On Tue, Aug 22, 2023 at 9:03 AM Christian Hesse wrote: >> Now that we ran a trustdb check forcibly it does no longer pullute the >> output. Filtering is no longer required... > > s/pullute/pollute/ > >> Signed-off-by: Christian Hesse Thanks. Applied the typofix (with removal of the extra double-dots) while queuing. ``` ## Junio C Hamano, 2023-08-23 16:14 Subject: Re: [PATCH v2 2/2] t/t6300: drop magic filtering Message-ID: URL: https://gitlist.dev/e/xmqqttspg2hh.fsf%40gitster.g In-Reply-To: ``` Kousik Sanagavarapu writes: > On Wed, Aug 23, 2023 at 08:52:17AM +0200, Christian Hesse wrote: >> From: Christian Hesse >> >> Now that we ran a trustdb check forcibly it does no longer pollute the >> output. Filtering is no longer required... > > s/forcibly/forcibly, > > s/it does no longer pollute/it no longer pollutes Thanks. I've updated the patch locally to read like so: ----- >8 ----- From: Christian Hesse Date: Tue, 22 Aug 2023 15:03:15 +0200 Subject: [PATCH] t/t6300: drop magic filtering Now that we ran a trustdb check forcibly, it no longer pollutes the output, and filtering is no longer required. Signed-off-by: Christian Hesse Signed-off-by: Junio C Hamano --- t/t6300-for-each-ref.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 5b434ab451..aa3c7c03c4 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -1763,10 +1763,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' ' ' test_expect_success GPG2 'bare signature atom' ' - git verify-commit first-signed 2>out.raw && - grep -Ev "checking the trustdb|PGP trust model" out.raw >out && - head -3 out >expect && - tail -1 out >>expect && + git verify-commit first-signed 2>expect && echo >>expect && git for-each-ref refs/tags/first-signed \ --format="%(signature)" >actual && -- 2.42.0 ```