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

NAS-131832 / 24.10.1 / Better validate VM NIC mac address (by Qubad786) #14794

Merged
merged 1 commit into from
Oct 28, 2024
Merged

NAS-131832 / 24.10.1 / Better validate VM NIC mac address (by Qubad786) #14794

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: 4 additions & 0 deletions src/middlewared/middlewared/plugins/vm/devices/nic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,7 @@ def _validate(self, device, verrors, old=None, vm_instance=None, update=True):
'attributes.trust_guest_rx_filters',
'This can only be set when "type" of NIC device is "VIRTIO"'
)

mac_address = device['attributes'].get('mac')
if mac_address and mac_address.lower().startswith('ff'):
verrors.add('attributes.mac', 'MAC address must not start with `ff`')
83 changes: 83 additions & 0 deletions src/middlewared/middlewared/pytest/unit/plugins/vm/test_vm_devices_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import pytest

from middlewared.plugins.vm.devices import NIC
from middlewared.pytest.unit.middleware import Middleware

from middlewared.service_exception import ValidationErrors


AVAILABLE_NIC_INTERFACES = ['br0', 'eth0']


@pytest.mark.parametrize('device_data,expected_error', [
(
{
'attributes': {
'type': 'VIRTIO',
'mac': '00:a0:99:7e:bb:8a',
'nic_attach': 'br0',
'trust_guest_rx_filters': False
},
'dtype': 'NIC',
},
''
),
(
{
'attributes': {
'type': 'VIRTIO',
'mac': '00:a0:99:7e:bb:8a',
'nic_attach': 'br2',
'trust_guest_rx_filters': False
},
'dtype': 'NIC',
},
'[EINVAL] attributes.nic_attach: Not a valid choice.'
),
(
{
'attributes': {
'type': 'VIRTIO',
'mac': 'ff:a0:99:7e:bb:8a',
'nic_attach': 'br0',
'trust_guest_rx_filters': False
},
'dtype': 'NIC',
},
'[EINVAL] attributes.mac: MAC address must not start with `ff`'
),
(
{
'attributes': {
'type': 'VIRTIO',
'mac': 'ff:a0:99:7e:bb:8a',
'nic_attach': 'br0',
'trust_guest_rx_filters': True
},
'dtype': 'NIC',
},
'[EINVAL] attributes.trust_guest_rx_filters: This can only be set when "nic_attach" is not a bridge device'
),
(
{
'attributes': {
'type': 'E1000',
'mac': 'ff:a0:99:7e:bb:8a',
'nic_attach': 'eth0',
'trust_guest_rx_filters': True
},
'dtype': 'NIC',
},
'[EINVAL] attributes.trust_guest_rx_filters: This can only be set when "type" of NIC device is "VIRTIO"'
),
])
def test_nic_device_validation(device_data, expected_error):
m = Middleware()
m['vm.device.nic_attach_choices'] = lambda *arg: AVAILABLE_NIC_INTERFACES
if expected_error:
with pytest.raises(ValidationErrors) as ve:
NIC(device_data, m).validate(device_data)

assert str(ve.value.errors[0]) == expected_error
else:
assert NIC(device_data, m).validate(device_data) is None
Loading