nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add final untrapped error check

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-05-20 00:54:39 +01:00
parent cb869ee269
commit 322168bca6
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
easyrsa3/easyrsa
View File

@ -2731,7 +2731,7 @@ build_ff_date_string() {
# Read db # Read db
# shellcheck disable=SC2295 # shellcheck disable=SC2295
read_db() { read_db() {
tab_char=' ' TCT=' ' # tab character
db_in="$EASYRSA_PKI/index.txt" db_in="$EASYRSA_PKI/index.txt"
while read -r db_status db_notAfter db_record; do while read -r db_status db_notAfter db_record; do
@ -2739,23 +2739,23 @@ read_db() {
unset -v db_serial db_cn db_revoke_date db_reason unset -v db_serial db_cn db_revoke_date db_reason
case "$db_status" in case "$db_status" in
V) # Valid V) # Valid
db_serial="${db_record%%${tab_char}*}" db_serial="${db_record%%${TCT}*}"
db_record="${db_record#*${tab_char}}" db_record="${db_record#*${TCT}}"
db_cn="${db_record#*/CN=}"; db_cn="${db_cn%%/*}" db_cn="${db_record#*/CN=}"; db_cn="${db_cn%%/*}"
crt_file="$EASYRSA_PKI/issued/$db_cn.crt" crt_file="$EASYRSA_PKI/issued/$db_cn.crt"
;; ;;
R) # Revoked R) # Revoked
db_revoke_date="${db_record%%${tab_char}*}" db_revoke_date="${db_record%%${TCT}*}"
db_reason="${db_revoke_date#*,}" db_reason="${db_revoke_date#*,}"
if [ "$db_reason" = "$db_revoke_date" ]; then if [ "$db_reason" = "$db_revoke_date" ]; then
db_reason="None given" db_reason="None given"
else else
db_revoke_date="${db_revoke_date%,*}" db_revoke_date="${db_revoke_date%,*}"
fi fi
db_record="${db_record#*${tab_char}}" db_record="${db_record#*${TCT}}"
db_serial="${db_record%%${tab_char}*}" db_serial="${db_record%%${TCT}*}"
db_record="${db_record#*${tab_char}}" db_record="${db_record#*${TCT}}"
db_cn="${db_record#*/CN=}"; db_cn="${db_cn%%/*}" db_cn="${db_record#*/CN=}"; db_cn="${db_cn%%/*}"
;; ;;
*) die "Unexpected status: $db_status" *) die "Unexpected status: $db_status"
@ -4131,6 +4131,10 @@ case "$cmd" in
die "Unknown command '$cmd'. Run without commands for usage help." die "Unknown command '$cmd'. Run without commands for usage help."
esac esac
# Check for untrapped errors
# shellcheck disable=SC2181
[ $? = 0 ] || warn "Untrapped error detected!"
# Clear traps and do 'cleanup ok' on successful completion # Clear traps and do 'cleanup ok' on successful completion
trap - 0 1 2 3 6 15 trap - 0 1 2 3 6 15
cleanup ok cleanup ok