Skip to content

Allow a singular numeric port for the --to-ports parameter #1199

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

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Allow a singular numeric port for the --to-ports parameter #1199

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
2 changes: 1 addition & 1 deletion lib/puppet/type/firewall.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@
DESC
},
toports: {
type: 'Optional[Pattern[/^\d+(?:-\d+)?$/]]',
type: 'Optional[Variant[Integer[0, 65535], Pattern[/^\d+(?:-\d+)?$/]]]',
desc: <<-DESC
For REDIRECT/MASQUERADE this is the port that will replace the destination/source port.
Can specify a single new port or an inclusive range of ports.
Expand Down
11 changes: 11 additions & 0 deletions spec/acceptance/firewall_attributes_happy_path_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ class { '::firewall': }
jump => 'REDIRECT',
toports => '2222',
}
firewall { '575 - toports-numeric':
proto => icmp,
table => 'nat',
chain => 'PREROUTING',
jump => 'REDIRECT',
toports => 3333,
}
firewall { '581 - pkttype':
ensure => present,
proto => tcp,
Expand Down Expand Up @@ -441,6 +448,10 @@ class { '::firewall': }
expect(result.stdout).to match(%r{-A PREROUTING -p (icmp|1) -m comment --comment "574 - toports" -j REDIRECT --to-ports 2222})
end

it 'toports-numeric is set' do
expect(result.stdout).to match(%r{-A PREROUTING -p (icmp|1) -m comment --comment "575 - toports-numeric" -j REDIRECT --to-ports 3333})
end

it 'rpfilter is set' do
expect(result.stdout).to match(%r{-A PREROUTING -p (tcp|6) -m rpfilter --loose --validmark --accept-local --invert -m comment --comment "900 - set rpfilter" -j ACCEPT})
end
Expand Down
6 changes: 3 additions & 3 deletions spec/unit/puppet/type/firewall_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,9 @@
{ name: '001 test rule', tosource: 313 }]
},
':toports': {
valid: [{ name: '001 test rule', toports: '40' }, { name: '001 test rule', tosource: '50-60' }],
invalid: [{ name: '001 test rule', toports: 'invalid' }, { name: '001 test rule', toports: false },
{ name: '001 test rule', toports: 313 }]
valid: [{ name: '001 test rule', toports: '40' }, { name: '001 test rule', tosource: '50-60' },
{ name: '001 test rule', toports: 313 }],
invalid: [{ name: '001 test rule', toports: 'invalid' }, { name: '001 test rule', toports: false }]
},
':to': {
valid: [{ name: '001 test rule', to: '10.0.0.2' }, { name: '001 test rule', to: '10.0.0.2/24' }],
Expand Down
Loading