From 15687e27652852fa205f9e0d5de245bb9a44a618 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 01 Aug 2014 07:25:56 -0400
Subject: [PATCH] Fixed some errors in user check of apache and nginx plugin.
---
server/lib/classes/system.inc.php | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 3001c64..9bd3e00 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -1824,7 +1824,7 @@
$name_blacklist = array('root','ispconfig','vmail','getmail');
if(in_array($username,$name_blacklist)) return false;
- if(preg_match('/^[\w\.\-]{0,32}$/', $username) == false) return false;
+ if(preg_match('/^[a-zA-Z0-9\.\-]{1,32}$/', $username) == false) return false;
if($check_id && intval($this->getuid($username)) < $this->min_uid) return false;
@@ -1833,18 +1833,18 @@
return true;
}
- public function is_allowed_group($groupname, $restrict_names = false) {
+ public function is_allowed_group($groupname, $check_id = true, $restrict_names = false) {
global $app;
-
+ echo 1;
$name_blacklist = array('root','ispconfig','vmail','getmail');
if(in_array($groupname,$name_blacklist)) return false;
-
- if(preg_match('/^[\w\.\-]{0,32}$/', $groupname) == false) return false;
-
- if(intval($this->getgid($groupname)) < $this->min_gid) return false;
-
+ echo 2;
+ if(preg_match('/^[a-zA-Z0-9\.\-]{1,32}$/', $groupname) == false) return false;
+ echo 3;
+ if($check_id && intval($this->getgid($groupname)) < $this->min_gid) return false;
+ echo 4;
if($restrict_names == true && preg_match('/^client\d+$/', $groupname) == false) return false;
-
+ echo 5;
return true;
}
--
Gitblit v1.9.1