From patchwork Fri Aug 27 17:42:21 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Mark Wielaard <mark@klomp.org>
X-Patchwork-Id: 45859
From: mark@klomp.org (Mark Wielaard)
Date: Fri, 27 Aug 2021 19:42:21 +0200
Subject: [PATCH] debuginfod: PR27917 - protect against federation loops
In-Reply-To: 
 <CAN-Pu7QyQ0ML04_OZtt-KXva+vU4mCd_b3CONtK4FGtvKZmR_A@mail.gmail.com>
References: 
 <CAN-Pu7RbLCLLc-GtyPXzq6VKfwxi-yLBzn1pmBVMxE-iKqpAnw@mail.gmail.com>
 <20210818225541.GE6064@redhat.com>
 <CAN-Pu7QyQ0ML04_OZtt-KXva+vU4mCd_b3CONtK4FGtvKZmR_A@mail.gmail.com>
Message-ID: <a53f364d9208983172de9fa8ed2dd5d79a751652.camel@klomp.org>

Hi dichen,

On Fri, 2021-08-20 at 20:44 +0800, Di Chen via Elfutils-devel wrote:
> 1) moved the XFF check to handle_buildid.
> 2) replace "livelock" with "deadlock" in the commit message.

This looks very good, thanks not just for the code but for also
including documentation and a testcase.

I did make one small change to the test:

And added ChangeLog file entries. Then pushed.

Thanks,

Mark

diff --git a/tests/run-debuginfod-find.sh b/tests/run-debuginfod-find.sh
index dbf20975..7e12dd7f 100755
--- a/tests/run-debuginfod-find.sh
+++ b/tests/run-debuginfod-find.sh
@@ -819,6 +819,11 @@ while true; do
     ss -atn | fgrep -e ":$PORT4" -e ":$PORT5"|| break
 done
 
+# Make sure the vlogs are cleaned up after the test
+# and that they are printed on error.
+tempfiles vlog$PORT4 vlog$PORT5
+errfiles vlog$PORT4 vlog$PORT5
+
 env LD_LIBRARY_PATH=$ldpath DEBUGINFOD_URLS=http://127.0.0.1:$PORT5 ${abs_builddir}/../debuginfod/debuginfod $VERBOSE --forwarded-ttl-limit 0 -p $PORT4 > vlog$PORT4 2>&1 &
 PID5=$!