Bugfix: created php session directory is not writable by apache

tbrehm

2008-12-07 93f15ebee6f7e026893008ec6797ed360bc2b071

 server/plugins-available/apache2_plugin.inc.php

@@ -107,7 +107,7 @@
        O                      = ".$data['new']['ssl_organisation']."
        OU                     = ".$data['new']['ssl_organisation_unit']."
        CN                     = $domain
        emailAddress           = webmatser@".$data['new']['domain']."
        emailAddress           = webmaster@".$data['new']['domain']."

        [ req_attributes ]
        challengePassword              = A challenge password";
@@ -186,11 +186,24 @@
      if($this->action != 'insert') $this->action = 'update';
      
      if($data["new"]["type"] != "vhost" && $data["new"]["parent_domain_id"] > 0) {
			
         $old_parent_domain_id = intval($data["old"]["parent_domain_id"]);
         $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"]) {
            $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$old_parent_domain_id." AND active = 'y'");
            $data["new"] = $tmp;
            $data["old"] = $tmp;
            $this->action = 'update';
            $this->update($event_name,$data);
         }
			
         // This is not a vhost, so we need to update the parent record instead.
         $parent_domain_id = intval($data["new"]["parent_domain_id"]);
         $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$parent_domain_id." AND active = 'y'");
         $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$new_parent_domain_id." AND active = 'y'");
         $data["new"] = $tmp;
         $data["old"] = $tmp;
         $this->action = 'update';
      }
      
      
@@ -211,22 +224,40 @@
      
      // Check if the directories are there and create them if nescessary.
      if(!is_dir($data["new"]["document_root"]."/web")) exec("mkdir -p ".$data["new"]["document_root"]."/web");
      if(!is_dir($data["new"]["document_root"]."/web/error")) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
      if(!is_dir($data["new"]["document_root"]."/web/error") and $data["new"]["errordocs"]) exec("mkdir -p ".$data["new"]["document_root"]."/web/error");
      //if(!is_dir($data["new"]["document_root"]."/log")) exec("mkdir -p ".$data["new"]["document_root"]."/log");
      if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
      if(!is_dir($data["new"]["document_root"]."/cgi-bin")) exec("mkdir -p ".$data["new"]["document_root"]."/cgi-bin");
      if(!is_dir($data["new"]["document_root"]."/tmp")) exec("mkdir -p ".$data["new"]["document_root"]."/tmp");
      
      // Remove the symlink for the site, if site is renamed
      if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
         if(is_dir('/var/log/ispconfig/httpd/'.$data["old"]["domain"])) exec('rm -rf /var/log/ispconfig/httpd/'.$data["old"]["domain"]);
         if(is_link($data["new"]["document_root"]."/log")) exec("rm -f ".$data["new"]["document_root"]."/log");
         if(is_link($data["old"]["document_root"]."/log")) unlink($data["old"]["document_root"]."/log");
      }
      
      // Create the symlink for the logfiles
      if(!is_dir('/var/log/ispconfig/httpd/'.$data["new"]["domain"])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data["new"]["domain"]);
      if(!is_link($data["new"]["document_root"]."/log")) exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
      if(!is_link($data["new"]["document_root"]."/log")) {
         exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
         $app->log("Creating Symlink: ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log",LOGLEVEL_DEBUG);
      }
      /*
      // Create the symlink for the logfiles
      // This does not work as vlogger can not log trogh symlinks.
      if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
         if(is_dir($data["old"]["document_root"]."/log")) exec('rm -rf '.$data["old"]["document_root"]."/log");
         if(is_link('/var/log/ispconfig/httpd/'.$data["old"]["domain"])) unlink('/var/log/ispconfig/httpd/'.$data["old"]["domain"]);
      }
      
		
      // Create the symlink for the logfiles
      if(!is_dir($data["new"]["document_root"]."/log")) exec('mkdir -p '.$data["new"]["document_root"]."/log");
      if(!is_link('/var/log/ispconfig/httpd/'.$data["new"]["domain"])) {
         exec("ln -s ".$data["new"]["document_root"]."/log /var/log/ispconfig/httpd/".$data["new"]["domain"]);
         $app->log("Creating Symlink: ln -s ".$data["new"]["document_root"]."/log /var/log/ispconfig/httpd/".$data["new"]["domain"],LOGLEVEL_DEBUG);
      }
      */
	
      // Get the client ID
      $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["new"]["sys_groupid"]));
      $client_id = intval($client["client_id"]);
@@ -267,12 +298,14 @@
      }
      
      
      if($this->action == 'insert') {
      if($this->action == 'insert' && $data["new"]["type"] == 'vhost') {
         // Copy the error pages
         $error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
         exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
         exec("chmod -R +r ".$error_page_path);
		
      if($data["new"]["errordocs"]){
           $error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
           exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
           exec("chmod -R +r ".$error_page_path);
      }
      		
         // copy the standard index page
         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");
         exec("chmod +r ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
@@ -289,7 +322,7 @@
      
      $username = escapeshellcmd($data["new"]["system_user"]);
      if($data["new"]["system_user"] != '' && !$app->system->is_user($data["new"]["system_user"])) {
         exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname $username");
         exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname $username -s /bin/false");
         $app->log("Adding the user: $username",LOGLEVEL_DEBUG);
      }
      
@@ -310,6 +343,9 @@
      // Chown and chmod the directories
      exec("chown -R $username:$groupname ".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"));
		
      
      // Create the vhost config file
      $app->load('tpl');
@@ -319,6 +355,7 @@
      
      $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";
      
      // Check if a SSL cert exists
      $ssl_dir = $data["new"]["document_root"]."/ssl";
@@ -350,10 +387,14 @@
      
      // get alias domains (co-domains and subdomains)
      $aliases = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ".$data["new"]["domain_id"]." AND active = 'y'");
      $server_alias = '';
    if($data["new"]["is_subdomainwww"]){
       $server_alias .= 'www.'.$data["new"]["domain"].' ';
    } else {
        $server_alias = '';
    }
      if(is_array($aliases)) {
         foreach($aliases as $alias) {
            $server_alias .= $alias["domain"].' ';
           $server_alias .= $alias["domain"].' ';
            $app->log("Add server alias: $alias[domain]",LOGLEVEL_DEBUG);
            // Rewriting
            if($alias["redirect_type"] != '') {
@@ -370,6 +411,54 @@
         $tpl->setVar('rewrite_enabled',0);
      }
      $tpl->setLoop('redirects',$rewrite_rules);
		
      /** 
       * install fast-cgi starter script and add script aliasd config 
       * first we create the script directory if not already created, then copy over the starter script
       * settings are copied over from the server ini config for now
       * TODO: Create form for fastcgi configs per site.
       */
		
      if ($data["new"]["php"] == "fast-cgi")
      {
         $fastcgi_config = $app->getconf->get_server_config($conf["server_id"], 'fastcgi');
			
         $fastcgi_starter_path = str_replace("[system_user]",$data["new"]["system_user"],$fastcgi_config["fastcgi_starter_path"]);
         $fastcgi_starter_path = str_replace("[client_id]",$client_id,$fastcgi_starter_path);
			
         if (!is_dir($fastcgi_starter_path))
         {
            exec("mkdir -p ".escapeshellcmd($fastcgi_starter_path));
            exec("chown ".$data["new"]["system_user"].":".$data["new"]["system_group"]." ".escapeshellcmd($fastcgi_starter_path));
				
				
            $app->log("Creating fastcgi starter script directory: $fastcgi_starter_path",LOGLEVEL_DEBUG);
         }
			
         $fcgi_tpl = new tpl();
         $fcgi_tpl->newTemplate("php-fcgi-starter.master");
				
         $fcgi_tpl->setVar('php_ini_path',$fastcgi_config["fastcgi_phpini_path"]);
         $fcgi_tpl->setVar('document_root',$data["new"]["document_root"]);
         $fcgi_tpl->setVar('php_fcgi_children',$fastcgi_config["fastcgi_children"]);
         $fcgi_tpl->setVar('php_fcgi_max_requests',$fastcgi_config["fastcgi_max_requests"]);
         $fcgi_tpl->setVar('php_fcgi_bin',$fastcgi_config["fastcgi_bin"]);
				
         $fcgi_starter_script = escapeshellcmd($fastcgi_starter_path.$fastcgi_config["fastcgi_starter_script"]);
         file_put_contents($fcgi_starter_script,$fcgi_tpl->grab());
         unset($fcgi_tpl);
			
         $app->log("Creating fastcgi starter script: $fcgi_starter_script",LOGLEVEL_DEBUG);
			
			
         exec("chmod 755 $fcgi_starter_script");
         exec("chown ".$data["new"]["system_user"].":".$data["new"]["system_group"]." $fcgi_starter_script");

         $tpl->setVar('fastcgi_alias',$fastcgi_config["fastcgi_alias"]);
         $tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
         $tpl->setVar('fastcgi_starter_script',$fastcgi_config["fastcgi_starter_script"]);
			
      }
      
      $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["new"]["domain"].'.vhost');
      file_put_contents($vhost_file,$tpl->grab());
@@ -389,11 +478,14 @@
         $app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);
      }
      
      // remove old symlink, if domain name of the site has changed
      // remove old symlink and vhost file, if domain name of the site has changed
      if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
         $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 File $vhost_file",LOGLEVEL_DEBUG);
      }
      
      // request a httpd reload when all records have been processed
@@ -419,6 +511,18 @@
      
      $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))
         {
               exec("rm -rf $fastcgi_starter_path");
         }
      }
		
      $app->log("Removing website: $docroot",LOGLEVEL_DEBUG);
      
      // Delete the symlinks for the sites
@@ -441,6 +545,15 @@
      }
      // 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