Skip to content

Commit 373e881

Browse files
author
Till Brehm
committed
Fixed: FS#3603 - system.inc.php:1827 is_allowed_user regex typo?
1 parent 746bf0f commit 373e881

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

interface/lib/classes/functions.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ public function is_allowed_user($username, $restrict_names = false) {
430430
$name_blacklist = array('root','ispconfig','vmail','getmail');
431431
if(in_array($username,$name_blacklist)) return false;
432432

433-
if(preg_match('/^[a-zA-Z0-9\.\-]{1,32}$/', $username) == false) return false;
433+
if(preg_match('/^[a-zA-Z0-9\.\-_]{1,32}$/', $username) == false) return false;
434434

435435
if($restrict_names == true && preg_match('/^web\d+$/', $username) == false) return false;
436436

@@ -443,7 +443,7 @@ public function is_allowed_group($groupname, $restrict_names = false) {
443443
$name_blacklist = array('root','ispconfig','vmail','getmail');
444444
if(in_array($groupname,$name_blacklist)) return false;
445445

446-
if(preg_match('/^[a-zA-Z0-9\.\-]{1,32}$/', $groupname) == false) return false;
446+
if(preg_match('/^[a-zA-Z0-9\.\-_]{1,32}$/', $groupname) == false) return false;
447447

448448
if($restrict_names == true && preg_match('/^client\d+$/', $groupname) == false) return false;
449449

server/lib/classes/system.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,7 +1824,7 @@ public function is_allowed_user($username, $check_id = true, $restrict_names = f
18241824
$name_blacklist = array('root','ispconfig','vmail','getmail');
18251825
if(in_array($username,$name_blacklist)) return false;
18261826

1827-
if(preg_match('/^[a-zA-Z0-9\.\-]{1,32}$/', $username) == false) return false;
1827+
if(preg_match('/^[a-zA-Z0-9\.\-_]{1,32}$/', $username) == false) return false;
18281828

18291829
if($check_id && intval($this->getuid($username)) < $this->min_uid) return false;
18301830

@@ -1839,7 +1839,7 @@ public function is_allowed_group($groupname, $check_id = true, $restrict_names =
18391839
$name_blacklist = array('root','ispconfig','vmail','getmail');
18401840
if(in_array($groupname,$name_blacklist)) return false;
18411841

1842-
if(preg_match('/^[a-zA-Z0-9\.\-]{1,32}$/', $groupname) == false) return false;
1842+
if(preg_match('/^[a-zA-Z0-9\.\-_]{1,32}$/', $groupname) == false) return false;
18431843

18441844
if($check_id && intval($this->getgid($groupname)) < $this->min_gid) return false;
18451845

0 commit comments

Comments
 (0)