Skip to content

Commit aaa50c5

Browse files
committed
[Fix] Ignore empty lines when listing firewall rules
1 parent 3bfaf74 commit aaa50c5

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

bin/v-list-firewall

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ json_list() {
2222
objects=$(grep RULE $HESTIA/data/firewall/rules.conf |wc -l)
2323
echo "{"
2424
while read str; do
25+
[[ -z "$str" ]] && continue;
2526
parse_object_kv_list "$str"
2627
echo -n ' "'$RULE'": {
2728
"ACTION": "'$ACTION'",
@@ -49,6 +50,7 @@ shell_list() {
4950
echo "RULE^ACTION^PROTO^PORT^IP^SPND^DATE"
5051
echo "----^------^-----^----^--^----^----"
5152
while read str; do
53+
[[ -z "$str" ]] && continue;
5254
parse_object_kv_list "$str"
5355
echo "$RULE^$ACTION^$PROTOCOL^$PORT^$IP^$SUSPENDED^$DATE"
5456
done < <(cat $HESTIA/data/firewall/rules.conf)
@@ -58,6 +60,7 @@ shell_list() {
5860
plain_list() {
5961
IFS=$'\n'
6062
while read str; do
63+
[[ -z "$str" ]] && continue;
6164
parse_object_kv_list "$str"
6265
echo -ne "$RULE\t$ACTION\t$PROTOCOL\t$PORT\t$IP\t$COMMENT\t"
6366
echo -e "$SUSPENDED\t$TIME\t$DATE"
@@ -69,6 +72,7 @@ csv_list() {
6972
IFS=$'\n'
7073
echo "RULE,ACTION,PROTOCOL,PORT,IP,COMMENT,SUSPENDED,TIME,DATE"
7174
while read str; do
75+
[[ -z "$str" ]] && continue;
7276
parse_object_kv_list "$str"
7377
echo -n "$RULE,$ACTION,$PROTOCOL,$PORT,$IP,\"$COMMENT\","
7478
echo "$SUSPENDED,$TIME,$DATE"

0 commit comments

Comments
 (0)