mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-22 11:23:10 +00:00
Validateur pour le nom de l'interface
This commit is contained in:
parent
b7b76ba05a
commit
a80490879b
2 changed files with 28 additions and 3 deletions
|
@ -1,8 +1,33 @@
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.forms import ModelForm, Form
|
from django.forms import ModelForm, Form, ValidationError
|
||||||
from macaddress.fields import MACAddressField
|
from macaddress.fields import MACAddressField
|
||||||
|
|
||||||
from users.models import User
|
from users.models import User
|
||||||
|
from django.conf import settings
|
||||||
|
import re
|
||||||
|
|
||||||
|
def full_domain_validator(hostname):
|
||||||
|
""" Validation du nom de domaine, extensions dans settings, prefixe pas plus long que 63 caractères """
|
||||||
|
HOSTNAME_LABEL_PATTERN = re.compile("(?!-)[A-Z\d-]+(?<!-)$", re.IGNORECASE)
|
||||||
|
if not any(ext in hostname for ext in settings.ALLOWED_EXTENSIONS):
|
||||||
|
raise ValidationError(
|
||||||
|
", le nom de domaine '%(label)s' doit comporter une extension valide",
|
||||||
|
params={'label': hostname},
|
||||||
|
)
|
||||||
|
for extension in settings.ALLOWED_EXTENSIONS:
|
||||||
|
if hostname.endswith(extension):
|
||||||
|
hostname=re.sub('%s$' % extension, '', hostname)
|
||||||
|
break
|
||||||
|
if len(hostname) > 63:
|
||||||
|
raise ValidationError(
|
||||||
|
", le nom de domaine '%(label)s' est trop long (maximum de 63 caractères).",
|
||||||
|
params={'label': hostname},
|
||||||
|
)
|
||||||
|
if not HOSTNAME_LABEL_PATTERN.match(hostname):
|
||||||
|
raise ValidationError(
|
||||||
|
", ce nom de domaine '%(label)s' contient des carractères interdits.",
|
||||||
|
params={'label': hostname},
|
||||||
|
)
|
||||||
|
|
||||||
class Machine(models.Model):
|
class Machine(models.Model):
|
||||||
user = models.ForeignKey('users.User', on_delete=models.PROTECT)
|
user = models.ForeignKey('users.User', on_delete=models.PROTECT)
|
||||||
|
@ -26,7 +51,7 @@ class Interface(models.Model):
|
||||||
mac_address = MACAddressField(integer=False, unique=True)
|
mac_address = MACAddressField(integer=False, unique=True)
|
||||||
machine = models.ForeignKey('Machine', on_delete=models.PROTECT)
|
machine = models.ForeignKey('Machine', on_delete=models.PROTECT)
|
||||||
details = models.CharField(max_length=255, blank=True)
|
details = models.CharField(max_length=255, blank=True)
|
||||||
dns = models.CharField(help_text="Obligatoire et unique, doit se terminer en .rez et ne pas comporter de points", max_length=255, unique=True)
|
dns = models.CharField(help_text="Obligatoire et unique, doit se terminer en %s et ne pas comporter d'autres points" % ", ".join(settings.ALLOWED_EXTENSIONS), max_length=255, unique=True, validators=[full_domain_validator])
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.dns
|
return self.dns
|
||||||
|
|
|
@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/1.8/ref/settings/
|
||||||
|
|
||||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||||
import os
|
import os
|
||||||
from .settings_local import SECRET_KEY, DATABASES, DEBUG, ALLOWED_HOSTS
|
from .settings_local import SECRET_KEY, DATABASES, DEBUG, ALLOWED_HOSTS, ALLOWED_EXTENSIONS
|
||||||
|
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue