octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2024-12-29 05:02:46 +00:00
Code Issues Projects Releases Wiki Activity

modules/jsonDB: activate stripping of not allowed keys

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2021-01-04 12:49:43 +01:00
parent e072afac41
commit 966ee5d5a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/jsonDB.sh
View File

@ -5,7 +5,7 @@
# This file is public domain in the USA and all free countries. # This file is public domain in the USA and all free countries.
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
# #
#### $$VERSION$$ v1.21-2-g5ad7be5 #### $$VERSION$$ v1.21-3-ge072afa
# #
# source from commands.sh to use jsonDB functions # source from commands.sh to use jsonDB functions
# #
@ -27,7 +27,7 @@ eval "$(basename "${BASH_SOURCE[0]}")(){ :; }"
# lockfile filename.flock is persistent and will be testet with flock for active lock (file open) # lockfile filename.flock is persistent and will be testet with flock for active lock (file open)
export JSSH_LOCKNAME=".flock" export JSSH_LOCKNAME=".flock"
# in UTF-8 äöü etc. are part of [:alnum:] and rages (e.g. a-z), but we want ASCII a-z ranges! # in UTF-8 äöü etc. are part of [:alnum:] and ranges (e.g. a-z), but we want ASCII a-z ranges!
# there are two solutions: set "LC_COLLATE=C" or set bash option "globasciiranges" # there are two solutions: set "LC_COLLATE=C" or set bash option "globasciiranges"
# to be independent of the settings mentioned above, we define our own "ranges" # to be independent of the settings mentioned above, we define our own "ranges"
azazaz='abcdefghijklmnopqrstuvwxyz' # a-z :lower: azazaz='abcdefghijklmnopqrstuvwxyz' # a-z :lower:
@ -367,7 +367,7 @@ Array2Json() {
declare -n ARRAY="$1" declare -n ARRAY="$1"
for key in "${!ARRAY[@]}" for key in "${!ARRAY[@]}"
do do
#[[ "${key}" =~ ^${JSSH_KEYOK}$ ]] || continue [[ "${key}" =~ ^${JSSH_KEYOK}$ ]] || continue
# in case val contains newline convert to \n # in case val contains newline convert to \n
val="${ARRAY[${key}]//$'\n'/\\n}" val="${ARRAY[${key}]//$'\n'/\\n}"
printf '["%s"]\t"%s"\n' "${key//,/\",\"}" "${val//\"/\\\"}" printf '["%s"]\t"%s"\n' "${key//,/\",\"}" "${val//\"/\\\"}"