Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes-firewall: correctly handle empty connected-ips list

Browse Source
This commit is contained in:
Pawel Marczewski 2020-01-13 14:42:17 +01:00
parent 860a07166b
commit 00fbb956b4
No known key found for this signature in database
GPG Key ID: DE42EE9B14F96465
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qubesagent/firewall.py
View File

@ -512,23 +512,31 @@ class NftablesWorker(FirewallWorker):
self.chains[family].add(chain) self.chains[family].add(chain)
def update_connected_ips(self, family): def update_connected_ips(self, family):
addr = '{' + ', '.join(self.get_connected_ips(family)) + '}' ips = self.get_connected_ips(family)
if ips:
addr = '{' + ', '.join(ips) + '}'
irule = 'iifname != "vif*" {family} saddr {addr} drop\n'.format(addr)
orule = 'oifname != "vif*" {family} daddr {addr} drop\n'.format(addr)
else:
irule = ''
orule = ''
nft_input = ( nft_input = (
'flush chain {family} {table} prerouting\n' 'flush chain {family} {table} prerouting\n'
'flush chain {family} {table} postrouting\n' 'flush chain {family} {table} postrouting\n'
'table {family} {table} {{\n' 'table {family} {table} {{\n'
' chain prerouting {{\n' ' chain prerouting {{\n'
' iifname != "vif*" {family} saddr {addr} drop\n' ' {irule}'
' }}\n' ' }}\n'
' chain postrouting {{\n' ' chain postrouting {{\n'
' oifname != "vif*" {family} daddr {addr} drop\n' ' {orule}'
' }}\n' ' }}\n'
'}}\n' '}}\n'
).format( ).format(
family=('ip6' if family == 6 else 'ip'), family=('ip6' if family == 6 else 'ip'),
table='qubes-firewall', table='qubes-firewall',
addr=addr, irule=irule,
orule=orule,
) )
self.run_nft(nft_input) self.run_nft(nft_input)