Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sign-req: Improve confirmation details #1141

Merged
merged 1 commit into from
May 15, 2024
Merged

sign-req: Improve confirmation details #1141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions easyrsa3/easyrsa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,7 @@ Temporary session not preserved."
if [ "$secured_session" ]; then
remove_secure_session || \
warn "cleanup - remove_secure_session failed"
verbose "mktemp_counter: $mktemp_counter uses"
fi
fi

Expand Down Expand Up @@ -2507,20 +2508,27 @@ Failed to create temp extension file (bad permissions?) at:
* $ext_tmp"
verbose "sign_req: Generated extensions file OK"

# Set valid_period message
# Set confirm CN
confirm_CN=" Requested CN: '$EASYRSA_REQ_CN'"

# Set confirm type
confirm_type=" Requested type: '$crt_type'"

# Set confirm valid_period message
if [ "$EASYRSA_END_DATE" ]; then
valid_period="
until date '$EASYRSA_END_DATE'"
confirm_period=" Valid until: '$EASYRSA_END_DATE'"
else
valid_period="
for '$EASYRSA_CERT_EXPIRE' days"
confirm_period=" Valid for: '$EASYRSA_CERT_EXPIRE' days"
fi

# Set confirm force_subj
confirm_force_subj=
[ "$force_subj" ] && \
confirm_force_subj="${NL}* Forced Subject: '$force_subj'${NL}"

# Set confirm DN
if [ "$force_subj" ]; then
confirm_dn="\
Forced subject=
$force_subj"
confirm_dn="$force_subj"
else
confirm_dn="$(display_dn req "$req_in")" || \
die "sign-req: display_dn"
Expand All @@ -2536,7 +2544,7 @@ Forced subject=

# Check CSR for any requested SAN
if echo "$req_text" | \
grep -s 'X509v3 Subject Alternative Name'
grep -q 'X509v3 Subject Alternative Name'
then
# extract requested SAN
# 'grep -A' may not be strictly POSIX, die on error
Expand All @@ -2550,6 +2558,14 @@ Forced subject=
fi
fi

# Set confirm details
confirm_details="\
$confirm_CN
$confirm_type
$confirm_period
$confirm_force_subj
$confirm_dn"

# --san takes priority over req SAN and --copy-ext
if [ "$EASYRSA_SAN" ]; then
confirm_san="\
Expand All @@ -2559,15 +2575,9 @@ Forced subject=
confirm_san="$req_x509_san"
fi

# Set confirm text for DN and SAN
# Set confirm SAN
if [ "$EASYRSA_SAN" ] || [ "$req_x509_san" ]; then
confirm_details="\
$confirm_dn

$confirm_san"
else
confirm_details="\
$confirm_dn"
confirm_details="$confirm_details${NL}${NL}$confirm_san"
fi

# Display the request subject in an easy-to-read format
Expand All @@ -2587,9 +2597,7 @@ with the sender.$NL"
fi

confirm "Confirm request details: " "yes" "\
You are about to sign the following certificate:
${foriegn_request}Request subject, to be signed as a \
$crt_type certificate ${valid_period}:
${foriegn_request}You are about to sign the following certificate:

$confirm_details" # => confirm end

Expand Down Expand Up @@ -5726,8 +5734,6 @@ Place a copy of easyrsa-tools.lib in a standard system location."
Unknown command '$cmd'. Run without commands for usage help."
esac

verbose "mktemp_counter: $mktemp_counter uses"

# Check for untrapped errors
# shellcheck disable=SC2181 # Quote expand - pre-cleanup $?
if [ $? = 0 ]; then
Expand Down