Ver código fonte

[Fix] Ignore empty lines when listing firewall rules

Robert Zollner 5 anos atrás
pai
commit
aaa50c5016
1 arquivos alterados com 4 adições e 0 exclusões
  1. 4 0
      bin/v-list-firewall

+ 4 - 0
bin/v-list-firewall

@@ -22,6 +22,7 @@ json_list() {
     objects=$(grep RULE $HESTIA/data/firewall/rules.conf |wc -l)
     echo "{"
     while read str; do
+        [[ -z "$str" ]] && continue;
         parse_object_kv_list "$str"
         echo -n '    "'$RULE'": {
         "ACTION": "'$ACTION'",
@@ -49,6 +50,7 @@ shell_list() {
     echo "RULE^ACTION^PROTO^PORT^IP^SPND^DATE"
     echo "----^------^-----^----^--^----^----"
     while read str; do
+        [[ -z "$str" ]] && continue;
         parse_object_kv_list "$str"
         echo "$RULE^$ACTION^$PROTOCOL^$PORT^$IP^$SUSPENDED^$DATE"
     done < <(cat $HESTIA/data/firewall/rules.conf)
@@ -58,6 +60,7 @@ shell_list() {
 plain_list() {
     IFS=$'\n'
     while read str; do
+        [[ -z "$str" ]] && continue;
         parse_object_kv_list "$str"
         echo -ne "$RULE\t$ACTION\t$PROTOCOL\t$PORT\t$IP\t$COMMENT\t"
         echo -e "$SUSPENDED\t$TIME\t$DATE"
@@ -69,6 +72,7 @@ csv_list() {
     IFS=$'\n'
     echo "RULE,ACTION,PROTOCOL,PORT,IP,COMMENT,SUSPENDED,TIME,DATE"
     while read str; do
+        [[ -z "$str" ]] && continue;
         parse_object_kv_list "$str"
         echo -n "$RULE,$ACTION,$PROTOCOL,$PORT,$IP,\"$COMMENT\","
         echo "$SUSPENDED,$TIME,$DATE"