diff --git a/djing/lib/tln/tln.py b/djing/lib/tln/tln.py index 7b025f4..1449498 100755 --- a/djing/lib/tln/tln.py +++ b/djing/lib/tln/tln.py @@ -29,21 +29,23 @@ class ValidationError(ValueError): MAC_ADDR_REGEX = b'^([0-9A-Fa-f]{1,2}[:-]){5}([0-9A-Fa-f]{1,2})$' -IP_ADDR_REGEX = '^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' \ - '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' \ - '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' \ - '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$' +IP_ADDR_REGEX = ( + '^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' + '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' + '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' + '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$' +) ONU_SN_REGEX = b'^ZTEG[A-F\d]{8}$' class TelnetApi(Telnet): - config_level = [] def __init__(self, *args, **kwargs): timeout = kwargs.get('timeout') if timeout: self._timeout = timeout self._prompt_string = b'ZTE-C320-PKP#' + self.config_level = [] super().__init__(*args, **kwargs) def write(self, buffer: bytes) -> None: diff --git a/ip_pool/forms.py b/ip_pool/forms.py index a926412..8bd35fc 100644 --- a/ip_pool/forms.py +++ b/ip_pool/forms.py @@ -1,4 +1,4 @@ -from netaddr import IPNetwork, AddrFormatError, IPAddress +from netaddr import IPNetwork, AddrFormatError from django import forms from django.core.exceptions import ValidationError @@ -6,21 +6,29 @@ from ip_pool import models class NetworkForm(forms.ModelForm): - mask = forms.CharField(max_length=39, min_length=7, widget=forms.TextInput()) - def clean_mask(self): + def clean_network(self): + netw = self.data.get('network') + mask = self.data.get('mask') + if netw is None: + return try: - network = IPAddress(self.data.get('network')) - mask = self.data.get('mask') - net = IPNetwork('%s/%s' % (network, mask)) - ip, new_mask = str(net.cidr).split('/') - return new_mask + if mask: + net = IPNetwork('%s/%s' % (netw, mask)) + else: + net = IPNetwork(netw) + return str(net.ip) except AddrFormatError as e: raise ValidationError(e, code='invalid') class Meta: model = models.NetworkModel fields = '__all__' + widgets = { + 'mask': forms.TextInput(attrs={ + 'pattern': '^\d{1,3}$' + }) + } class EmployedIpForm(forms.ModelForm): diff --git a/ip_pool/models.py b/ip_pool/models.py index d66d1d2..de0d828 100644 --- a/ip_pool/models.py +++ b/ip_pool/models.py @@ -7,28 +7,18 @@ from django.db import models from django.utils.translation import gettext_lazy as _ -IP_SUBNET_RE = ( - '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' - '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' - '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.' - '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/' - '(3[0-2]|2\d|1\d|\d))|(\/(3[0-2]|2\d|1\d|\d))$' -) - - class NetworkModel(models.Model): _netw_cache = None network = models.GenericIPAddressField( verbose_name=_('IP network'), - help_text=_('Dot separated ip address of network. For example: 192.168.1.0'), + help_text=_('Ip address of network. For example: 192.168.1.0 or fde8:6789:1234:1::'), unique=True ) mask = models.PositiveSmallIntegerField( _('Mask'), - help_text=_('For example: 24, if network is 192.168.1.0/24'), + help_text=_('Net mask bits length for ipv4 or prefix length for ipv6'), default=24, - validators=() ) work_range_start_ip = models.GenericIPAddressField( verbose_name=_('Work range start ip'), @@ -55,7 +45,9 @@ class NetworkModel(models.Model): def get_network(self) -> IPNetwork: if self._netw_cache is None: - self._netw_cache = IPNetwork("%s/%s" % (self.network, self.mask or 32)) + self._netw_cache = IPNetwork(self.network) + if self.mask: + self._netw_cache.prefixlen = self.mask return self._netw_cache def get_absolute_url(self): diff --git a/ip_pool/templates/ip_pool/net_add.html b/ip_pool/templates/ip_pool/net_add.html index 6fb8450..0c64940 100644 --- a/ip_pool/templates/ip_pool/net_add.html +++ b/ip_pool/templates/ip_pool/net_add.html @@ -3,6 +3,10 @@ {% load bootstrap3 %} {% load globaltags %} +{% block additional_link %} + +{% endblock %} + {% block breadcrumb %}
    2. @@ -15,9 +19,9 @@ {% block main %}
    {% csrf_token %} -
    +
    -

    {% trans 'Add network' %}

    +

    {% trans 'Add network' %}

    {% bootstrap_form form %} diff --git a/ip_pool/templates/ip_pool/net_edit.html b/ip_pool/templates/ip_pool/net_edit.html index 7ab999e..92babe7 100644 --- a/ip_pool/templates/ip_pool/net_edit.html +++ b/ip_pool/templates/ip_pool/net_edit.html @@ -3,6 +3,10 @@ {% load bootstrap3 %} {% load globaltags %} +{% block additional_link %} + +{% endblock %} + {% block breadcrumb %}
      2. @@ -15,9 +19,9 @@ {% block main %} {% csrf_token %} -
      +
      -

      {% trans 'Edit network' %}

      +

      {% trans 'Edit network' %} {{ object.get_network }}

      {% bootstrap_form form %} diff --git a/static/js/cidr.js b/static/js/cidr.js new file mode 100644 index 0000000..984a44f --- /dev/null +++ b/static/js/cidr.js @@ -0,0 +1,49 @@ +(function ($){ + $.fn.cidr_validator = function(opts){ + var IP4_REG = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/s; + var IP6_REG = /^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?$/s; + var settings = $.extend( { + res_label: this.find('.panel-title>span') + }, opts); + + var net_inp = this.find('#id_network'); + var mask_inp = this.find('#id_mask'); + /*var wrsi = this.children('#id_work_range_start_ip'); + var wrei = this.children('#id_work_range_end_ip');*/ + + var validate_ip_by_key = function(){ + var v = this.value; + var o = $(this).closest('.form-group-sm,.form-group'); + o.removeClass('has-error has-success'); + if(v.match(IP4_REG) !== null){ + mask_inp.val('24'); + o.addClass('has-success'); + }else + if(v.match(IP6_REG) !== null){ + mask_inp.val('64'); + o.addClass('has-success'); + }else + o.addClass('has-error'); + }; + var validate_ip_by_focus_lost = function(){ + console.log('Lost'); + var v = this.value; + if(v.includes('/')){ + var chunks = v.split('/'); + if(chunks[1] !== ""){ + net_inp.val(chunks[0]); + mask_inp.val(chunks[1]); + settings.res_label.text(v); + } + }else { + settings.res_label.text(v + '/' + mask_inp.val()); + } + }; + net_inp.on('keyup', validate_ip_by_key).on('focusout', validate_ip_by_focus_lost); + }; +})(jQuery); + + +$(document).ready(function () { + $('div.cidr-contain').cidr_validator(); +}); diff --git a/static/js/my.js b/static/js/my.js index 6df6581..80c8ecf 100644 --- a/static/js/my.js +++ b/static/js/my.js @@ -77,7 +77,7 @@ $(document).ajaxError(function (ev, jqXHR, ajaxSettings, thrownError) { var def_play = function(e){ var audiotag = e.data['audiotag'][0]; - if(audiotag.readyState == 0){ + if(audiotag.readyState === 0){ $(this).prop('disabled', true); return; }else @@ -143,14 +143,14 @@ $(document).ajaxError(function (ev, jqXHR, ajaxSettings, thrownError) { // Ajax form (function ($){ $.fn.ajform = function(opt){ + var on_response_default = function(){ + alert('You must assign callback function for response'); + }; + var settings = $.extend({ on_response : on_response_default }, opt); - var on_response_default = function(r){ - alert('You must assign callback function for response'); - }; - var on_submit = function(e){ e.preventDefault(); var formData = new FormData(this); @@ -183,24 +183,24 @@ $(document).ajaxError(function (ev, jqXHR, ajaxSettings, thrownError) { var notifShow = function(title, content){ if(!settings.news_url) return; var perm = Notification.permission.toLowerCase(); - if(perm == "granted"){ + if(perm === "granted"){ curnotify = new Notification(title, { tag: 'djing-notify', body: content, icon: '/static/img/noticon.png'} ); - }else if(perm == "default"){ + }else if(perm === "default"){ Notification.requestPermission(on_ask_perm); } - } + }; var on_ask_perm = function(r){ console.log("Thanks for letting notify you"); - } + }; var check_news = function(){ var perm = Notification.permission.toLowerCase(); - if(perm == "granted" && settings.news_url){ + if("granted" === perm && settings.news_url){ $.getJSON(settings.news_url, function(r){ if(r.auth){ if(r.exist){ @@ -211,7 +211,7 @@ $(document).ajaxError(function (ev, jqXHR, ajaxSettings, thrownError) { } }); } - } + }; if(settings.news_url){ // once per minute check news diff --git a/templates/all_base.html b/templates/all_base.html index 2f3ed03..9796691 100644 --- a/templates/all_base.html +++ b/templates/all_base.html @@ -8,6 +8,7 @@ + {% block additional_link %}{% endblock %}