Fixed various opensuse related bugs.

tbrehm

2009-03-18 f86f62fedb5517bf98790d2a902c162df30e08af

 server/plugins-available/apache2_plugin.inc.php

@@ -204,7 +204,7 @@
         $new_parent_domain_id = intval($data["new"]["parent_domain_id"]);

         

         // If the parent_domain_id has been chenged, we will have to update the old site as well.

         if($data["new"]["parent_domain_id"] != $data["old"]["parent_domain_id"]) {

         if($this->action == 'update' && $data["new"]["parent_domain_id"] != $data["old"]["parent_domain_id"]) {

            $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$old_parent_domain_id." AND active = 'y'");

            $data["new"] = $tmp;

            $data["old"] = $tmp;

@@ -219,7 +219,6 @@
         $this->action = 'update';

      }

      

		
      // load the server configuration options

      $app->uses("getconf");

      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');

@@ -231,6 +230,53 @@
      if($data["new"]["system_user"] == 'root' or $data["new"]["system_group"] == 'root') {

         $app->log("Websites can not be owned by the root user or group.",LOGLEVEL_WARN);

         return 0;

      }

		
      //* If the client of the site has been changed, we have a change of the document root

      if($this->action == 'update' && $data["new"]["document_root"] != $data["old"]["document_root"]) {

			
         //* Get the old client ID

         $old_client = $app->dbmaster->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["old"]["sys_groupid"]));

         $old_client_id = intval($old_client["client_id"]);

         unset($old_client);

			
         //* Remove the old symlinks

         $tmp_symlinks_array = explode(':',$web_config["website_symlinks"]);

         if(is_array($tmp_symlinks_array)) {

            foreach($tmp_symlinks_array as $tmp_symlink) {

               $tmp_symlink = str_replace("[client_id]",$old_client_id,$tmp_symlink);

               $tmp_symlink = str_replace("[website_domain]",$data["old"]["domain"],$tmp_symlink);

               // Remove trailing slash

               if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);

               // create the symlinks, if not exist

               if(!is_link($tmp_symlink)) {

                  exec("rm -f ".escapeshellcmd($tmp_symlink));

                  $app->log("Removed Symlink: rm -f ".$tmp_symlink,LOGLEVEL_DEBUG);

               }

            }

         }

			
         //* Move the site data

         $tmp_docroot = explode('/',$data["new"]["document_root"]);

         unset($tmp_docroot[count($tmp_docroot)-1]);

         $new_dir = implode('/',$tmp_docroot);

			
         $tmp_docroot = explode('/',$data["old"]["document_root"]);

         unset($tmp_docroot[count($tmp_docroot)-1]);

         $old_dir = implode('/',$tmp_docroot);

			
         exec('rm -rf '.$data["new"]["document_root"]);

         if(!is_dir($new_dir)) exec('mkdir -p '.$new_dir);

         exec('mv '.$data["old"]["document_root"].' '.$new_dir);

         $app->log("Moving site to new document root: ".'mv '.$data["old"]["document_root"].' '.$new_dir,LOGLEVEL_DEBUG);

			
         //* Change the home directory and group of the website user

         $command = 'usermod';

         $command .= ' --home '.escapeshellcmd($data["new"]["document_root"]);

         $command .= ' --gid '.escapeshellcmd($data['new']['system_group']);

         $command .= ' '.escapeshellcmd($data["new"]["system_user"]);

         exec($command);

			
      }

      

      //print_r($data);

@@ -272,7 +318,7 @@
      */

   

      // Get the client ID

      $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["new"]["sys_groupid"]));

      $client = $app->dbmaster->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["new"]["sys_groupid"]));

      $client_id = intval($client["client_id"]);

      unset($client);

      

@@ -285,8 +331,8 @@
               $tmp_symlink = str_replace("[website_domain]",$data["old"]["domain"],$tmp_symlink);

               // Remove trailing slash

               if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);

               // create the symlinks, if not exist

               if(!is_link($tmp_symlink)) {

               // remove the symlinks, if not exist

               if(is_link($tmp_symlink)) {

                  exec("rm -f ".escapeshellcmd($tmp_symlink));

                  $app->log("Removed Symlink: rm -f ".$tmp_symlink,LOGLEVEL_DEBUG);

               }

@@ -323,7 +369,7 @@
               exec("cp /usr/local/ispconfig/server/conf-custom/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);

            }

            else {

               if (file_exists("/usr/local/ispconfig/server/conf-custom/error/fileNotFound.html")){

               if (file_exists("/usr/local/ispconfig/server/conf-custom/error/400.html")){

                  exec("cp /usr/local/ispconfig/server/conf-custom/error/*.html ".$error_page_path);

               }

               else {

@@ -334,12 +380,12 @@
         }



         // copy the standard index page

         if (file_exists("/usr/local/ispconfig/server/conf-custom/index/".substr(escapeshellcmd($conf["language"]),0,2)."/index.html")){

            exec("cp /usr/local/ispconfig/server/conf-custom/index/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".escapeshellcmd($data["new"]["document_root"])."/web/");

         if (file_exists("/usr/local/ispconfig/server/conf-custom/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2))){

            exec("cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");

         }

         else {

            if (file_exists("/usr/local/ispconfig/server/conf-custom/index/default/index.html")){

               exec("cp /usr/local/ispconfig/server/conf-custom/index/default/* ".escapeshellcmd($data["new"]["document_root"])."/web/");

            if (file_exists("/usr/local/ispconfig/server/conf-custom/index/standard_index.html")){

               exec("cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");

            }

            else {

               exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");

@@ -379,9 +425,13 @@
      }

      

      

      if($this->action == 'insert') {

         // Chown and chmod the directories below the document root

         exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));

      

      // Chown and chmod the directories

      exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));

         // The document root itself has to be owned by root

         exec("chown root:root ".escapeshellcmd($data["new"]["document_root"]));

      }

      

      // make temp direcory writable for the apache user and the website user

      exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));

@@ -395,7 +445,8 @@
      

      $vhost_data = $data["new"];

      $vhost_data["web_document_root"] = $data["new"]["document_root"]."/web";

      $vhost_data["web_document_root_www"] = "/var/www/".$data["new"]["domain"]."/web";

      $vhost_data["web_document_root_www"] = $web_config["website_basedir"]."/".$data["new"]["domain"]."/web";

      $vhost_data["web_basedir"] = $web_config["website_basedir"];

      

      // Check if a SSL cert exists

      $ssl_dir = $data["new"]["document_root"]."/ssl";

@@ -421,19 +472,20 @@
      $rewrite_rules = array();

      if($data["new"]["redirect_type"] != '') {

         $rewrite_rules[] = array(   'rewrite_domain'    => $data["new"]["domain"],

                              'rewrite_type'       => $data["new"]["redirect_type"],

                              'rewrite_type'       => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',

                              'rewrite_target'    => $data["new"]["redirect_path"]);

            

            switch($data["new"]["subdomain"]) {

            case 'www':

             $rewrite_rules[] = array(   'rewrite_domain'    => 'www.'.$data["new"]["domain"],

                                  'rewrite_type'       => $data["new"]["redirect_type"],

                                  'rewrite_type'       => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',

                                  'rewrite_target'    => $data["new"]["redirect_path"]);

                break;

            case '*':

             $rewrite_rules[] = array(   'rewrite_domain'    => '*'.$data["new"]["domain"],

                                  'rewrite_type'       => $data["new"]["redirect_type"],

                                  'rewrite_target'    => $data["new"]["redirect_path"]);

                // TODO

             //$rewrite_rules[] = array(   'rewrite_domain'    => '*'.$alias["domain"],

             //                     'rewrite_type'       => $alias["redirect_type"],

             //                     'rewrite_target'    => $alias["redirect_path"]);

                break;

            }

      }

@@ -465,18 +517,19 @@
            // Rewriting

            if($alias["redirect_type"] != '') {

               $rewrite_rules[] = array(   'rewrite_domain'    => $alias["domain"],

                                    'rewrite_type'       => $alias["redirect_type"],

                                    'rewrite_type'       => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',

                                    'rewrite_target'    => $alias["redirect_path"]);

                    switch($alias["subdomain"]) {

                    case 'www':

                     $rewrite_rules[] = array(   'rewrite_domain'    => 'www.'.$alias["domain"],

                                          'rewrite_type'       => $alias["redirect_type"],

                                          'rewrite_type'       => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',

                                          'rewrite_target'    => $alias["redirect_path"]);

                        break;

                    case '*':

                     $rewrite_rules[] = array(   'rewrite_domain'    => '*'.$alias["domain"],

                                          'rewrite_type'       => $alias["redirect_type"],

                                          'rewrite_target'    => $alias["redirect_path"]);

                        // TODO

                     //$rewrite_rules[] = array(   'rewrite_domain'    => '*'.$alias["domain"],

                     //                     'rewrite_type'       => $alias["redirect_type"],

                     //                     'rewrite_target'    => $alias["redirect_path"]);

                        break;

                    }

            }

@@ -538,6 +591,56 @@
         

      }

      

      /**

       * install cgi starter script and add script alias to config.

       * This is needed to allow cgi with suexec (to do so, we need a bin in the document-path!)

       * first we create the script directory if not already created, then copy over the starter script.

       * TODO: we have to fetch the data from the server-settings.

       */



      if ($data["new"]["php"] == "cgi")

      {

         //$cgi_config = $app->getconf->get_server_config($conf["server_id"], 'cgi');



         $cgi_config["cgi_starter_path"] = $web_config["website_basedir"]."/php-cgi-scripts/[system_user]/";

         $cgi_config["cgi_starter_script"] = "php-cgi-starter";

         $cgi_config["cgi_bin"] = "/usr/bin/php-cgi";



         $cgi_starter_path = str_replace("[system_user]",$data["new"]["system_user"],$cgi_config["cgi_starter_path"]);

         $cgi_starter_path = str_replace("[client_id]",$client_id,$cgi_starter_path);



         if (!is_dir($cgi_starter_path))

         {

            exec("mkdir -p ".escapeshellcmd($cgi_starter_path));

            exec("chown ".$data["new"]["system_user"].":".$data["new"]["system_group"]." ".escapeshellcmd($cgi_starter_path));



            $app->log("Creating cgi starter script directory: $cgi_starter_path",LOGLEVEL_DEBUG);

         }



         $cgi_tpl = new tpl();

         $cgi_tpl->newTemplate("php-cgi-starter.master");



         // This works, because php "rewrites" a symlink to the physical path

         $cgi_tpl->setVar('open_basedir', $data["new"]["document_root"]); 
         // This will NOT work!

         //$cgi_tpl->setVar('open_basedir', "/var/www/" . $data["new"]["domain"]);

         $cgi_tpl->setVar('php_cgi_bin',$cgi_config["cgi_bin"]);



         $cgi_starter_script = escapeshellcmd($cgi_starter_path.$cgi_config["cgi_starter_script"]);

         file_put_contents($cgi_starter_script,$cgi_tpl->grab());

         unset($cgi_tpl);



         $app->log("Creating cgi starter script: $cgi_starter_script",LOGLEVEL_DEBUG);





         exec("chmod 755 $cgi_starter_script");

         exec("chown ".$data["new"]["system_user"].":".$data["new"]["system_group"]." $cgi_starter_script");



         $tpl->setVar('cgi_starter_path',$cgi_starter_path);

         $tpl->setVar('cgi_starter_script',$cgi_config["cgi_starter_script"]);



      }



      $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["new"]["domain"].'.vhost');

      file_put_contents($vhost_file,$tpl->grab());

      $app->log("Writing the vhost file: $vhost_file",LOGLEVEL_DEBUG);

@@ -566,6 +669,26 @@
         $app->log("Removing File $vhost_file",LOGLEVEL_DEBUG);

      }

      

      //* Create .htaccess and .htpasswd file for website statistics

      if(!is_file($data["new"]["document_root"].'/web/stats/.htaccess')) {

         if(!is_dir($data["new"]["document_root"].'/web/stats')) mkdir($data["new"]["document_root"].'/web/stats');

         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data["new"]["document_root"]."/.htpasswd_stats\n<limit GET PUT POST>\nrequire valid-user\n</limit>";

         file_put_contents($data["new"]["document_root"].'/web/stats/.htaccess',$ht_file);

         chmod($data["new"]["document_root"].'/web/stats/.htaccess',0664);

         unset($ht_file);

      }

		
      if(!is_file($data["new"]["document_root"].'/.htpasswd_stats') || $data["new"]["stats_password"] != $data["old"]["stats_password"]) {

         if(trim($data["new"]["stats_password"]) != '') {

            $htp_file = 'admin:'.trim($data["new"]["stats_password"]);

            file_put_contents($data["new"]["document_root"].'/.htpasswd_stats',$htp_file);

            chmod($data["new"]["document_root"].'/.htpasswd_stats',0664);

            unset($htp_file);

         }

      }

		
		
		
      // request a httpd reload when all records have been processed

      $app->services->restartServiceDelayed('httpd','reload');

      

@@ -578,69 +701,111 @@
      $app->uses("getconf");

      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');

      

      // Deleting the vhost file, symlink and the data directory

      $vhost_symlink = escapeshellcmd($web_config["vhost_conf_enabled_dir"].'/'.$data["old"]["domain"].'.vhost');

      unlink($vhost_symlink);

      $app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);

      

      $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["old"]["domain"].'.vhost');

      unlink($vhost_file);

      $app->log("Removing vhost file: $vhost_file",LOGLEVEL_DEBUG);

      if($data["old"]["type"] != "vhost" && $data["old"]["parent_domain_id"] > 0) {

         //* This is a alias domain or subdomain, so we have to update the website instead

         $parent_domain_id = intval($data["old"]["parent_domain_id"]);

         $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$parent_domain_id." AND active = 'y'");

         $data["new"] = $tmp;

         $data["old"] = $tmp;

         $this->action = 'update';

         // just run the update function

         $this->update($event_name,$data);

			
      } else {

         //* This is a website

         // Deleting the vhost file, symlink and the data directory

         $vhost_symlink = escapeshellcmd($web_config["vhost_conf_enabled_dir"].'/'.$data["old"]["domain"].'.vhost');

         unlink($vhost_symlink);

         $app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);

      

      $docroot = escapeshellcmd($data["old"]["document_root"]);

      if($docroot != '' && !stristr($docroot,'..')) exec("rm -rf $docroot");

         $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["old"]["domain"].'.vhost');

         unlink($vhost_file);

         $app->log("Removing vhost file: $vhost_file",LOGLEVEL_DEBUG);

		
         $docroot = escapeshellcmd($data["old"]["document_root"]);

         if($docroot != '' && !stristr($docroot,'..')) exec("rm -rf $docroot");

      

      

      //remove the php fastgi starter script if available

      if ($data["old"]["php"] == "fast-cgi")

      {

         $fastcgi_starter_path = str_replace("[system_user]",$data["old"]["system_user"],$web_config["fastcgi_starter_path"]);

         if (is_dir($fastcgi_starter_path))

         //remove the php fastgi starter script if available

         if ($data["old"]["php"] == "fast-cgi")

         {

            $fastcgi_starter_path = str_replace("[system_user]",$data["old"]["system_user"],$web_config["fastcgi_starter_path"]);

            if (is_dir($fastcgi_starter_path))

            {

               exec("rm -rf $fastcgi_starter_path");

         }

      }

		
      $app->log("Removing website: $docroot",LOGLEVEL_DEBUG);

		
      // Delete the symlinks for the sites

      $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["old"]["sys_groupid"]));

      $client_id = intval($client["client_id"]);

      unset($client);

      $tmp_symlinks_array = explode(':',$web_config["website_symlinks"]);

      if(is_array($tmp_symlinks_array)) {

         foreach($tmp_symlinks_array as $tmp_symlink) {

            $tmp_symlink = str_replace("[client_id]",$client_id,$tmp_symlink);

            $tmp_symlink = str_replace("[website_domain]",$data["old"]["domain"],$tmp_symlink);

            // Remove trailing slash

            if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);

            // create the symlinks, if not exist

            if(is_link($tmp_symlink)) {

               unlink($tmp_symlink);

               $app->log("Removing symlink: ".$tmp_symlink,LOGLEVEL_DEBUG);

            }

         }

		
         //remove the php cgi starter script if available

         if ($data["old"]["php"] == "cgi")

         {

            // TODO: fetch the date from the server-settings

            $web_config["cgi_starter_path"] = $web_config["website_basedir"]."/php-cgi-scripts/[system_user]/";



            $cgi_starter_path = str_replace("[system_user]",$data["old"]["system_user"],$web_config["cgi_starter_path"]);

            if (is_dir($cgi_starter_path))

            {

               exec("rm -rf $cgi_starter_path");

            }

         }



         $app->log("Removing website: $docroot",LOGLEVEL_DEBUG);

		
         // Delete the symlinks for the sites

         $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["old"]["sys_groupid"]));

         $client_id = intval($client["client_id"]);

         unset($client);

         $tmp_symlinks_array = explode(':',$web_config["website_symlinks"]);

         if(is_array($tmp_symlinks_array)) {

            foreach($tmp_symlinks_array as $tmp_symlink) {

               $tmp_symlink = str_replace("[client_id]",$client_id,$tmp_symlink);

               $tmp_symlink = str_replace("[website_domain]",$data["old"]["domain"],$tmp_symlink);

               // Remove trailing slash

               if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);

               // create the symlinks, if not exist

               if(is_link($tmp_symlink)) {

                  unlink($tmp_symlink);

                  $app->log("Removing symlink: ".$tmp_symlink,LOGLEVEL_DEBUG);

               }

            }

         }

         // end removing symlinks

		
         // Delete the log file directory

         $vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/httpd/'.$data["old"]["domain"]);

         if($data["old"]["domain"] != '' && !stristr($vhost_logfile_dir,'..')) exec("rm -rf $vhost_logfile_dir");

         $app->log("Removing website logfile directory: $vhost_logfile_dir",LOGLEVEL_DEBUG);

		
         //delete the web user

         $command = 'userdel';

         $command .= ' '.$data["old"]["system_user"];			
         exec($command);

      }

      // end removing symlinks

		
      // Delete the log file directory

      $vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/httpd/'.$data["old"]["domain"]);

      if($data["old"]["domain"] != '' && !stristr($vhost_logfile_dir,'..')) exec("rm -rf $vhost_logfile_dir");

      $app->log("Removing website logfile directory: $vhost_logfile_dir",LOGLEVEL_DEBUG);

		
      //delete the web user

      $command = 'userdel';

      $command .= ' '.$data["old"]["system_user"];			
      exec($command);

   }

   

   //* This function is called when a IP on the server is inserted, updated or deleted

   function server_ip($event_name,$data) {

      global $app, $conf;

      

      // Here we write the name virtualhost directives

      // NameVirtualHost IP:80

      // NameVirtualHost IP:443

      // load the server configuration options

      $app->uses("getconf");

      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');

		
      $app->load('tpl');

		
      $tpl = new tpl();

      $tpl->newTemplate("apache_ispconfig.conf.master");

      $records = $app->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");

		
      if(count($records) > 0) {

         $tpl->setLoop('ip_adresses',$records);

      }

		
      $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/ispconfig.conf');

      file_put_contents($vhost_file,$tpl->grab());

      $app->log("Writing the conf file: ispconfig.conf",LOGLEVEL_DEBUG);

      unset($tpl);

      

   }