script/postfix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix quoting issues in get_mail_domains.sh for improved robustness

Browse Source
This commit is contained in:
Christoph
2026-03-27 09:46:55 +01:00
parent 63db4c1317
commit 3377e36a2e
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
get_mail_domains.sh
+12 -11
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
script_dir="$(dirname $(realpath $0))" script_dir="$(dirname "$(realpath "$0")")"
conf_dir="${script_dir}/conf" conf_dir="${script_dir}/conf"
conf_file="${conf_dir}/get_mail_domains.conf" conf_file="${conf_dir}/get_mail_domains.conf"
@@ -30,12 +30,12 @@ DEFAULT_db_name="postfix"
clean_up() { clean_up() {
# Perform program exit housekeeping # Perform program exit housekeeping
rm -rf $tmp_dir rm -rf "$tmp_dir"
exit $1 exit $1
} }
echononl(){ echononl(){
echo X\\c > /tmp/shprompt$$ echo X\\c > /tmp/shprompt$$
if [ `wc -c /tmp/shprompt$$ | awk '{print $1}'` -eq 1 ]; then if [ "$(wc -c /tmp/shprompt$$ | awk '{print $1}')" -eq 1 ]; then
echo "$*\\c" 1>&2 echo "$*\\c" 1>&2
else else
echo -e -n "$*" 1>&2 echo -e -n "$*" 1>&2
@@ -77,14 +77,15 @@ trap clean_up SIGHUP SIGINT SIGTERM
clear clear
echo "" echo ""
echo -e "\033[32mRunning script \033[1m"$(basename $0)"\033[m .." echo -e "\033[32mRunning script \033[1m$(basename "$0")\033[m .."
echo "" echo ""
echo "" echo ""
echononl " Loading default Configuration values from $(basename ${conf_file}).." echononl " Loading default Configuration values from $(basename "${conf_file}").."
if [[ ! -f "$conf_file" ]]; then if [[ ! -f "$conf_file" ]]; then
echo_skipped echo_skipped
else else
# shellcheck source=/dev/null
source "${conf_file}" > /dev/null 2>&1 source "${conf_file}" > /dev/null 2>&1
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
echo_ok echo_ok
@@ -131,7 +132,7 @@ fi
echo "" echo ""
echononl " Collect supported domains at this server.." echononl " Collect supported domains at this server.."
if [[ "$db_type" = "mysql" ]] ; then if [[ "$db_type" = "mysql" ]] ; then
domains=$(mysql $mysql_credential_args "$db_name" -N -s -e \ domains=$(mysql "$mysql_credential_args" "$db_name" -N -s -e \
"SELECT domain FROM domain ORDER by domain" 2> "$log_messages") "SELECT domain FROM domain ORDER by domain" 2> "$log_messages")
else else
domains=$(su - postgres -c"psql \"$db_name\" -t -q -c\"SELECT domain FROM domain ORDER by domain\"") domains=$(su - postgres -c"psql \"$db_name\" -t -q -c\"SELECT domain FROM domain ORDER by domain\"")
@@ -144,16 +145,16 @@ else
clean_up 1 clean_up 1
fi fi
echo -e "\n\n \033[37m\033[1mMail Domains supported by this server ("$(hostname -f)"):\033[m\n" echo -e "\n\n \033[37m\033[1mMail Domains supported by this server ($(hostname -f)):\033[m\n"
echo "Mail Domains supported by this server ("$(hostname -f)"):" > $out_file echo "Mail Domains supported by this server ($(hostname -f)):" > "$out_file"
echo "" >> $out_file echo "" >> "$out_file"
for domain in $domains ; do for domain in $domains ; do
[[ "$domain" = "ALL" ]] && continue [[ "$domain" = "ALL" ]] && continue
echo -e " \033[32m$domain\033[m" echo -e " \033[32m$domain\033[m"
echo " $domain" >> $out_file echo " $domain" >> "$out_file"
done done
echo "" >> $out_file echo "" >> "$out_file"
echo "" echo ""
clean_up 0 clean_up 0