Ticket #2440: security-2440.patch

engine/ispcp-dmn-mngr

@@ -1860 +1860 @@
 
         $rs = make_dir(
                 "$www_dir/$dmn_name/backups",
-                $sys_user,
-                $httpd_gid,
-                0770
+                0,
+                0,
+                0555
         );
         return $rs if ($rs != 0);
 
@@ -2233 +2233 @@
         }
 
         if(! -d "$www_dir/$dmn_name/backups") {
-                $rs = make_dir("$www_dir/$dmn_name/backups", $sys_user, $httpd_gid, 0770);
+                $rs = make_dir("$www_dir/$dmn_name/backups", 0, 0, 0555);
                 return $rs if ($rs != 0);
         }
 

engine/backup/ispcp-backup-all

@@ -177 +177 @@
                         return $rs;
                 }
 
-                $rs = setfmode("$db_backup_file", $domain_uid, $domain_gid, 0660);
+                $rs = setfmode("$db_backup_file", 0, 0, 0444);
                 if( $rs != 0 ){
-                        push_el(\@main::el, 'backup_sql()', "Domain $dmn_name: ERROR: Can not chmod 0660 uid: $domain_uid gid: $domain_gid file $db_backup_file!");
-                        send_error_mail('backup_sql()', "Domain $dmn_name: ERROR: Can not chmod 0660 uid: $domain_uid gid: $domain_gid file $db_backup_file!");
+                        push_el(\@main::el, 'backup_sql()', "Domain $dmn_name: ERROR: Can not chmod 0444 uid: 0 gid: 0 file $db_backup_file!");
+                        send_error_mail('backup_sql()', "Domain $dmn_name: ERROR: Can not chmod 0444 uid: 0 gid: 0 file $db_backup_file!");
                         unlink($db_backup_file);
                         return $rs;
                 }
@@ -260 +260 @@
                         #
 
                         if (! -d $dmn_backup_dir) {
-                                $rs = make_dir($dmn_backup_dir, $domain_uid, $domain_gid, 0770);
+                                $rs = make_dir($dmn_backup_dir, 0, 0, 0555);
                                 return $rs if ($rs != 0);
                         }
 
+                        #todo test mode and adjust only if necessary
+                        $rs = setfmode($dmn_backup_dir, 0, 0, 0555);
+                        if ($rs != 0) {
+                                push_el(\@main::el, 'backup_all_engine()', "Domain $dmn_name: Error while changing mode to 0555 uid: 0: 0 for $dmn_backup_dir!");
+                                send_error_mail('backup_all_engine()', "Domain $dmn_name: Error while changing mode to 0555 uid: 0 gid: 0 for $dmn_backup_dir!");
+                        }
+
                         if( $zip eq 'bzip2' || $zip eq 'gzip' || $zip eq 'lzma' || $zip eq 'xz') {
                                 $backup_filename = "$dmn_name-backup-$date.tar.".($zip eq 'bzip2' ? 'bz2' : ($zip eq 'gzip' ? 'gz' : $zip));
                                 if ($allowbackup eq "full" || $allowbackup eq "dmn") {
@@ -300 +307 @@
                                                 send_error_mail('backup_all_engine()', "Domain $dmn_name: Error while executing $cmd_mv -f $www_dir/$backup_filename $dmn_backup_dir!");
                                         }
 
-                                        $rs = setfmode("$dmn_backup_dir/$backup_filename", $domain_uid, $domain_gid, 0660);
+                                        $rs = setfmode("$dmn_backup_dir/$backup_filename", 0, 0, 0444);
                                         if ($rs != 0){
-                                                push_el(\@main::el, 'backup_all_engine()', "Domain $dmn_name: Error while changing mode to 0660 uid: $domain_uid gid: $domain_gid for $dmn_backup_dir/$backup_filename!");
-                                                send_error_mail('backup_all_engine()', "Domain $dmn_name: Error while changing mode to 0660 uid: $domain_uid gid: $domain_gid for $dmn_backup_dir/$backup_filename!");
+                                                push_el(\@main::el, 'backup_all_engine()', "Domain $dmn_name: Error while changing mode to 0444 uid: 0 gid: 0 for $dmn_backup_dir/$backup_filename!");
+                                                send_error_mail('backup_all_engine()', "Domain $dmn_name: Error while changing mode to 0444 uid: 0 gid: 0 for $dmn_backup_dir/$backup_filename!");
                                         }
 
                                 } else { # some error occurred