From feb596bdfdb4c8a5f921da648b3e219e779b7a93 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Tue, 8 Mar 2022 12:37:17 -0500
Subject: [PATCH] dl_tarball.sh: safer downloads of kernel-rt

dl_tarball.sh assumes an el8 kernel, and lacks of error
handling. This  may result in an attempted download of a
non-el8 reporting success, but producing a src.rpm containing
an el8 kernel instead.

Testing:
- Download current el8 rt kernel
- Download previous el7 rt kernel
- DL using invalid URL - error caught
- DL using invalid sha - error caught

Closes-Bug: 1964156
Change-Id: I5ca5130a7f1c4e967c876060d95f9d6a2c2e8cf5
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 centos-mirror-tools/dl_tarball.sh | 49 ++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/centos-mirror-tools/dl_tarball.sh b/centos-mirror-tools/dl_tarball.sh
index 6543c4c4..2dadb1ff 100755
--- a/centos-mirror-tools/dl_tarball.sh
+++ b/centos-mirror-tools/dl_tarball.sh
@@ -425,19 +425,48 @@ for line in $(cat $tarball_file); do
             tar czvf $tarball_name $directory_name
             rm -rf $directory_name
             popd > /dev/null  # pushd $dest_dir
-        elif [[ "$tarball_name" =~ ^kernel-rt-.*.rpm ]]; then
-            git clone -b c8 --single-branch $tarball_url
+        elif [[ "$tarball_name" =~ ^kernel-rt-.*[.]el.*[.]rpm ]]; then
+            local el_release=""
+            el_release=$(echo $tarball_name | rev | cut -d '.' -f 3 | rev)
+            local extra_clone_args=""
+            if [[ "$el_release" =~ ^el([0-9]*)[0-9_]*$ ]]; then
+                extra_clone_args="-b c${BASH_REMATCH[1]} --single-branch"
+            else
+                echo "error: $tarball_name is not a valid EPEL kernel"
+                error_count=$((error_count + 1))
+                continue
+            fi
+
+            if ! (git clone $extra_clone_args $tarball_url || \
+                    git clone $tarball_url ); then
+                echo "error: failed to clone from $tarball_url"
+                error_count=$((error_count + 1))
+                continue
+            fi
+
             pushd kernel-rt
-            rev=$util
-            git checkout -b spec $rev
+            (
+                rev=$util
+                if ! git checkout $rev; then
+                    echo "failed to checkout $rev from $tarball_url"
+                    exit 1
+                fi
 
-            # get the CentOS tools for building SRPMs
-            git clone https://git.centos.org/centos-git-common
+                # get the CentOS tools for building SRPMs
+                if ! git clone https://git.centos.org/centos-git-common; then
+                    echo "error: failed to clone https://git.centos.org/centos-git-common"
+                    exit 1
+                fi
 
-            # Create the SRPM using CentOS tools
-            # bracketed to contain the PATH change
-            (PATH=$PATH:./centos-git-common into_srpm.sh -d .el8)
-            mv SRPMS/*.rpm ../${tarball_name}
+                # Create the SRPM using CentOS tools
+                # bracketed to contain the PATH change
+                if ! (PATH=$PATH:./centos-git-common into_srpm.sh -d .$el_release); then
+                    echo "error: into_srpm.sh failed to build $tarball_name"
+                    exit 1
+                fi
+
+                mv SRPMS/*.rpm ../${tarball_name}
+            ) || error_count=$((error_count + 1))
 
             popd > /dev/null # pushd kernel-rt
             # Cleanup