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

Auto escape: Unquote 'bad_char' in string disection (Win: mksh)

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

13
easyrsa3/easyrsa
View File

@ -652,6 +652,7 @@ make_safe_ssl_copy() {
} # => make_safe_ssl_copy() } # => make_safe_ssl_copy()
# 'sed' behavior with '&' is not modifiable, so auto escape '&' # 'sed' behavior with '&' is not modifiable, so auto escape '&'
# shellcheck disable=SC2295 # Expansions inside ${..} need to be quoted ..
escape_char() { escape_char() {
bad_char="$1" bad_char="$1"
in_str="$2" in_str="$2"
@ -660,26 +661,24 @@ escape_char() {
part_head="" part_head=""
part_next="" part_next=""
part_temp="" part_temp=""
esc_char=\\
# shell###check disable=SC1003 # Want to escape a single quote? No.. part_head="${in_str%%${bad_char}*}" # Drop RHS
esc_char='\'
part_head="${in_str%%"${bad_char}"*}" # Drop RHS
if [ "$part_head" = "$in_str" ]; then if [ "$part_head" = "$in_str" ]; then
# ok - No borken chars found # ok - No borken chars found
out_str="${part_head}" out_str="${part_head}"
else else
part_head="${part_head}${esc_char}${bad_char}" # Insert ESC+char part_head="${part_head}${esc_char}${bad_char}" # Insert ESC+char
while [ "$part_full_rhs" ]; do while [ "$part_full_rhs" ]; do
part_full_rhs="${part_full_rhs#*"${bad_char}"}" # Drop LHS part_full_rhs="${part_full_rhs#*${bad_char}}" # Drop LHS
part_next="${part_full_rhs%%"${bad_char}"*}" # Drop RHS part_next="${part_full_rhs%%${bad_char}*}" # Drop RHS
if [ "$part_next" = "$part_full_rhs" ]; then if [ "$part_next" = "$part_full_rhs" ]; then
# ok - No borken chars found # ok - No borken chars found
part_full_rhs="" part_full_rhs=""
part_temp="${part_temp}${part_next}" part_temp="${part_temp}${part_next}"
else else
part_full_rhs="${part_full_rhs#*"${bad_char}"}" # Drop LHS part_full_rhs="${part_full_rhs#*${bad_char}}" # Drop LHS
part_next="${part_next}${esc_char}${bad_char}" # Insert ESC+char part_next="${part_next}${esc_char}${bad_char}" # Insert ESC+char
part_temp="${part_temp}${part_next}" part_temp="${part_temp}${part_next}"
fi fi