From 6d456c54308c65028ee2b4c40f597d3c18a4289c Mon Sep 17 00:00:00 2001 From: Daniel von Obernitz Date: Fri, 10 Jan 2025 12:00:37 +0100 Subject: [PATCH] Syntax fixes --- UpdateCRL.sh | 106 +++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/UpdateCRL.sh b/UpdateCRL.sh index c89e5cc..12f01b0 100755 --- a/UpdateCRL.sh +++ b/UpdateCRL.sh @@ -18,18 +18,18 @@ set -ou pipefail ########################################################### function INFO { - echo "$1" - echo "$1" | systemd-cat -p info -t "$(basename "$0" .sh)" + echo "$1" + echo "$1" | systemd-cat -p info -t "$(basename "$0" .sh)" } function WARNING { - echo "WARNING: $1" >&2 - echo "$1" | systemd-cat -p warning -t "$(basename "$0" .sh)" + echo "WARNING: $1" >&2 + echo "$1" | systemd-cat -p warning -t "$(basename "$0" .sh)" } function ERROR { - echo "ERROR: $1" >&2 - echo "$1" | systemd-cat -p err -t "$(basename "$0" .sh)" + echo "ERROR: $1" >&2 + echo "$1" | systemd-cat -p err -t "$(basename "$0" .sh)" } ########################################################### @@ -42,75 +42,75 @@ ERR=0 # Create directory if not exists if [[ ! -d $PATHCRL ]]; then - if ! mkdir -p $PATHCRL; then - ERROR "Could not create $PATHCRL!" - exit 2 - fi + if ! mkdir -p $PATHCRL; then + ERROR "Could not create $PATHCRL!" + exit 2 + fi fi for CRL in "${CRL[@]}" do - URLCRL=https://cacher.rz.uni-greifswald.de/$CRL.pem + URLCRL=https://cacher.rz.uni-greifswald.de/$CRL.pem - # Download CRL - if ! /usr/bin/timeout 5s wget -q -O "/tmp/$CRL.pem" "$URLCRL"; then - ERROR "Could not download $CRL!" - ERR=1 - continue - fi + # Download CRL + if ! /usr/bin/timeout 5s wget -q -O "/tmp/$CRL.pem" "$URLCRL"; then + ERROR "Could not download $CRL!" + ERR=1 + continue + fi - # Verify CRL - if ! /usr/bin/openssl crl -CApath "$PATHSSL" -in "/tmp/$CRL.pem" -noout > /dev/null 2>&1; then - ERROR "Could not verify $CRL against $PATHSSL!" - ERR=1 - rm -f "/tmp/$CRL.pem" - continue - fi + # Verify CRL + if ! /usr/bin/openssl crl -CApath "$PATHSSL" -in "/tmp/$CRL.pem" -noout > /dev/null 2>&1; then + ERROR "Could not verify $CRL against $PATHSSL!" + ERR=1 + rm -f "/tmp/$CRL.pem" + continue + fi - # Check CRL validity - CRLDATETIME=$(openssl crl -in "/tmp/$CRL.pem" -nextupdate -noout | sed 's/nextUpdate=//g') - VALIDUNTIL=$(date -d "$CRLDATETIME" +%s) + # Check CRL validity + CRLDATETIME=$(openssl crl -in "/tmp/$CRL.pem" -nextupdate -noout | sed 's/nextUpdate=//g') + VALIDUNTIL=$(date -d "$CRLDATETIME" +%s) - if [[ "$VALIDUNTIL" -lt $(date +%s) ]]; then - ERROR "$CRL is invalid!" - ERR=1 - rm -f "/tmp/$CRL.pem" - continue - fi + if [[ "$VALIDUNTIL" -lt $(date +%s) ]]; then + ERROR "$CRL is invalid!" + ERR=1 + rm -f "/tmp/$CRL.pem" + continue + fi - # Move CRL to final destination path - if ! mv -f "/tmp/$CRL.pem" "$PATHCRL/$CRL.pem"; then - ERROR "Could not move CRL to $PATHCRL!" - ERR=1 - rm -f "/tmp/$CRL.pem" - continue - fi + # Move CRL to final destination path + if ! mv -f "/tmp/$CRL.pem" "$PATHCRL/$CRL.pem"; then + ERROR "Could not move CRL to $PATHCRL!" + ERR=1 + rm -f "/tmp/$CRL.pem" + continue + fi - # Link CRL - if [[ ! -L "$PATHSSL"/"$CRL.pem" ]]; then - if ! ln -s "$PATHCRL"/"$CRL.pem" "$PATHSSL"/"$CRL.pem"; then - ERROR "Could not create CRL link to $PATHSSL!" - ERR=1 - rm -f "$PATHCRL"/"$CRL.pem" "$PATHSSL"/"$CRL.pem" - continue - fi + # Link CRL + if [[ ! -L "$PATHSSL"/"$CRL.pem" ]]; then + if ! ln -s "$PATHCRL"/"$CRL.pem" "$PATHSSL"/"$CRL.pem"; then + ERROR "Could not create CRL link to $PATHSSL!" + ERR=1 + rm -f "$PATHCRL"/"$CRL.pem" "$PATHSSL"/"$CRL.pem" + continue fi + fi - INFO "$CRL successfully updated" + INFO "$CRL successfully updated" done # Rehash if /usr/bin/c_rehash -n > /dev/null 2>&1; then - INFO "Rehash successful" + INFO "Rehash successful" else - ERROR "Could not rehash $PATHSSL!" - exit 2 + ERROR "Could not rehash $PATHSSL!" + exit 2 fi # Set runtime information if [[ "$ERR" -eq 0 ]]; then - date +%s > "$LASTRUN" + date +%s > "$LASTRUN" fi exit 0