Merge pull request #981 from tskirvin/main

(MODULES-6876) lib/puppet/provider/firewall/iptables.rb - comments cleanup for parsing

Author: daianamezdrea

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
+## Unversioned
+
+### iptables.rb
+
+There are cases where spaces and quotes in iptables comments generated by
+mainstream sources (e.g. podman) were causing rules to not parse properly.
+We didn't fix the whole problem, but we removed those comments for parsing
+purposes.
+
 ## [v3.2.0](https://github.com/puppetlabs/puppetlabs-firewall/tree/v3.2.0) (2021-09-06)
 
 [Full Changelog](https://github.com/puppetlabs/puppetlabs-firewall/compare/v3.1.0...v3.2.0)
@@ -43,6 +52,7 @@ All notable changes to this project will be documented in this file. The format
 
 - Fixed link to REFERENCE.md [\#993](https://github.com/puppetlabs/puppetlabs-firewall/pull/993) ([Samgarr](https://github.com/Samgarr))
 - Update README.md [\#986](https://github.com/puppetlabs/puppetlabs-firewall/pull/986) ([arjenz](https://github.com/arjenz))
+>>>>>>> upstream/main
 
 ## [v3.0.0](https://github.com/puppetlabs/puppetlabs-firewall/tree/v3.0.0) (2021-03-01)
 

lib/puppet/provider/firewall/iptables.rb

@@ -575,6 +575,11 @@ def self.rule_to_hash(line, table, counter)
       keys << :table
     end
 
+    # manually remove comments if they made it this far
+    if %r{-m comment --comment}.match?(values)
+      values = values.sub(%r{-m comment --comment "((?:\\"|[^"])*)"}, {})
+    end
+
     valrev = values.scan(%r{("([^"\\]|\\.)*"|\S+)}).transpose[0].reverse
 
     if keys.length != valrev.length