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

escape_hazard(): Rename temp-file to reflect the purpose

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-12-02 13:14:13 +00:00
parent d782bf8303
commit def581ec59
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
easyrsa3/easyrsa
View File

@ -752,6 +752,10 @@ Generated safe SSL config file:
# Escape hazardous characters # Escape hazardous characters
escape_hazard() { escape_hazard() {
# Assign temp file
easyrsa_vars_org="$(easyrsa_mktemp)" || \
die "escape_hazard - easyrsa_mktemp failed"
# write org fields to org temp-file and escape '&' and '$' # write org fields to org temp-file and escape '&' and '$'
print "\ print "\
export EASYRSA_REQ_COUNTRY=\"$EASYRSA_REQ_COUNTRY\" export EASYRSA_REQ_COUNTRY=\"$EASYRSA_REQ_COUNTRY\"
@ -762,16 +766,13 @@ export EASYRSA_REQ_OU=\"$EASYRSA_REQ_OU\"
export EASYRSA_REQ_EMAIL=\"$EASYRSA_REQ_EMAIL\" export EASYRSA_REQ_EMAIL=\"$EASYRSA_REQ_EMAIL\"
" | sed -e s\`'\&'\`'\\\&'\`g \ " | sed -e s\`'\&'\`'\\\&'\`g \
-e s\`'\$'\`'\\\$'\`g \ -e s\`'\$'\`'\\\$'\`g \
> "$easyrsa_openssl_conf_org" || die "\ > "$easyrsa_vars_org" || die "\
escape_hazard - Failed to write temp-file" escape_hazard - Failed to write temp-file"
# Reload fields from fully escaped temp-file # Reload fields from fully escaped temp-file
# shellcheck disable=SC1090 # can't follow non-constant source. # shellcheck disable=SC1090 # can't follow non-constant source.
. "$easyrsa_openssl_conf_org" || die "\ . "$easyrsa_vars_org" || die "\
escape_hazard - Failed to source temp-file" escape_hazard - Failed to source temp-file"
# Clean up
rm -f "$easyrsa_openssl_conf_org"
} # => escape_hazard() } # => escape_hazard()
# Easy-RSA meta-wrapper for SSL # Easy-RSA meta-wrapper for SSL
@ -798,11 +799,9 @@ easyrsa_openssl() {
if [ "$has_config" ]; then if [ "$has_config" ]; then
# Make LibreSSL safe config file from OpenSSL config file # Make LibreSSL safe config file from OpenSSL config file
# Assign temp files # Assign temp file
easyrsa_openssl_conf="$(easyrsa_mktemp)" || \ easyrsa_openssl_conf="$(easyrsa_mktemp)" || \
die "easyrsa_openssl - Failed to create temporary file (1)" die "easyrsa_openssl - Failed to create temporary file (1)"
easyrsa_openssl_conf_org="$(easyrsa_mktemp)" || \
die "easyrsa_openssl - Failed to create temporary file (2)"
# Auto-escape hazardous characters: # Auto-escape hazardous characters:
# '&' - Workaround 'sed' behavior # '&' - Workaround 'sed' behavior