Changeset 1364

Timestamp:

10/04/08 14:00:18 (2 months ago)

Author:

scitech

Message:

Fixed #1229: On domain creation groupadd / useradd fails when pre-existent accounts are found leaving the domain in error state

Files:

• trunk/configs/centos/ispcp.conf (modified) (1 diff)
• trunk/configs/debian/ispcp.conf (modified) (1 diff)
• trunk/configs/fedora/ispcp.conf (modified) (1 diff)
• trunk/configs/freebsd/ispcp.conf (modified) (1 diff)
• trunk/configs/gentoo/ispcp.conf (modified) (1 diff)
• trunk/configs/openbsd/ispcp.conf (modified) (1 diff)
• trunk/configs/opensuse/ispcp.conf (modified) (1 diff)
• trunk/configs/redhat/ispcp.conf (modified) (1 diff)
• trunk/configs/ubuntu/ispcp.conf (modified) (1 diff)
• trunk/docs/CentOS/INSTALL (modified) (1 diff)
• trunk/engine/ispcp_common_methods.pl (modified) (3 diffs)

trunk/configs/centos/ispcp.conf

@@ -216 +216 @@
-APACHE_SUEXEC_MIN_GID = 2000
-
+APACHE_SUEXEC_MAX_GID = 29999
+
-APACHE_SUEXEC_MIN_UID = 2000
+
+APACHE_SUEXEC_MAX_UID = 29999
-
-APACHE_USER = apache

trunk/configs/debian/ispcp.conf

@@ -216 +216 @@
-APACHE_SUEXEC_MIN_GID = 2000
-
+APACHE_SUEXEC_MAX_GID = 29999
+
-APACHE_SUEXEC_MIN_UID = 2000
+
+APACHE_SUEXEC_MAX_UID = 29999
-
-APACHE_USER = www-data

trunk/configs/fedora/ispcp.conf

@@ -216 +216 @@
-APACHE_SUEXEC_MIN_GID = 2000
-
+APACHE_SUEXEC_MAX_GID = 29999
+
-APACHE_SUEXEC_MIN_UID = 2000
+
+APACHE_SUEXEC_MAX_UID = 29999
-
-APACHE_USER = apache

trunk/configs/freebsd/ispcp.conf

@@ -216 +216 @@
-APACHE_SUEXEC_MIN_GID = 2000
-
+APACHE_SUEXEC_MAX_GID = 29999
+
-APACHE_SUEXEC_MIN_UID = 2000
+
+APACHE_SUEXEC_MAX_UID = 29999
-
-APACHE_USER = www

trunk/configs/gentoo/ispcp.conf

@@ -216 +216 @@
-APACHE_SUEXEC_MIN_GID = 10000
-
+APACHE_SUEXEC_MAX_GID = 29999
+
-APACHE_SUEXEC_MIN_UID = 10000
+
+APACHE_SUEXEC_MAX_UID = 29999
-
-APACHE_USER = apache

trunk/configs/openbsd/ispcp.conf

@@ -216 +216 @@
-APACHE_SUEXEC_MIN_GID = 2000
-
+APACHE_SUEXEC_MAX_GID = 29999
+
-APACHE_SUEXEC_MIN_UID = 2000
+
+APACHE_SUEXEC_MAX_UID = 29999
-
-APACHE_USER = www-data

trunk/configs/opensuse/ispcp.conf

@@ -216 +216 @@
-APACHE_SUEXEC_MIN_GID = 2000
-
+APACHE_SUEXEC_MAX_GID = 29999
+
-APACHE_SUEXEC_MIN_UID = 2000
+
+APACHE_SUEXEC_MAX_UID = 29999
-
-APACHE_USER = wwwrun

trunk/configs/redhat/ispcp.conf

@@ -216 +216 @@
-APACHE_SUEXEC_MIN_GID = 2000
-
+APACHE_SUEXEC_MAX_GID = 29999
+
-APACHE_SUEXEC_MIN_UID = 2000
+
+APACHE_SUEXEC_MAX_UID = 29999
-
-APACHE_USER = apache

trunk/configs/ubuntu/ispcp.conf

@@ -216 +216 @@
-APACHE_SUEXEC_MIN_GID = 2000
-
+APACHE_SUEXEC_MAX_GID = 29999
+
-APACHE_SUEXEC_MIN_UID = 2000
+
+APACHE_SUEXEC_MAX_UID = 29999
-
-APACHE_USER = www-data

trunk/docs/CentOS/INSTALL

@@ -33 +33 @@
-Debian (or even any other *NIX-Distribution)
-
-fedora-packages
+CentOS
-
-================================================================================

trunk/engine/ispcp_common_methods.pl

@@ -2041 +2041 @@
-}
-
+sub check_uid_gid_available {
+
+    my ($sys_uid, $sys_gid) = @_;
+
+    push_el(\@main::el, 'check_uid_gid_available()', 'Starting...');
+
+    my $name = undef;
+
+    my $max_uid = $main::cfg{'APACHE_SUEXEC_MAX_UID'};
+
+    my $max_gid = $main::cfg{'APACHE_SUEXEC_MAX_GID'};
+
+    if($sys_uid > $max_uid){
+        push_el(\@main::el, 'check_uid_gid_available()', "ERROR: Maximum user id for this system is reached!");
+        return (2, $sys_uid, $sys_gid);
+    }
+
+    if($sys_gid > $max_gid){
+        push_el(\@main::el, 'check_uid_gid_available()', "ERROR: Maximum group id for this system is reached!");
+        return (2, $sys_uid, $sys_gid);
+    }
+
+    $name = getgrgid($sys_gid);
+
+    if( defined($name) ) {
+        push_el(\@main::el, 'check_uid_gid_available()', "INFO: Group id $sys_gid already in use!");
+        return (1, $sys_uid, $sys_gid);
+    }
+
+    $name = getpwuid($sys_uid);
+
+    if ( defined($name) ) {
+        push_el(\@main::el, 'check_uid_gid_available()', "INFO: User id $sys_uid already in use!");
+        return (1, $sys_uid, $sys_gid);
+    }
+
+    push_el(\@main::el, 'check_uid_gid_available()', 'Ending...');
+
+    return (0, $sys_uid, $sys_gid);
+
+}
+
-sub add_dmn_suexec_user {
-
@@ -2055 +2097 @@
-    my ($rs, $rdata, $sql) = (undef, undef, undef);
-
+    my ($num, $sys_uid, $sys_gid) = (undef, undef, undef);
+
-    if ($dmn_uid == 0 && $dmn_gid == 0) {
-
-
-
+
+
+
+
+
+
+
+
-
-            my $suexec_user_pref = $main::cfg{'APACHE_SUEXEC_USER_PREF'};
@@ -2065 +2114 @@
-                my $cmd = undef;
-
-       
+
-                # BSD/NUX Command
-                if ($main::cfg{'ROOT_GROUP'} eq "wheel") {