Skip to content

Commit 91bb612

Browse files
author
Till Brehm
committed
Fixed: FS#3336 - Underscore shouln't be possible in DNS entries!
1 parent 018955b commit 91bb612

13 files changed

+20
-20
lines changed

‎interface/web/dns/form/dns_a.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
'type' => 'TOLOWER')
8787
),
8888
'validators' => array ( 0 => array ( 'type' => 'REGEX',
89-
'regex' => '/^[\a-zA-Z0-9\.\-\*]{0,64}$/',
89+
'regex' => '/^[a-zA-Z0-9\.\-\*]{0,64}$/',
9090
'errmsg'=> 'name_error_regex'),
9191
),
9292
'default' => '',

‎interface/web/dns/form/dns_aaaa.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
'datatype' => 'VARCHAR',
8080
'formtype' => 'TEXT',
8181
'validators' => array ( 0 => array ( 'type' => 'REGEX',
82-
'regex' => '/^[\w\.\-\*]{0,64}$/',
82+
'regex' => '/^[a-zA-Z0-9\.\-\*]{0,64}$/',
8383
'errmsg'=> 'name_error_regex'),
8484
),
8585
'default' => '',

‎interface/web/dns/form/dns_alias.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
8989
'errmsg'=> 'name_error_empty'),
9090
1 => array ( 'type' => 'REGEX',
91-
'regex' => '/^[\w\.\-]{1,255}$/',
91+
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
9292
'errmsg'=> 'name_error_regex'),
9393
),
9494
'default' => '',
@@ -117,7 +117,7 @@
117117
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
118118
'errmsg'=> 'data_error_empty'),
119119
1 => array ( 'type' => 'REGEX',
120-
'regex' => '/^[\w\.\-]{1,255}$/',
120+
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
121121
'errmsg'=> 'data_error_regex'),
122122
),
123123
'default' => '',

‎interface/web/dns/form/dns_cname.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
'type' => 'TOLOWER')
8787
),
8888
'validators' => array ( 0 => array ( 'type' => 'REGEX',
89-
'regex' => '/^[\w\.\-\*]{0,255}$/',
89+
'regex' => '/^[a-zA-Z0-9\.\-\*]{0,255}$/',
9090
'errmsg'=> 'name_error_regex'),
9191
),
9292
'default' => '',
@@ -115,7 +115,7 @@
115115
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
116116
'errmsg'=> 'data_error_empty'),
117117
1 => array ( 'type' => 'REGEX',
118-
'regex' => '/^[\w\.\-]{1,255}$/',
118+
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
119119
'errmsg'=> 'data_error_regex'),
120120
),
121121
'default' => '',

‎interface/web/dns/form/dns_hinfo.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
8989
'errmsg'=> 'name_error_empty'),
9090
1 => array ( 'type' => 'REGEX',
91-
'regex' => '/^[\w\.\-]{1,64}$/',
91+
'regex' => '/^[a-zA-Z0-9\.\-]{1,64}$/',
9292
'errmsg'=> 'name_error_regex'),
9393
),
9494
'default' => '',

‎interface/web/dns/form/dns_mx.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
'type' => 'TOLOWER')
8888
),
8989
'validators' => array ( 0 => array ( 'type' => 'REGEX',
90-
'regex' => '/^[\w\.\-\*]{0,255}$/',
90+
'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
9191
'errmsg'=> 'name_error_regex'),
9292
),
9393
'default' => '',
@@ -116,7 +116,7 @@
116116
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
117117
'errmsg'=> 'data_error_empty'),
118118
1 => array ( 'type' => 'REGEX',
119-
'regex' => '/^[\w\.\-]{1,255}$/',
119+
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
120120
'errmsg'=> 'data_error_regex'),
121121
),
122122
'default' => '',

‎interface/web/dns/form/dns_ns.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
'type' => 'TOLOWER')
8787
),
8888
'validators' => array ( 0 => array ( 'type' => 'REGEX',
89-
'regex' => '/^[\w\.\-]{0,255}$/',
89+
'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
9090
'errmsg'=> 'name_error_regex'),
9191
),
9292
'default' => '',
@@ -115,7 +115,7 @@
115115
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
116116
'errmsg'=> 'data_error_empty'),
117117
1 => array ( 'type' => 'REGEX',
118-
'regex' => '/^[\w\.\-]{1,255}$/',
118+
'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
119119
'errmsg'=> 'data_error_regex'),
120120
),
121121
'default' => '',

‎interface/web/dns/form/dns_ptr.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
'type' => 'TOLOWER')
8787
),
8888
'validators' => array ( 0 => array ( 'type' => 'REGEX',
89-
'regex' => '/^[\w\.\-]{1,256}$/',
89+
'regex' => '/^[a-zA-Z0-9\.\-]{1,256}$/',
9090
'errmsg'=> 'name_error_regex'),
9191
),
9292
'default' => '',
@@ -115,7 +115,7 @@
115115
'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
116116
'errmsg'=> 'data_error_empty'),
117117
1 => array ( 'type' => 'REGEX',
118-
'regex' => '/^[\w\.\-]{1,256}$/',
118+
'regex' => '/^[a-zA-Z0-9\.\-]{1,256}$/',
119119
'errmsg'=> 'data_error_regex'),
120120
),
121121
'default' => '',

‎interface/web/dns/form/dns_rp.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
'type' => 'TOLOWER')
8787
),
8888
'validators' => array ( 0 => array ( 'type' => 'REGEX',
89-
'regex' => '/^[\w\.\-]{0,255}$/',
89+
'regex' => '/^[a-zA-Z0-9\.\-]{0,255}$/',
9090
'errmsg'=> 'name_error_regex'),
9191
),
9292
'default' => '',

‎interface/web/dns/form/dns_slave.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
'errmsg'=> 'origin_error_unique'),
9797
*/
9898
1 => array ( 'type' => 'REGEX',
99-
'regex' => '/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
99+
'regex' => '/^[a-zA-Z0-9\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,10}[\.]{0,1}$/',
100100
'errmsg'=> 'origin_error_regex'),
101101
),
102102
'default' => '',

0 commit comments

Comments
 (0)