Skip to content
GitLab
Commit 91bb6126 authored by Till Brehm's avatar Till Brehm
Browse files

Fixed: FS#3336 - Underscore shouln't be possible in DNS entries!

parent 018955be
Hide whitespace changes
Inline Side-by-side
interface/web/dns/form/dns_a.tform.php
View file @ 91bb6126
......@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\a-zA-Z0-9\.\-\*]{0,64}$/',
'regex' => '/^[a-zA-Z0-9\.\-\*]{0,64}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_aaaa.tform.php
View file @ 91bb6126
......@@ -79,7 +79,7 @@ $form["tabs"]['dns'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-\*]{0,64}$/',
'regex' => '/^[a-zA-Z0-9\.\-\*]{0,64}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_alias.tform.php
View file @ 91bb6126
......@@ -88,7 +88,7 @@ $form["tabs"]['dns'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'name_error_empty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{1,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......@@ -117,7 +117,7 @@ $form["tabs"]['dns'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{1,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
'errmsg'=> 'data_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_cname.tform.php
View file @ 91bb6126
......@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-\*]{0,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-\*]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......@@ -115,7 +115,7 @@ $form["tabs"]['dns'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{1,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
'errmsg'=> 'data_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_hinfo.tform.php
View file @ 91bb6126
......@@ -88,7 +88,7 @@ $form["tabs"]['dns'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'name_error_empty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{1,64}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{1,64}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_mx.tform.php
View file @ 91bb6126
......@@ -87,7 +87,7 @@ $form["tabs"]['dns'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-\*]{0,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......@@ -116,7 +116,7 @@ $form["tabs"]['dns'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{1,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
'errmsg'=> 'data_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_ns.tform.php
View file @ 91bb6126
......@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{0,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......@@ -115,7 +115,7 @@ $form["tabs"]['dns'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{1,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
'errmsg'=> 'data_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_ptr.tform.php
View file @ 91bb6126
......@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{1,256}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{1,256}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......@@ -115,7 +115,7 @@ $form["tabs"]['dns'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'data_error_empty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{1,256}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{1,256}$/',
'errmsg'=> 'data_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_rp.tform.php
View file @ 91bb6126
......@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{0,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_slave.tform.php
View file @ 91bb6126
......@@ -96,7 +96,7 @@ $form["tabs"]['dns_slave'] = array (
'errmsg'=> 'origin_error_unique'),
*/
1 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
'regex' => '/^[a-zA-Z0-9\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
'errmsg'=> 'origin_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_soa.tform.php
View file @ 91bb6126
......@@ -95,7 +95,7 @@ $form["tabs"]['dns_soa'] = array (
1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'origin_error_unique'),
2 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/',
'regex' => '/^[a-zA-Z0-9\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/',
'errmsg'=> 'origin_error_regex'),
),
'default' => '',
......@@ -115,7 +115,7 @@ $form["tabs"]['dns_soa'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{1,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
'errmsg'=> 'ns_error_regex'),
),
'default' => '',
......@@ -137,7 +137,7 @@ $form["tabs"]['dns_soa'] = array (
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'mbox_error_empty'),
1 => array ( 'type' => 'REGEX',
'regex' => '/^[[a-zA-Z0-9\.\-\_]{0,255}\.$/',
'regex' => '/^[a-zA-Z0-9\.\-\_]{0,255}\.$/',
'errmsg'=> 'mbox_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_srv.tform.php
View file @ 91bb6126
......@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{0,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......
interface/web/dns/form/dns_txt.tform.php
View file @ 91bb6126
......@@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array (
'type' => 'TOLOWER')
),
'validators' => array ( 0 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-]{0,255}$/',
'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
'errmsg'=> 'name_error_regex'),
),
'default' => '',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment