From a954f330ab7c37fdd8665739a16e7d354ba59bae Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Sat, 25 Jun 2022 09:00:25 +0200 Subject: [PATCH 1/6] + poor man's array copy --- src/template.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/template.sh b/src/template.sh index 21555db..bb67769 100755 --- a/src/template.sh +++ b/src/template.sh @@ -92,7 +92,15 @@ function nested_declare() { # nested_add(ref, array) function nested_add() { local nested_id=$(_nested_random) - declare -g -n _$nested_id=$2 + declare -n nested_ref=$2 + declare -g -A _$nested_id + + # poor man's array copy + for i in ${!nested_ref[@]}; do + declare -g -A _$nested_id[$i]="${nested_ref[$i]}" + done + declare -p _$nested_id > /dev/stderr + local -n ref=$1 ref+=("$nested_id") } From 828bc8e42664194c91d50016cce06e8774a9bf74 Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Sat, 25 Jun 2022 09:23:16 +0200 Subject: [PATCH 2/6] * proper multiline --- src/template.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/template.sh b/src/template.sh index bb67769..ff43684 100755 --- a/src/template.sh +++ b/src/template.sh @@ -11,33 +11,27 @@ function render() { local value='' subtemplate=$(mktemp) subtemplate_tmp=$(mktemp) - echo "subtemplate: $subtemplate" > /dev/stderr - echo "subtemplate_tmp: $subtemplate_tmp" > /dev/stderr - echo "$template" | grep "{{start $key}}" -A99999 | grep "{{end $key}}" -B99999 > "$subtemplate" + echo "$template" | grep "{{start $key}}" -A99999 | grep "{{end $key}}" -B99999 | tr '\n' $'\01' > "$subtemplate" echo 's'$'\02''\{\{start '"$key"'\}\}.*\{\{end '"$key"'\}\}'$'\02''\{\{'"$key"'\}\}'$'\02'';' >> "$tmp" local -n asdf=${ref[$key]} - echo "asdf ${asdf[@]}" > /dev/stderr for j in ${!asdf[@]}; do local -n fdsa=_${asdf[$j]} for i in ${!fdsa[@]}; do - echo 's'$'\02''\{\{.'"$i"'\}\}'$'\02'''"${fdsa[$i]}"''$'\02'';' | tr -d '\n' >> "$subtemplate_tmp" + echo 's'$'\02''\{\{.'"$i"'\}\}'$'\02'''"${fdsa[$i]}"''$'\02'';' | tr '\n' $'\01' | sed 's/'$'\02'';'$'\01''/'$'\02'';/g' >> "$subtemplate_tmp" done echo 's'$'\02''\{\{start '"$key"'\}\}'$'\02'$'\02' >> "$subtemplate_tmp" echo 's'$'\02''\{\{end '"$key"'\}\}'$'\02'$'\02' >> "$subtemplate_tmp" - value+="$(cat "$subtemplate" | tr -d '\n' | sed -E -f "$subtemplate_tmp" | tr $'\01' '\n' | sed 's/'$'\01''/\n/g')" - echo "eeeee $value" > /dev/stderr + value+="$(cat "$subtemplate" | tr '\n' $'\01' | sed -E -f "$subtemplate_tmp" | tr $'\01' '\n')" rm "$subtemplate_tmp" done - echo 's'$'\02''\{\{'"$key"'\}\}'$'\02'''"$value"''$'\02'';' >> "$tmp" - cat "$tmp" > /dev/stderr rm "$subtemplate" elif [[ "${ref[$key]}" != "" ]]; then local value="$(html_encode "${ref[$key]}" | sed -E 's/\&/�UwU�/g')" @@ -47,7 +41,7 @@ function render() { fi done - cat "$tmp" | tr -d '\n' > "${tmp}_" + cat "$tmp" | tr '\n' $'\01' | sed 's/'$'\02'';'$'\01''/'$'\02'';/g' > "${tmp}_" template="$(tr '\n' $'\01' <<< "$template" | sed -E -f "${tmp}_" | tr $'\01' '\n')" sed -E 's/�UwU�/\&/g' <<< "$template" rm "$tmp" From b7945227ea72d01a95e8f36b63ad5d9a41644907 Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Sat, 25 Jun 2022 11:03:39 +0200 Subject: [PATCH 3/6] * fix ampersand expansion --- src/template.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/template.sh b/src/template.sh index ff43684..004567a 100755 --- a/src/template.sh +++ b/src/template.sh @@ -3,7 +3,7 @@ # render(array, template_file) function render() { - local template="$(cat "$2")" + local template="$(cat "$2" | sed 's/\&/�UwU�/g')" local -n ref=$1 local tmp=$(mktemp) for key in ${!ref[@]}; do @@ -11,7 +11,7 @@ function render() { local value='' subtemplate=$(mktemp) subtemplate_tmp=$(mktemp) - echo "$template" | grep "{{start $key}}" -A99999 | grep "{{end $key}}" -B99999 | tr '\n' $'\01' > "$subtemplate" + echo "$template" | sed 's/\&/�UwU�/g' | grep "{{start $key}}" -A99999 | grep "{{end $key}}" -B99999 | tr '\n' $'\01' > "$subtemplate" echo 's'$'\02''\{\{start '"$key"'\}\}.*\{\{end '"$key"'\}\}'$'\02''\{\{'"$key"'\}\}'$'\02'';' >> "$tmp" @@ -93,7 +93,6 @@ function nested_add() { for i in ${!nested_ref[@]}; do declare -g -A _$nested_id[$i]="${nested_ref[$i]}" done - declare -p _$nested_id > /dev/stderr local -n ref=$1 ref+=("$nested_id") From f3ff522d82a6fb6f0447b606057f32b5d82822ee Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Sat, 25 Jun 2022 11:32:20 +0200 Subject: [PATCH 4/6] * template replace now global except for foreach --- src/template.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/template.sh b/src/template.sh index 004567a..168ab7b 100755 --- a/src/template.sh +++ b/src/template.sh @@ -21,7 +21,7 @@ function render() { local -n fdsa=_${asdf[$j]} for i in ${!fdsa[@]}; do - echo 's'$'\02''\{\{.'"$i"'\}\}'$'\02'''"${fdsa[$i]}"''$'\02'';' | tr '\n' $'\01' | sed 's/'$'\02'';'$'\01''/'$'\02'';/g' >> "$subtemplate_tmp" + echo 's'$'\02''\{\{.'"$i"'\}\}'$'\02'''"${fdsa[$i]}"''$'\02''g;' | tr '\n' $'\01' | sed 's/'$'\02'';'$'\01''/'$'\02'';/g' >> "$subtemplate_tmp" done echo 's'$'\02''\{\{start '"$key"'\}\}'$'\02'$'\02' >> "$subtemplate_tmp" @@ -35,9 +35,9 @@ function render() { rm "$subtemplate" elif [[ "${ref[$key]}" != "" ]]; then local value="$(html_encode "${ref[$key]}" | sed -E 's/\&/�UwU�/g')" - echo 's'$'\02''\{\{\.'"$key"'\}\}'$'\02'''"$value"''$'\02'';' >> "$tmp" + echo 's'$'\02''\{\{\.'"$key"'\}\}'$'\02'''"$value"''$'\02''g;' >> "$tmp" else - echo 's'$'\02''\{\{\.'"$key"'\}\}'$'\02'$'\02'';' >> "$tmp" + echo 's'$'\02''\{\{\.'"$key"'\}\}'$'\02'$'\02''g;' >> "$tmp" fi done From e1f8ded023296ea38e1b5dbe86dbfdb8caf8b234 Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Sat, 25 Jun 2022 11:35:03 +0200 Subject: [PATCH 5/6] why not, let's bump to 0.95 --- config/master_example.sh | 4 ++-- http.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/master_example.sh b/config/master_example.sh index 8405090..17ede6f 100644 --- a/config/master_example.sh +++ b/config/master_example.sh @@ -21,9 +21,9 @@ cfg[ssl_cert]='' cfg[ssl_key]='' cfg[extension]='shs' -cfg[extra_headers]='server: HTTP.sh/0.94 (devel)' +cfg[extra_headers]='server: HTTP.sh/0.95 (devel)' -cfg[title]='HTTP.sh 0.94' +cfg[title]='HTTP.sh 0.95' cfg[php_enabled]=false # enable PHP script evalutaion (requires PHP) cfg[python_enabled]=false # enable Python script evalutaion (requires Python) diff --git a/http.sh b/http.sh index 3da2573..25f8617 100755 --- a/http.sh +++ b/http.sh @@ -27,9 +27,9 @@ cfg[ssl_cert]='' cfg[ssl_key]='' cfg[extension]='shs' -cfg[extra_headers]='server: HTTP.sh/0.94 (devel)' +cfg[extra_headers]='server: HTTP.sh/0.95 (devel)' -cfg[title]='HTTP.sh 0.94' +cfg[title]='HTTP.sh 0.95' cfg[php_enabled]=false # enable PHP script evalutaion (requires PHP) cfg[python_enabled]=false # enable Python script evalutaion (requires Python) From fcd102f1137382e442316231b413896d876e39af Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Sat, 25 Jun 2022 12:02:45 +0200 Subject: [PATCH 6/6] * oops, fixes global replace --- src/template.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/template.sh b/src/template.sh index 168ab7b..60dd8a3 100755 --- a/src/template.sh +++ b/src/template.sh @@ -21,18 +21,18 @@ function render() { local -n fdsa=_${asdf[$j]} for i in ${!fdsa[@]}; do - echo 's'$'\02''\{\{.'"$i"'\}\}'$'\02'''"${fdsa[$i]}"''$'\02''g;' | tr '\n' $'\01' | sed 's/'$'\02'';'$'\01''/'$'\02'';/g' >> "$subtemplate_tmp" + echo 's'$'\02''\{\{.'"$i"'\}\}'$'\02'''"${fdsa[$i]}"''$'\02''g;' | tr '\n' $'\01' | sed -E 's/'$'\02'';'$'\01''/'$'\02'';/g;s/'$'\02''g;'$'\01''/'$'\02''g;/g' >> "$subtemplate_tmp" done echo 's'$'\02''\{\{start '"$key"'\}\}'$'\02'$'\02' >> "$subtemplate_tmp" echo 's'$'\02''\{\{end '"$key"'\}\}'$'\02'$'\02' >> "$subtemplate_tmp" value+="$(cat "$subtemplate" | tr '\n' $'\01' | sed -E -f "$subtemplate_tmp" | tr $'\01' '\n')" - rm "$subtemplate_tmp" + # rm "$subtemplate_tmp" done echo 's'$'\02''\{\{'"$key"'\}\}'$'\02'''"$value"''$'\02'';' >> "$tmp" - rm "$subtemplate" + #rm "$subtemplate" elif [[ "${ref[$key]}" != "" ]]; then local value="$(html_encode "${ref[$key]}" | sed -E 's/\&/�UwU�/g')" echo 's'$'\02''\{\{\.'"$key"'\}\}'$'\02'''"$value"''$'\02''g;' >> "$tmp" @@ -41,10 +41,10 @@ function render() { fi done - cat "$tmp" | tr '\n' $'\01' | sed 's/'$'\02'';'$'\01''/'$'\02'';/g' > "${tmp}_" + cat "$tmp" | tr '\n' $'\01' | sed -E 's/'$'\02'';'$'\01''/'$'\02'';/g;s/'$'\02''g;'$'\01''/'$'\02''g;/g' > "${tmp}_" template="$(tr '\n' $'\01' <<< "$template" | sed -E -f "${tmp}_" | tr $'\01' '\n')" sed -E 's/�UwU�/\&/g' <<< "$template" - rm "$tmp" + #rm "$tmp" } # render_unsafe(array, template_file)