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

Minor refactor: escape_hazard()

Browse Source 
Squashed commit of the following:

commit 81937721412478c0f4b7d32b6a55d18099608d88
Merge: 43d7648 345e6cc
Author: Richard T Bonhomme <tincantech@protonmail.com>
Date:   Sun Nov 20 13:37:05 2022 +0000

    Merge branch 'improve-escape_hazard' of ssh://github.com/TinCanTech/easy-rsa into TinCanTech-improve-escape_hazard

    Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>

commit 345e6cc5540d411e32c3cc7ced3017742188d144
Author: Richard T Bonhomme <tincantech@protonmail.com>
Date:   Sun Nov 20 13:07:37 2022 +0000

    Minor refactor: escape_hazard()

    Remove development code. Improve text.

    Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-11-20 13:37:47 +00:00
parent 43d7648168
commit 0ee7a6d75e
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
easyrsa3/easyrsa
View File

@ -760,27 +760,23 @@ make_safe_ssl_copy() {
# Escape hazardous characters
escape_hazard() {
# escape '&' and '$' and write free form fields to org temp-file
( # subshell for local debug
# debug log on
if [ "$EASYRSA_DEBUG" ]; then print "<< DEBUG-ON >>"; set -x; fi
print "\
# write org fields to org temp-file and escape '&' and '$'
print "\
export EASYRSA_REQ_COUNTRY=\"$EASYRSA_REQ_COUNTRY\"
export EASYRSA_REQ_PROVINCE=\"$EASYRSA_REQ_PROVINCE\"
export EASYRSA_REQ_CITY=\"$EASYRSA_REQ_CITY\"
export EASYRSA_REQ_ORG=\"$EASYRSA_REQ_ORG\"
export EASYRSA_REQ_OU=\"$EASYRSA_REQ_OU\"
export EASYRSA_REQ_EMAIL=\"$EASYRSA_REQ_EMAIL\"
" | sed -e s\`'&'\`'\\\&'\`g \
-e s\`'\$'\`'\\\$'\`g > "$easyrsa_openssl_conf_org" || \
die "Failed to write 'easyrsa_openssl_conf_org' temp file"
# debug log off
if [ "$EASYRSA_DEBUG" ]; then set +x; print ">> DEBUG-OFF <<"; fi
) # Close subshell
" | sed -e s\`'\&'\`'\\\&'\`g \
-e s\`'\$'\`'\\\$'\`g \
> "$easyrsa_openssl_conf_org" || die "\
escape_hazard - Failed to write temp-file"
# Reload fields from fully escaped org temp-file
# Reload fields from fully escaped temp-file
# shellcheck disable=SC1090 # can't follow non-constant source.
. "$easyrsa_openssl_conf_org" || die "escape_hazard - Failed to source 'org'"
. "$easyrsa_openssl_conf_org" || die "\
escape_hazard - Failed to source temp-file"
# Clean up
rm -f "$easyrsa_openssl_conf_org"