Commit 8c89de42 by Bach Dániel Committed by Bach Dániel

firewall: add netaddr.EUI based MACAddressField

fixes #9
parent 8316409d
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
# with CIRCLE. If not, see <http://www.gnu.org/licenses/>. # with CIRCLE. If not, see <http://www.gnu.org/licenses/>.
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.forms import fields
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.ipv6 import is_valid_ipv6_address from django.utils.ipv6 import is_valid_ipv6_address
from south.modelsinspector import add_introspection_rules from south.modelsinspector import add_introspection_rules
from django import forms from django import forms
from netaddr import IPAddress, IPNetwork, AddrFormatError, ZEROFILL from netaddr import (IPAddress, IPNetwork, AddrFormatError, ZEROFILL,
EUI, mac_unix)
import re import re
...@@ -34,35 +34,67 @@ reverse_domain_re = re.compile(r'^(%\([abcd]\)d|[a-z0-9.-])+$') ...@@ -34,35 +34,67 @@ reverse_domain_re = re.compile(r'^(%\([abcd]\)d|[a-z0-9.-])+$')
ipv6_template_re = re.compile(r'^(%\([abcd]\)[dxX]|[A-Za-z0-9:-])+$') ipv6_template_re = re.compile(r'^(%\([abcd]\)[dxX]|[A-Za-z0-9:-])+$')
class MACAddressFormField(fields.RegexField): class MACAddressFormField(forms.Field):
default_error_messages = { default_error_messages = {
'invalid': _(u'Enter a valid MAC address.'), 'invalid': _(u'Enter a valid MAC address.'),
} }
def __init__(self, *args, **kwargs): def validate(self, value):
super(MACAddressFormField, self).__init__(mac_re, *args, **kwargs) try:
return EUI.from_str(value)
except (AddrFormatError, TypeError), e:
raise ValidationError(self.default_error_messages['invalid']
% unicode(e))
class MACAddressField(models.Field): class MACAddressField(models.Field):
empty_strings_allowed = False description = _('MAC Address object')
__metaclass__ = models.SubfieldBase
class mac_custom(mac_unix):
word_fmt = '%.2X'
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kwargs['max_length'] = 17 kwargs['max_length'] = 17
super(MACAddressField, self).__init__(*args, **kwargs) super(MACAddressField, self).__init__(*args, **kwargs)
@staticmethod
def from_str(value):
if not value or value == "":
return None
if isinstance(value, EUI):
return value
return EUI(value, dialect=MACAddressField.mac_custom)
def get_internal_type(self): def get_internal_type(self):
return 'CharField' return 'CharField'
def to_python(self, value): def to_python(self, value):
if not mac_re.search(str(value)): return MACAddressField.from_str(value)
raise ValidationError(
MACAddressFormField.default_error_messages['invalid']) def get_db_prep_value(self, value, connection, prepared=False):
if not value or value == "":
return None
if isinstance(value, EUI):
return str(value) return str(value)
return value
def value_to_string(self, obj):
value = self._get_val_from_obj(obj)
return str(self.get_prep_value(value))
def clean(self, value, model_instance):
value = super(MACAddressField, self).clean(value, model_instance)
return self.get_prep_value(value)
def formfield(self, **kwargs): def formfield(self, **kwargs):
defaults = {'form_class': MACAddressFormField} defaults = {'form_class': MACAddressFormField}
defaults.update(kwargs) defaults.update(kwargs)
return super(MACAddressField, self).formfield(**defaults) return super(MACAddressField, self).formfield(**defaults)
add_introspection_rules([], ["firewall\.fields\.MACAddressField"]) add_introspection_rules([], ["firewall\.fields\.MACAddressField"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment