afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added validation checks/conversion for valid values of mac addresses and ip addresses to addaddr and sethwaddr functions

Browse source
This commit is contained in:
Blake Harnden 2020-01-08 20:44:15 -08:00
parent de493c810a
commit 6042c6fed9
4 changed files with 51 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/nodes/base.py
View file

@ -729,6 +729,7 @@ class CoreNode(CoreNodeBase):
:return: nothing
:raises CoreCommandError: when a non-zero exit status occurs
"""
addr = utils.validate_mac(addr)
interface = self._netif[ifindex]
interface.sethwaddr(addr)
if self.up:
@ -742,6 +743,7 @@ class CoreNode(CoreNodeBase):
:param str addr: address to add to interface
:return: nothing
"""
addr = utils.validate_ip(addr)
interface = self._netif[ifindex]
interface.addaddr(addr)
if self.up:

3
daemon/core/nodes/interface.py
View file

@ -114,7 +114,7 @@ class CoreInterface:
:param str addr: address to add
:return: nothing
"""
addr = utils.validate_ip(addr)
self.addrlist.append(addr)
def deladdr(self, addr):
@ -133,6 +133,7 @@ class CoreInterface:
:param str addr: hardware address to set to.
:return: nothing
"""
addr = utils.validate_mac(addr)
self.hwaddr = addr
def getparam(self, key):

19
daemon/core/nodes/physical.py
View file

@ -59,19 +59,30 @@ class PhysicalNode(CoreNodeBase):
def sethwaddr(self, ifindex, addr):
"""
Set hardware address for an interface.
:param int ifindex: index of interface to set hardware address for
:param str addr: hardware address to set
:return: nothing
:raises CoreCommandError: when a non-zero exit status occurs
"""
addr = utils.validate_mac(addr)
interface = self._netif[ifindex]
interface.sethwaddr(addr)
if self.up:
self.net_client.device_mac(interface.name, str(addr))
self.net_client.device_mac(interface.name, addr)
def addaddr(self, ifindex, addr):
"""
Add an address to an interface.
:param int ifindex: index of interface to add address to
:param str addr: address to add
:return: nothing
"""
addr = utils.validate_ip(addr)
interface = self._netif[ifindex]
if self.up:
self.net_client.create_address(interface.name, str(addr))
self.net_client.create_address(interface.name, addr)
interface.addaddr(addr)
def deladdr(self, ifindex, addr):
@ -408,9 +419,9 @@ class Rj45Node(CoreNodeBase, CoreInterface):
:return: nothing
:raises CoreCommandError: when there is a command exception
"""
addr = utils.validate_ip(addr)
if self.up:
self.net_client.create_address(self.name, str(addr))
self.net_client.create_address(self.name, addr)
CoreInterface.addaddr(self, addr)
def deladdr(self, addr):