summaryrefslogtreecommitdiff
path: root/templates/firewall/name
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-01-04 15:20:44 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-01-04 15:20:44 -0800
commit12476925b3e5e72f281aab1d042f03b37cec9e0d (patch)
treef6a5f211cda0a6a9da51e16baba78b941ac56e89 /templates/firewall/name
parentaa6b1b44036e5b3058c6a2bb8469ea6f7b2f0738 (diff)
downloadvyatta-cfg-firewall-12476925b3e5e72f281aab1d042f03b37cec9e0d.tar.gz
vyatta-cfg-firewall-12476925b3e5e72f281aab1d042f03b37cec9e0d.zip
Don't allow spaces or other shell-confusing characters in firewall name
Don't allow space, verticalbar, semicolon, ampersand, dollar sign, less or greater than in rule name. This is because of lack of quoting in perl processing Bug 4156
Diffstat (limited to 'templates/firewall/name')
-rw-r--r--templates/firewall/name/node.def6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/firewall/name/node.def b/templates/firewall/name/node.def
index cb4d05a..88e01c2 100644
--- a/templates/firewall/name/node.def
+++ b/templates/firewall/name/node.def
@@ -3,12 +3,12 @@ priority: 210
type: txt
-syntax:expression: pattern $VAR(@) "^[[:print:]]{1,29}$" ; \
+syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,29}$" ; \
"Firewall name must be 29 characters or less"
syntax:expression: pattern $VAR(@) "^[^-]" ; \
"Firewall rule set name cannot start with \"-\""
-syntax:expression: pattern $VAR(@) "^[^;]*$" ; \
- "Firewall rule set name cannot contain ';'"
+syntax:expression: pattern $VAR(@) "^[^|;&$<>]*$" ; \
+ "Firewall rule set name cannot contain shell punctuation"
syntax:expression: ! pattern $VAR(@) "^VZONE" ; \
"Firewall rule set name cannot start with 'VZONE'"