cloud-mu 3.5.0 → 3.6.3

data/cookbooks/firewall/libraries/provider_firewall_iptables_ubuntu1404.rb

@@ -1,9 +1,9 @@
 #
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Cookbook Name:: firewall
+# Cookbook:: firewall
 # Resource:: default
 #
-# Copyright:: 2011, Opscode, Inc.
+# Copyright:: 2011-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class Chef
       false
     end
 
-    def action_install
+    action :install do
       return if disabled?(new_resource)
 
       # Ensure the package is installed
@@ -64,7 +64,7 @@ class Chef
       end
     end
 
-    def action_restart
+    action :restart do
       return if disabled?(new_resource)
 
       # prints all the firewall rules
@@ -98,6 +98,8 @@ class Chef
         end
       end
 
+      restart_service = false
+
       rule_files = %w(iptables)
       rule_files << 'ip6tables' if ipv6_enabled?(new_resource)
 
@@ -120,17 +122,19 @@ class Chef
         iptables_file.run_action(:create)
 
         # if the file was changed, restart iptables
-        next unless iptables_file.updated_by_last_action?
+        restart_service = true if iptables_file.updated_by_last_action?
+      end
+
+      if restart_service
         service_affected = service 'iptables-persistent' do
           action :nothing
         end
-
-        new_resource.notifies(:restart, service_affected, :delayed)
+        service_affected.run_action(:restart)
         new_resource.updated_by_last_action(true)
       end
     end
 
-    def action_disable
+    action :disable do
       return if disabled?(new_resource)
 
       iptables_flush!(new_resource)
@@ -153,7 +157,7 @@ class Chef
       end
     end
 
-    def action_flush
+    action :flush do
       return if disabled?(new_resource)
 
       iptables_flush!(new_resource)

data/cookbooks/firewall/libraries/provider_firewall_rule.rb

@@ -21,7 +21,7 @@ class Chef
   class Provider::FirewallRuleGeneric < Chef::Provider::LWRPBase
     provides :firewall_rule
 
-    def action_create
+    action :create do
       return unless new_resource.notify_firewall
 
       firewall_resource = Chef.run_context.resource_collection.find(firewall: new_resource.firewall_name)

data/cookbooks/firewall/libraries/provider_firewall_ufw.rb

@@ -3,7 +3,7 @@
 # Cookbook:: firewall
 # Resource:: default
 #
-# Copyright:: 2011-2016, Chef Software, Inc.
+# Copyright:: 2011-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ class Chef
       false
     end
 
-    def action_install
+    action :install do
       return if disabled?(new_resource)
 
       pkg_ufw = package 'ufw' do
@@ -58,7 +58,7 @@ class Chef
       new_resource.updated_by_last_action(true) if ufw_file.updated_by_last_action?
     end
 
-    def action_restart
+    action :restart do
       return if disabled?(new_resource)
 
       # ensure it's initialized
@@ -99,7 +99,7 @@ class Chef
       new_resource.updated_by_last_action(true)
     end
 
-    def action_disable
+    action :disable do
       return if disabled?(new_resource)
 
       ufw_file = lookup_or_create_rulesfile
@@ -112,7 +112,7 @@ class Chef
       new_resource.updated_by_last_action(true)
     end
 
-    def action_flush
+    action :flush do
       return if disabled?(new_resource)
 
       ufw_reset!

data/cookbooks/firewall/libraries/provider_firewall_windows.rb

@@ -26,7 +26,7 @@ class Chef
       false
     end
 
-    def action_install
+    action :install do
       return if disabled?(new_resource)
 
       svc = service 'MpsSvc' do
@@ -39,7 +39,7 @@ class Chef
       end
     end
 
-    def action_restart
+    action :restart do
       return if disabled?(new_resource)
 
       # ensure it's initialized
@@ -94,7 +94,7 @@ class Chef
       new_resource.updated_by_last_action(true)
     end
 
-    def action_disable
+    action :disable do
       return if disabled?(new_resource)
 
       if active?
@@ -115,7 +115,7 @@ class Chef
       end
     end
 
-    def action_flush
+    action :flush do
       return if disabled?(new_resource)
 
       reset!

data/cookbooks/firewall/libraries/resource_firewall_rule.rb

@@ -6,7 +6,6 @@ class Chef
 
     resource_name(:firewall_rule)
     provides(:firewall_rule)
-    actions(:create)
     default_action(:create)
 
     attribute(:firewall_name, kind_of: String, default: 'default')
@@ -20,12 +19,12 @@ class Chef
     attribute(:direction, kind_of: Symbol, equal_to: [:in, :out, :pre, :post], default: :in)
     attribute(:logging, kind_of: Symbol, equal_to: [:connections, :packets])
 
-    attribute(:source, callbacks: { 'must be a valid ip address' => ->(ip) { !!IPAddr.new(ip) } })
+    attribute(:source, kind_of: String, callbacks: { 'must be a valid ip address' => ->(ip) { !!IPAddr.new(ip) } })
     attribute(:source_port, kind_of: [Integer, Array, Range]) # source port
     attribute(:interface, kind_of: String)
 
     attribute(:port, kind_of: [Integer, Array, Range]) # shorthand for dest_port
-    attribute(:destination, callbacks: { 'must be a valid ip address' => ->(ip) { !!IPAddr.new(ip) } })
+    attribute(:destination, kind_of: String, callbacks: { 'must be a valid ip address' => ->(ip) { !!IPAddr.new(ip) } })
     attribute(:dest_port, kind_of: [Integer, Array, Range])
     attribute(:dest_interface, kind_of: String)
 
@@ -37,6 +36,7 @@ class Chef
 
     # only used for firewalld
     attribute(:permanent, kind_of: [TrueClass, FalseClass], default: false)
+    attribute(:zone, kind_of: String, default: 'drop')
 
     # only used for Windows Firewalls
     attribute(:program, kind_of: String)

data/cookbooks/firewall/metadata.json

@@ -1 +1,40 @@
-{"name":"firewall","version":"2.7.1","description":"Provides a set of primitives for managing firewalls and associated rules.","long_description":"firewall Cookbook\n=================\n\n[![Build Status](https://travis-ci.org/chef-cookbooks/firewall.svg?branch=master)](http://travis-ci.org/chef-cookbooks/firewall)\n[![Cookbook Version](https://img.shields.io/cookbook/v/firewall.svg)](https://supermarket.chef.io/cookbooks/firewall)\n\nProvides a set of primitives for managing firewalls and associated rules.\n\nPLEASE NOTE - The resource/providers in this cookbook are under heavy development. An attempt is being made to keep the resource simple/stupid by starting with less sophisticated firewall implementations first and refactor/vet the resource definition with each successive provider.\n\nRequirements\n------------\n**Chef 12.5.x+** is required. We are currently testing against Chef 13. If you need Chef 11 support, please try pinning back to a version less than 2.0, e.g.:\n```\ndepends 'firewall', '< 2.0'\n```\n\n### Supported firewalls and platforms\n* UFW - Ubuntu, Debian (except 9)\n* IPTables - Red Hat & CentOS, Ubuntu\n* FirewallD - Red Hat & CentOS >= 7.0 (IPv4 only support, [needs contributions/testing](https://github.com/chef-cookbooks/firewall/issues/86))\n* Windows Advanced Firewall - 2012 R2\n\nTested on:\n* Ubuntu 14.04, 16.04 with iptables, ufw\n* Debian 7, 8 with ufw\n* Debian 9 with iptables\n* CentOS 6 with iptables\n* CentOS 7.1 with firewalld\n* Windows Server 2012r2 with Windows Advanced Firewall\n\nBy default, Ubuntu chooses ufw. To switch to iptables, set this in an attribute file:\n```\ndefault['firewall']['ubuntu_iptables'] = true\n```\n\nBy default, Red Hat & CentOS >= 7.0 chooses firewalld. To switch to iptables, set this in an attribute file:\n```\ndefault['firewall']['redhat7_iptables'] = true\n```\n\n# Considerations that apply to all firewall providers and resources\n\nThis cookbook comes with two resources, firewall and firewall rule. The typical usage scenario is as follows:\n\n- run the `:install` action on the `firewall` resource named 'default', which installs appropriate packages and configures services to start on boot and starts them\n\n- run the `:create` action on every `firewall_rule` resource, which adds to the list of rules that should be configured on the firewall. `firewall_rule` then automatically sends a delayed notification to the `firewall['default']` resource to run the `:restart` action.\n\n- run the delayed notification with action `:restart` on the `firewall` resource. if any rules are different than the last run, the provider will update the current state of the firewall rules to match the expected rules.\n\nThere is a fundamental mismatch between the idea of a chef action and the action that should be taken on a firewall rule. For this reason, the chef action for a firewall_rule may be `:nothing` (the rule should not be present in the firewall) or `:create` (the rule should be present in the firewall), but the action taken on a packet in a firewall (`DROP`, `ACCEPT`, etc) is denoted as a `command` parameter on the `firewall_rule` resource.\n\n# iptables considerations\n\nIf you need to use a table other than `*filter`, the best way to do so is like so:\n```\nnode.default['firewall']['iptables']['defaults'][:ruleset] = {\n  '*filter' => 1,\n  ':INPUT DROP' => 2,\n  ':FORWARD DROP' => 3,\n  ':OUTPUT ACCEPT_FILTER' => 4,\n  'COMMIT_FILTER' => 100,\n  '*nat' => 101,\n  ':PREROUTING DROP' => 102,\n  ':POSTROUTING DROP' => 103,\n  ':OUTPUT ACCEPT_NAT' => 104,\n  'COMMIT_NAT' => 200\n}\n```\n\nNote -- in order to support multiple hash keys containing the same rule, anything found after the underscore will be stripped for: `:OUTPUT :INPUT :POSTROUTING :PREROUTING COMMIT`. This allows an example like the above to be reduced to just repeated lines of `COMMIT` and `:OUTPUT ACCEPT` while still avoiding duplication of other things.\n\nThen it's trivial to add additional rules to the `*nat` table using the raw parameter:\n```\nfirewall_rule \"postroute\" do\n  raw \"-A POSTROUTING -o eth1 -p tcp -d 172.28.128.21 -j SNAT --to-source 172.28.128.6\"\n  position 150\nend\n```\n\nNote that any line starting with `COMMIT` will become just `COMMIT`, as hash\nkeys must be unique but we need multiple commit lines.\n\n# Recipes\n\n### default\nThe default recipe creates a firewall resource with action install.\n\n### disable_firewall\nUsed to disable platform specific firewall. Many clouds have their own firewall configured outside of the OS instance such as AWS Security Groups.\n\n# Attributes\n\n* `default['firewall']['allow_ssh'] = false`, set true to open port 22 for SSH when the default recipe runs\n* `default['firewall']['allow_mosh'] = false`, set to true to open UDP ports 60000 - 61000 for [Mosh][0] when the default recipe runs\n* `default['firewall']['allow_winrm'] = false`, set true to open port 5989 for WinRM when the default recipe runs\n* `default['firewall']['allow_loopback'] = false`, set to true to allow all traffic on the loopback interface\n* `default['firewall']['allow_icmp'] = false`, set true to allow icmp protocol on supported OSes (note: ufw and windows implementations don't support this)\n\n* `default['firewall']['ubuntu_iptables'] = false`, set to true to use iptables on Ubuntu / Debian when using the default recipe\n* `default['firewall']['redhat7_iptables'] = false`, set to true to use iptables on Red Hat / CentOS 7 when using the default recipe\n\n* `default['firewall']['ufw']['defaults']` hash for template `/etc/default/ufw`\n* `default['firewall']['iptables']['defaults']` hash for default policies for 'filter' table's chains`\n\n* `default['firewall']['windows']['defaults']` hash to define inbound / outbound firewall policy on Windows platform\n\n* `default['firewall']['allow_established'] = true`, set to false if you don't want a related/established default rule on iptables\n* `default['firewall']['ipv6_enabled'] = true`, set to false if you don't want IPv6 related/established default rule on iptables (this enables ICMPv6, which is required for much of IPv6 communication)\n\n* `default['firewall']['firewalld']['permanent'] = false`, set to true if you want firewalld rules to be added with `--permanent` so they survive a reboot. This will be changed to `true` by default in a future major version release.\n\n# Resources\n\n### firewall\n\n***NB***: The name 'default' of this resource is important as it is used for firewall_rule providers to locate the firewall resource. If you change it, you must also supply the same value to any firewall_rule resources using the `firewall_name` parameter.\n\n#### Actions\n- `:install` (*default action*): Install and Enable the firewall. This will ensure the appropriate packages are installed and that any services have been started.\n- `:disable`: Disable the firewall. Drop any rules and put the node in an unprotected state. Flush all current rules. Also erase any internal state used to detect when rules should be applied.\n- `:flush`: Flush all current rules. Also erase any internal state used to detect when rules should be applied.\n- `:save`: Ensure all rules are added permanently under firewalld using `--permanent`. Not supported on ufw, iptables. You must notify this action at the end of the chef run if you want permanent firewalld rules (they are not persistent by default).\n\n#### Parameters\n\n- `disabled` (default to `false`): If set to true, all actions will no-op on this resource. This is a way to prevent included cookbooks from configuring a firewall.\n- `ipv6_enabled` (default to `true`): If set to false, firewall will not perform any ipv6 related work. Currently only supported in iptables.\n- `log_level`: UFW only. Level of verbosity the firewall should log at. valid values are: :low, :medium, :high, :full, :off. default is :low.\n- `rules`: This is used internally for firewall_rule resources to append their rules. You should NOT touch this value unless you plan to supply an entire firewall ruleset at once, and skip using firewall_rule resources.\n- `disabled_zone` (firewalld only): The zone to set on firewalld when the firewall should be disabled. Can be any string in symbol form, e.g. :public, :drop, etc. Defaults to `:public.`\n- `enabled_zone` (firewalld only): The zone to set on firewalld when the firewall should be enabled. Can be any string in symbol form, e.g. :public, :drop, etc. Defaults to `:drop.`\n- `package_options`: Used to pass options to the package install of firewall\n\n#### Examples\n\n```ruby\n# all defaults\nfirewall 'default'\n\n# enable platform default firewall\nfirewall 'default' do\n  action :install\nend\n\n# increase logging past default of 'low'\nfirewall 'default' do\n  log_level :high\n  action    :install\nend\n```\n\n### firewall_rule\n\n#### Actions\n- `:create` (_default action_): If a firewall_rule runs this action, the rule will be recorded in a chef resource's internal state, and applied when providers automatically notify the firewall resource with action `:reload`. The notification happens automatically.\n\n#### Parameters\n\n- `firewall_name`: the matching firewall resource that this rule applies to. Default value: `default`\n\n- `raw`: Used to pass an entire rule as a string, omitting all other parameters. This line will be directly loaded by `iptables-restore`, fed directly into `ufw` on the command line, or run using `firewall-cmd`.\n\n- `description` (_default: same as rule name_): Used to provide a comment that will be included when adding the firewall rule.\n\n- `include_comment` (_default: true_): Used to optionally exclude the comment in the rule.\n\n- `position` (_default: 50_): **relative** position to insert rule at. Position may be any integer between 0 < n < 100 (exclusive), and more than one rule may specify the same position.\n\n- `command`: What action to take on a particular packet\n\n  - `:allow` (_default action_): the rule should allow matching packets\n  - `:deny`: the rule should deny matching packets\n  - `:reject`: the rule should reject matching packets\n  - `:masqerade`: Masquerade the matching packets\n  - `:redirect`: Redirect the matching packets\n  - `:log`: Configure logging\n\n- `stateful`: a symbol or array of symbols, such as ``[:related, :established]` that will be passed to the state module in iptables or firewalld.\n\n- `protocol`: `:tcp` (_default_), `:udp`, `:icmp`, `:none` or protocol number. Using protocol numbers is not supported using the ufw provider (default for debian/ubuntu systems).\n\n- `direction`: For ufw, direction of the rule. valid values are: `:in` (_default_), `:out`, `:pre`, `:post`.\n\n- `source` (_Default is `0.0.0.0/0` or `Anywhere`_): source ip address or subnet to filter.\n\n- `source_port` (_Default is nil_): source port for filtering packets.\n\n- `destination`: ip address or subnet to filter on packet destination, must be a valid IP\n\n- `port` or `dest_port`: target port number (ie. 22 to allow inbound SSH), or an array of incoming port numbers (ie. [80,443] to allow inbound HTTP & HTTPS).\n\n   NOTE: `protocol` attribute is required with multiple ports, or a range of incoming port numbers (ie. 60000..61000 to allow inbound mobile-shell. NOTE: `protocol`, or an attribute is required with a range of ports.\n\n- `interface`: (source) interface to apply rule (ie. `eth0`).\n\n- `dest_interface`: interface where packets may be destined to go\n\n- `redirect_port`: redirected port for rules with command `:redirect`\n\n- `logging`: may be added to enable logging for a particular rule. valid values are: `:connections`, `:packets`. In the ufw provider, `:connections` logs new connections while `:packets` logs all packets.\n\n#### Examples\n\n```ruby\n# open standard ssh port\nfirewall_rule 'ssh' do\n  port     22\n  command  :allow\nend\n\n# open standard http port to tcp traffic only; insert as first rule\nfirewall_rule 'http' do\n  port     80\n  protocol :tcp\n  position 1\n  command   :allow\nend\n\n# restrict port 13579 to 10.0.111.0/24 on eth0\nfirewall_rule 'myapplication' do\n  port      13579\n  source    '10.0.111.0/24'\n  direction :in\n  interface 'eth0'\n  command    :allow\nend\n\n# specify a protocol number (supported on centos/redhat)\nfirewall_rule 'vrrp' do\n  protocol    112\n  command      :allow\nend\n\n# use the iptables provider to specify protocol number on debian/ubuntu\nfirewall_rule 'vrrp' do\n  provider    Chef::Provider::FirewallRuleIptables\n  protocol    112\n  command      :allow\nend\n\n# can use :raw command with UFW provider for VRRP\nfirewall_rule \"VRRP\" do\n  command   :allow\n  raw \"allow to 224.0.0.18\"\nend\n\n# open UDP ports 60000..61000 for mobile shell (mosh.mit.edu), note\n# that the protocol attribute is required when using port_range\nfirewall_rule 'mosh' do\n  protocol   :udp\n  port       60000..61000\n  command     :allow\nend\n\n# open multiple ports for http/https, note that the protocol\n# attribute is required when using ports\nfirewall_rule 'http/https' do\n  protocol :tcp\n  port     [80, 443]\n  command   :allow\nend\n\nfirewall 'default' do\n  enabled false\n  action :nothing\nend\n```\n\n#### Providers\n\n- See `libraries/z_provider_mapping.rb` for a full list of providers for each platform and version.\n\nDifferent providers will determine the current state of the rules differently -- parsing the output of a command, maintaining the state in a file, or some other way. If the firewall is adjusted from outside of chef (non-idempotent), it's possible that chef may be caught unaware of the current state of the firewall. The best workaround is to add a `:flush` action to the firewall resource as early as possible in the chef run, if you plan to modify the firewall state outside of chef.\n\n# Troubleshooting\n\nTo figure out what the position values are for current rules, print the hash that contains the weights:\n```\nrequire pp\ndefault_firewall = resources(:firewall, 'default')\npp default_firewall.rules\n```\n\n# Development\nThis section details \"quick development\" steps. For a detailed explanation, see [[Contributing.md]].\n\n1. Clone this repository from GitHub:\n\n        $ git clone git@github.com:chef-cookbooks/firewall.git\n\n2. Create a git branch\n\n        $ git checkout -b my_bug_fix\n\n3. Install dependencies:\n\n        $ bundle install\n\n4. Make your changes/patches/fixes, committing appropiately\n5. **Write tests**\n6. Run the tests:\n    - `bundle exec foodcritic -f any .`\n    - `bundle exec rspec`\n    - `bundle exec rubocop`\n    - `bundle exec kitchen test`\n\n  In detail:\n    - Foodcritic will catch any Chef-specific style errors\n    - RSpec will run the unit tests\n    - Rubocop will check for Ruby-specific style errors\n    - Test Kitchen will run and converge the recipes\n\n\n# License & Authors\n<!-- $ find -type f -iname \"*.rb\" -exec grep -i author '{}' \\; | sort -k4 | uniq | sed 's/#/-/g' -->\n- Author:: Seth Chisamore (<schisamo@opscode.com>)\n- Author:: Ronald Doorn (<rdoorn@schubergphilis.com>)\n- Author:: Martin Smith (<martin@mbs3.org>)\n- Author:: Sander van Harmelen (<svanharmelen@schubergphilis.com>)\n\n```text\nCopyright:: 2011-2015, Chef Software, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n```\n\n[0]: https://mosh.mit.edu/\n","maintainer":"Chef Software, Inc.","maintainer_email":"cookbooks@chef.io","license":"Apache-2.0","platforms":{"centos":">= 0.0.0","debian":">= 0.0.0","ubuntu":">= 0.0.0","windows":">= 0.0.0"},"dependencies":{},"recommendations":{},"suggestions":{},"conflicting":{},"providing":{},"replacing":{},"attributes":{},"groupings":{},"recipes":{},"source_url":"https://github.com/chef-cookbooks/firewall","issues_url":"https://github.com/chef-cookbooks/firewall/issues","chef_version":[[">= 12.5"]],"ohai_version":[]}
+{
+  "name": "firewall",
+  "description": "Provides a set of primitives for managing firewalls and associated rules.",
+  "long_description": "",
+  "maintainer": "Sous Chefs",
+  "maintainer_email": "help@sous-chefs.org",
+  "license": "Apache-2.0",
+  "platforms": {
+    "amazon": ">= 0.0.0",
+    "centos": ">= 0.0.0",
+    "debian": ">= 0.0.0",
+    "ubuntu": ">= 0.0.0",
+    "windows": ">= 0.0.0"
+  },
+  "dependencies": {
+
+  },
+  "providing": {
+
+  },
+  "recipes": {
+
+  },
+  "version": "6.3.7",
+  "source_url": "https://github.com/sous-chefs/firewall",
+  "issues_url": "https://github.com/sous-chefs/firewall/issues",
+  "privacy": false,
+  "chef_versions": [
+    [
+      ">= 15.5"
+    ]
+  ],
+  "ohai_versions": [
+
+  ],
+  "gems": [
+
+  ],
+  "eager_load_libraries": true
+}

data/cookbooks/firewall/metadata.rb

@@ -0,0 +1,15 @@
+name              'firewall'
+maintainer        'Sous Chefs'
+maintainer_email  'help@sous-chefs.org'
+license           'Apache-2.0'
+description       'Provides a set of primitives for managing firewalls and associated rules.'
+version           '6.3.7'
+source_url        'https://github.com/sous-chefs/firewall'
+issues_url        'https://github.com/sous-chefs/firewall/issues'
+chef_version      '>= 15.5'
+
+supports 'amazon'
+supports 'centos'
+supports 'debian'
+supports 'ubuntu'
+supports 'windows'

data/cookbooks/firewall/recipes/default.rb

@@ -2,7 +2,7 @@
 # Cookbook:: firewall
 # Recipe:: default
 #
-# Copyright:: 2011-2016, Chef Software, Inc.
+# Copyright:: 2011-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,13 +23,13 @@ firewall 'default' do
 end
 
 # create a variable to use as a condition on some rules that follow
-iptables_firewall = platform_family?("rhel") || platform_family?("amazon") || node['firewall']['ubuntu_iptables']
+iptables_firewall = rhel? || amazon_linux? || node['firewall']['ubuntu_iptables']
 
 firewall_rule 'allow loopback' do
   interface 'lo'
   protocol :none
   command :allow
-  only_if { node["os"] == "linux" && node['firewall']['allow_loopback'] }
+  only_if { linux? && node['firewall']['allow_loopback'] }
 end
 
 firewall_rule 'allow icmp' do
@@ -37,26 +37,26 @@ firewall_rule 'allow icmp' do
   command :allow
   # debian ufw doesn't allow 'icmp' protocol, but does open
   # icmp by default, so we skip it in default recipe
-  only_if { (!debian?(node) || iptables_firewall) && node['firewall']['allow_icmp'] }
+  only_if { iptables_firewall && node['firewall']['allow_icmp'] }
 end
 
 firewall_rule 'allow world to ssh' do
   port 22
   source '0.0.0.0/0'
-  only_if { node["os"] == "linux" && node['firewall']['allow_ssh'] }
+  only_if { linux? && node['firewall']['allow_ssh'] }
 end
 
 firewall_rule 'allow world to winrm' do
   port 5989
   source '0.0.0.0/0'
-  only_if { node["os"] == "windows" && node['firewall']['allow_winrm'] }
+  only_if { windows? && node['firewall']['allow_winrm'] }
 end
 
 firewall_rule 'allow world to mosh' do
   protocol :udp
   port 60000..61000
   source '0.0.0.0/0'
-  only_if { node["os"] == "linux" && node['firewall']['allow_mosh'] }
+  only_if { linux? && node['firewall']['allow_mosh'] }
 end
 
 # allow established connections, ufw defaults to this but iptables does not

data/cookbooks/firewall/recipes/disable_firewall.rb

@@ -2,7 +2,7 @@
 # Cookbook:: firewall
 # Recipe:: disable_firewall
 #
-# Copyright:: 2011-2016, Chef Software, Inc.
+# Copyright:: 2011-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/cookbooks/firewall/recipes/firewalld.rb

@@ -0,0 +1,87 @@
+#
+# Cookbook:: firewall
+# Recipe:: firewalld
+#
+# Copyright:: 2011-2016, Chef Software, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+chef_sugar_cookbook_version = Gem::Version.new(run_context.cookbook_collection['chef-sugar'].metadata.version)
+
+include_recipe 'chef-sugar' if chef_sugar_cookbook_version < Gem::Version.new('4.0.0')
+
+firewall 'default' do
+  ipv6_enabled node['firewall']['ipv6_enabled']
+  enabled_zone node['firewall']['firewalld']['zone'].to_sym
+  action :install
+end
+
+# create a variable to use as a condition on some rules that follow
+iptables_firewall = rhel? || node['firewall']['ubuntu_iptables']
+
+firewall_rule 'allow loopback' do
+  interface 'lo'
+  protocol :none
+  command :allow
+  zone node['firewall']['firewalld']['loopback_zone']
+  only_if { linux? && node['firewall']['allow_loopback'] }
+end
+
+firewall_rule 'allow icmp' do
+  protocol :icmp
+  command :allow
+  zone node['firewall']['firewalld']['icmp_zone']
+  # debian ufw doesn't allow 'icmp' protocol, but does open
+  # icmp by default, so we skip it in default recipe
+  only_if { (!debian?(node) || iptables_firewall) && node['firewall']['allow_icmp'] }
+end
+
+firewall_rule 'allow world to ssh' do
+  port 22
+  source '0.0.0.0/0'
+  zone node['firewall']['firewalld']['ssh_zone']
+  only_if { linux? && node['firewall']['allow_ssh'] }
+end
+
+firewall_rule 'allow world to winrm' do
+  port 5989
+  source '0.0.0.0/0'
+  only_if { windows? && node['firewall']['allow_winrm'] }
+end
+
+firewall_rule 'allow world to mosh' do
+  protocol :udp
+  port 60000..61000
+  source '0.0.0.0/0'
+  zone node['firewall']['firewalld']['mosh_zone']
+  only_if { linux? && node['firewall']['allow_mosh'] }
+end
+
+# allow established connections, ufw defaults to this but iptables does not
+firewall_rule 'established' do
+  stateful [:related, :established]
+  protocol :none # explicitly don't specify protocol
+  command :allow
+  zone node['firewall']['firewalld']['established_zone']
+  only_if { node['firewall']['allow_established'] && iptables_firewall }
+end
+
+# ipv6 needs ICMP to reliably work, so ensure it's enabled if ipv6
+# allow established connections, ufw defaults to this but iptables does not
+firewall_rule 'ipv6_icmp' do
+  protocol :'ipv6-icmp'
+  command :allow
+  zone node['firewall']['firewalld']['icmp_zone']
+  only_if { node['firewall']['ipv6_enabled'] && node['firewall']['allow_established'] && iptables_firewall }
+end

data/cookbooks/firewall/renovate.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base"],
+  "packageRules": [
+    {
+      "groupName": "Actions",
+      "matchUpdateTypes": ["minor", "patch", "pin"],
+      "automerge": true,
+      "addLabels": ["Release: Patch", "Skip: Announcements"]
+    },
+    {
+      "groupName": "Actions",
+      "matchUpdateTypes": ["major"],
+      "automerge": false,
+      "addLabels": ["Release: Patch", "Skip: Announcements"]
+    }
+  ]
+}

data/cookbooks/firewall/resources/firewalld.rb

@@ -0,0 +1,28 @@
+unified_mode true
+
+provides :firewalld,
+         os: 'linux'
+
+action :install do
+  chef_gem 'ruby-dbus'
+  require 'dbus'
+  package 'firewalld'
+end
+
+action :reload do
+  service 'firewalld' do
+    action :reload
+  end
+end
+
+action :restart do
+  service 'firewalld' do
+    action :restart
+  end
+end
+
+action :disable do
+  service 'firewalld' do
+    action [:disable, :stop]
+  end
+end

data/cookbooks/firewall/resources/firewalld_config.rb

@@ -0,0 +1,39 @@
+unified_mode true
+
+provides :firewalld_config,
+         os: 'linux'
+
+property :default_zone,
+         String,
+         description: 'Set default zone for connections and interfaces where no zone has been selected to zone. Setting the default zone changes the zone for the connections or interfaces, that are using the default zone.'
+property :log_denied,
+         String,
+         equal_to: %w(all unicast broadcast multicast off),
+         description: 'Set LogDenied value to value. If LogDenied is enabled, then logging rules are added right before reject and drop rules in the INPUT, FORWARD and OUTPUT chains for the default rules and also final reject and drop rules in zones.'
+
+load_current_value do |_new_resource|
+  sysbus = DBus.system_bus
+  firewalld_service = sysbus['org.fedoraproject.FirewallD1']
+  firewalld_object = firewalld_service['/org/fedoraproject/FirewallD1']
+  interface = firewalld_object['org.fedoraproject.FirewallD1']
+
+  default_zone interface.getDefaultZone
+  log_denied interface.getLogDenied
+end
+
+action :update do
+  dbus = DBus.system_bus
+  fw = firewalld_interface(dbus)
+
+  converge_if_changed :default_zone do
+    fw.setDefaultZone new_resource.default_zone
+  end
+
+  converge_if_changed :log_denied do
+    fw.setLogDenied new_resource.log_denied
+  end
+end
+
+action_class do
+  include FirewallCookbook::Helpers::FirewalldDBus
+end

data/cookbooks/firewall/resources/firewalld_helpers.rb

@@ -0,0 +1,106 @@
+unified_mode true
+
+provides :firewalld_helper,
+         os: 'linux'
+
+property :version,
+         String,
+         default: '',
+         description: 'see version attribute of helper tag in firewalld.helper(5).'
+property :short,
+         String,
+         name_property: true,
+         description: 'see short tag in firewalld.helper(5).'
+property :description,
+         String,
+         description: 'see description tag in firewalld.helper(5).'
+property :family,
+         String,
+         equal_to: %w(ipv4 ipv6),
+         default: 'ipv4',
+         description: 'see family tag in firewalld.helper(5).'
+property :nf_module,
+         String,
+         description: 'see module tag in firewalld.helper(5).'
+property :ports,
+         [Array, String],
+         default: [],
+         description: 'array of port and protocol pairs. See port tag in firewalld.helper(5).',
+         coerce: proc { |o| Array(o) }
+
+load_current_value do |new_resource|
+  dbus = DBus.system_bus
+  firewalld_service = dbus['org.fedoraproject.FirewallD1']
+  firewalld_object = firewalld_service['/org/fedoraproject/FirewallD1/config']
+  fw_config = firewalld_object['org.fedoraproject.FirewallD1.config']
+  if fw_config.getHelperNames.include?(new_resource.short)
+    helper_path = fw_config.getHelperByName(new_resource.short)
+    object = firewalld_service[helper_path]
+    config_helper = object['org.fedoraproject.FirewallD1.config.helper']
+    settings = config_helper.getSettings
+    version settings[0]
+    # short settings[1]
+    description settings[2]
+    family settings[3]
+    nf_module settings[4]
+    ports settings[5]
+  else
+    Chef::Log.info "Helper #{new_resource.short} does not exist. Will be created."
+  end
+end
+
+action :update do
+  dbus = DBus.system_bus
+  fw = firewalld_interface(dbus)
+  fw_config = config_interface(dbus)
+  helper_names = fw_config.getHelperNames
+  reload = false
+  if !helper_names.include?(new_resource.short)
+    values = [
+      new_resource.version,
+      new_resource.short,
+      default_description(new_resource),
+      new_resource.family,
+      new_resource.nf_module,
+      new_resource.ports.map { |e| e.split('/') },
+    ]
+    converge_by "Add Helper #{new_resource.short}" do
+      fw_config.addHelper(new_resource.short, values)
+    end
+    reload = true
+  else
+    helper_path = fw_config.getHelperByName(new_resource.short)
+    helper = helper_interface(dbus, helper_path)
+    converge_if_changed :version do
+      helper.setVersion new_resource.version
+      reload = true
+    end
+    converge_if_changed :description do
+      helper.setDescription default_description(new_resource)
+      reload = true
+    end
+    converge_if_changed :family do
+      helper.setFamily new_resource.family
+      reload = true
+    end
+    converge_if_changed :nf_module do
+      helper.setModule new_resource.nf_module
+      reload = true
+    end
+    converge_if_changed :ports do
+      helper.setPorts new_resource.ports.map { |e| e.split('/') }
+      reload = true
+    end
+  end
+
+  if reload
+    converge_by ['reload permanent configuration of firewalld'] do
+      fw.reload
+    end
+  end
+end
+
+action_class do
+  include FirewallCookbook::Helpers
+  include FirewallCookbook::Helpers::FirewalldDBus
+end