Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add icmp-type support to rich rules #271

Merged
merged 1 commit into from
Apr 22, 2020
Merged

Add icmp-type support to rich rules #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/puppet/provider/firewalld_rich_rule/firewall_cmd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def eval_dest
end

def elements
[:service, :port, :protocol, :icmp_block, :masquerade, :forward_port]
[:service, :port, :protocol, :icmp_block, :icmp_type, :masquerade, :forward_port]
end

def eval_element
Expand All @@ -59,6 +59,8 @@ def eval_element
args << quote_keyval('protocol', @resource[:port]['protocol'])
when :icmp_block
args << quote_keyval('name', @resource[:icmp_block])
when :icmp_type
args << quote_keyval('name', @resource[:icmp_type])
# when :masquerade
# `masquerade` doesn't accept any arguments.
when :forward_port
Expand Down
6 changes: 5 additions & 1 deletion lib/puppet/type/firewalld_rich_rule.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
desc 'Specify the element as an icmp-block'
end

newparam(:icmp_type) do
desc 'Specify the element as an icmp-type'
end

newparam(:masquerade) do
desc 'Specify the element as masquerade'
end
Expand Down Expand Up @@ -115,7 +119,7 @@ def _validate_action(value)
end

def elements
[:service, :port, :protocol, :icmp_block, :masquerade, :forward_port]
[:service, :port, :protocol, :icmp_block, :icmp_type, :masquerade, :forward_port]
end

validate do
Expand Down
2 changes: 2 additions & 0 deletions spec/unit/puppet/provider/firewalld_rich_rule_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
resource.expects(:[]).with(:port).returns(nil)
resource.expects(:[]).with(:protocol).returns(nil)
resource.expects(:[]).with(:icmp_block).returns(nil)
resource.expects(:[]).with(:icmp_type).returns(nil)
resource.expects(:[]).with(:masquerade).returns(nil)
resource.expects(:[]).with(:forward_port).returns(nil)
resource.expects(:[]).with(:log).returns(nil)
Expand All @@ -51,6 +52,7 @@
resource.expects(:[]).with(:port).returns(nil)
resource.expects(:[]).with(:protocol).returns(nil)
resource.expects(:[]).with(:icmp_block).returns(nil)
resource.expects(:[]).with(:icmp_type).returns(nil)
resource.expects(:[]).with(:masquerade).returns(nil)
resource.expects(:[]).with(:forward_port).returns(nil)
resource.expects(:[]).with(:log).returns(nil)
Expand Down
15 changes: 14 additions & 1 deletion spec/unit/puppet/type/firewalld_rich_rule_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
:action,
:protocol,
:icmp_block,
:icmp_type,
:masquerade,
:forward_port,
:log,
Expand Down Expand Up @@ -171,7 +172,19 @@
forward_port: { 'port' => '8080', 'protocol' => 'tcp', 'to_addr' => '10.72.1.10', 'to_port' => '80' },
zone: 'restricted',
log: { 'level' => 'debug' }
} => 'rule family="ipv4" forward-port port="8080" protocol="tcp" to-port="80" to-addr="10.72.1.10" log level="debug"'
} => 'rule family="ipv4" forward-port port="8080" protocol="tcp" to-port="80" to-addr="10.72.1.10" log level="debug"',

## test icmp-type
{
name: 'accept echo',
ensure: 'present',
family: 'ipv4',
zone: 'restricted',
dest: '10.0.1.2/24',
icmp_type: 'echo',
log: { 'level' => 'debug' },
action: 'accept'
} => 'rule family="ipv4" destination address="10.0.1.2/24" icmp-type name="echo" log level="debug" accept'

}

Expand Down