libs/cbi: add datatype validators for upcoming client side field validation

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi.js b/libs/cbi/htdocs/luci-static/resources/cbi.js
index 247228d225b47d6a3f15a88e3ecefae176153be7..9af2b0def2e6839f24ce267cb73ea51ee86ebe2d 100644 (file)
--- a/libs/cbi/htdocs/luci-static/resources/cbi.js
+++ b/libs/cbi/htdocs/luci-static/resources/cbi.js
@@ -17,6 +17,155 @@ var cbi_d = [];
 var cbi_t = [];
 var cbi_c = [];
 
+var cbi_validators = {
+
+       'integer': function(v)
+       {
+               return (v.match(/^-?[0-9]+$/) != null);
+       },
+
+       'uinteger': function(v)
+       {
+               return (cbi_validators.integer(v) && (v >= 0));
+       },
+
+       'ipaddr': function(v)
+       {
+               return cbi_validators.ip4addr(v) || cbi_validators.ip6addr(v);
+       },
+
+       'ip4addr': function(v)
+       {
+               if( v.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)(\/(\d+))?$/) )
+               {
+                       return (RegExp.$1 >= 0) && (RegExp.$1 <= 255) &&
+                              (RegExp.$2 >= 0) && (RegExp.$2 <= 255) &&
+                              (RegExp.$3 >= 0) && (RegExp.$3 <= 255) &&
+                              (RegExp.$4 >= 0) && (RegExp.$4 <= 255) &&
+                              (!RegExp.$5 || ((RegExp.$6 >= 0) && (RegExp.$6 <= 32)))
+                       ;
+               }
+
+               return false;
+       },
+
+       'ip6addr': function(v)
+       {
+               if( v.match(/^([a-fA-F0-9:.]+)(\/(\d+))?$/) )
+               {
+                       if( !RegExp.$2 || ((RegExp.$3 >= 0) && (RegExp.$3 <= 128)) )
+                       {
+                               var addr = RegExp.$1;
+
+                               if( addr == '::' )
+                               {
+                                       return true;
+                               }
+
+                               if( addr.indexOf('.') > 0 )
+                               {
+                                       var off = addr.lastIndexOf(':');
+
+                                       if( !(off && cbi_validators.ip4addr(addr.substr(off+1))) )
+                                               return false;
+
+                                       addr = addr.substr(0, off) + ':0:0';
+                               }
+
+                               if( addr.indexOf('::') < 0 )
+                               {
+                                       return (addr.match(/^(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}$/) != null);
+                               }
+
+                               var fields = 0;
+
+                               for( var i = 0, last = 0, comp = false; i <= addr.length; i++ )
+                               {
+                                       if( (addr.charAt(i) == ':') || (i == addr.length) )
+                                       {
+                                               if( (i == last) && !comp )
+                                               {
+                                                       comp = true;
+                                               }
+                                               else
+                                               {
+                                                       var f = addr.substring(last, i);
+                                                       if( !(f && f.match(/^[a-fA-F0-9]{1,4}$/)) )
+                                                               return false;
+                                               }
+
+                                               fields++;
+                                               last = i + 1;
+                                       }                               
+                               }
+
+                               return (fields == 8);
+                       }
+               }
+
+               return false;
+       },
+
+       'port': function(v)
+       {
+               return cbi_validators.integer(v) && (v >= 0) && (v <= 65535);
+       },
+
+       'portrange': function(v)
+       {
+               if( v.match(/^(\d+)-(\d+)$/) )
+               {
+                       var p1 = RegExp.$1;
+                       var p2 = RegExp.$2;
+
+                       return cbi_validators.port(p1) &&
+                              cbi_validators.port(p2) &&
+                              (parseInt(p1) <= parseInt(p2))
+                       ;
+               }
+               else
+               {
+                       return cbi_validators.port(v);
+               }
+       },
+
+       'macaddr': function(v)
+       {
+               return (v.match(/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/) != null);
+       },
+
+       'host': function(v)
+       {
+               return cbi_validators.hostname(v) || cbi_validators.ipaddr(v);
+       },
+
+       'hostname': function(v)
+       {
+               return (v.match(/^[a-zA-Z_][a-zA-Z0-9_\-.]*$/) != null);
+       },
+
+       'wpakey': function(v)
+       {
+               if( v.length == 64 )
+                       return (v.match(/^[a-fA-F0-9]{64}$/) != null);
+               else
+                       return (v.length >= 8) && (v.length <= 63);
+       },
+
+       'wepkey': function(v)
+       {
+               if( v.substr(0,2) == 's:' )
+                       v = v.substr(2);
+
+               if( (v.length == 10) || (v.length == 26) )
+                       return (v.match(/^[a-fA-F0-9]{10,26}$/) != null);
+               else
+                       return (v.length == 5) || (v.length == 13);
+       },
+
+};
+
+
 function cbi_d_add(field, dep, next) {
        var obj = document.getElementById(field);
        if (obj) {