Merge pull request #861 from Hexta/fix-rules-with-hyphen-wo-quotes

Fix parsing iptables rules with hyphen in comments

Author: michaeltlombardi

lib/puppet/provider/firewall/iptables.rb

@@ -419,7 +419,7 @@ def self.rule_to_hash(line, table, counter)
     if values =~ %r{-m comment --comment}
       ind = values.index('-m comment --comment')
       comments = values.scan(%r{-m comment --comment "((?:\\"|[^"])*)"})
-      comments += values.scan(%r{-m comment --comment ([^"]+?)\b})
+      comments += values.scan(%r{-m comment --comment ([^"\s]+)\b})
       values = values.gsub(%r{-m comment --comment (".*?[^\\"]"|[^ ].*)( |$)}, '')
       values = values.gsub(%r{-m comment --comment ([^"].*?)[ $]}, '')
       values.insert(ind, "-m comment --comment \"#{comments.join(';')}\" ")

spec/fixtures/iptables/conversion_hash.rb

@@ -254,6 +254,13 @@
       name: '9000 comment_without_quotes',
     },
   },
+  'comments_without_quotes' => {
+    line: '-A INPUT -s 192.168.0.1/32 -m comment --comment 100-comment_without-quotes',
+    table: 'filter',
+    params: {
+      name: '100-comment_without-quotes',
+    },
+  },
   'string_escape_sequences' => {
     line: '-A INPUT -m comment --comment "000 parse escaped \\"s, \\"s, \\\'s, \\\'s, \\\\s and \\\\s"',
     table: 'filter',