From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/plugins-available/nginx_plugin.inc.php | 115 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 32 deletions(-)
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 92c6efb..9933aae 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -36,6 +36,7 @@
// private variables
var $action = '';
var $ssl_certificate_changed = false;
+ var $update_letsencrypt = false;
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
@@ -219,6 +220,22 @@
$app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = ?", $data['new']['domain']);
}
+ //* Check that the SSL key is not password protected
+ if($data["new"]["ssl_action"] == 'save') {
+ if(stristr($data["new"]["ssl_key"],'Proc-Type: 4,ENCRYPTED')) {
+ $data["new"]["ssl_action"] = '';
+
+ $app->log('SSL Certificate not saved. The SSL key is encrypted.', LOGLEVEL_WARN);
+ $app->dbmaster->datalogError('SSL Certificate not saved. The SSL key is encrypted.');
+
+ /* Update the DB of the (local) Server */
+ $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = ?", $data['new']['domain']);
+
+ /* Update also the master-DB of the Server-Farm */
+ $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = ?", $data['new']['domain']);
+ }
+ }
+
//* Save a SSL certificate to disk
if($data["new"]["ssl_action"] == 'save') {
$this->ssl_certificate_changed = true;
@@ -338,6 +355,7 @@
$data['new'] = $tmp;
$data['old'] = $tmp;
$this->action = 'update';
+ $this->update_letsencrypt = true;
}
// load the server configuration options
@@ -725,11 +743,11 @@
}
// get the primitive folder for document_root and the filesystem, will need it later.
- $df_output=exec("df -T $document_root|awk 'END{print \$2,\$NF}'");
- $file_system = explode(" ", $df_output)[0];
- $primitive_root = explode(" ", $df_output)[1];
+ $df_output=explode(" ", exec("df -T $document_root|awk 'END{print \$2,\$NF}'"));
+ $file_system = $df_output[0];
+ $primitive_root = $df_output[1];
- if ( $file_system , array('ext2','ext3','ext4') ) {
+ if ( in_array($file_system , array('ext2','ext3','ext4'), true) ) {
exec('setquota -u '. $username . ' ' . $blocks_soft . ' ' . $blocks_hard . ' 0 0 -a &> /dev/null');
exec('setquota -T -u '.$username.' 604800 604800 -a &> /dev/null');
} elseif ($file_system == 'xfs') {
@@ -916,6 +934,7 @@
$tpl->newTemplate('nginx_vhost.conf.master');
// IPv4
+ if($data['new']['ip_address'] == '') $data['new']['ip_address'] = '*';
//* use ip-mapping for web-mirror
if($data['new']['ip_address'] != '*' && $conf['mirror_server_id'] > 0) {
@@ -1173,19 +1192,21 @@
}
// use vLib for template logic
- $nginx_directives_new = '';
- $ngx_conf_tpl = new tpl();
- $ngx_conf_tpl_tmp_file = tempnam($conf['temppath'], "ngx");
- file_put_contents($ngx_conf_tpl_tmp_file, $nginx_directives);
- $ngx_conf_tpl->newTemplate($ngx_conf_tpl_tmp_file);
- $ngx_conf_tpl->setVar('use_tcp', $use_tcp);
- $ngx_conf_tpl->setVar('use_socket', $use_socket);
- $ngx_conf_tpl->setVar('fpm_socket', $fpm_socket);
- $ngx_conf_tpl->setVar($vhost_data);
- $nginx_directives_new = $ngx_conf_tpl->grab();
- if(is_file($ngx_conf_tpl_tmp_file)) unlink($ngx_conf_tpl_tmp_file);
- if($nginx_directives_new != '') $nginx_directives = $nginx_directives_new;
- unset($nginx_directives_new);
+ if(trim($nginx_directives) != '') {
+ $nginx_directives_new = '';
+ $ngx_conf_tpl = new tpl();
+ $ngx_conf_tpl_tmp_file = tempnam($conf['temppath'], "ngx");
+ file_put_contents($ngx_conf_tpl_tmp_file, $nginx_directives);
+ $ngx_conf_tpl->newTemplate($ngx_conf_tpl_tmp_file);
+ $ngx_conf_tpl->setVar('use_tcp', $use_tcp);
+ $ngx_conf_tpl->setVar('use_socket', $use_socket);
+ $ngx_conf_tpl->setVar('fpm_socket', $fpm_socket);
+ $ngx_conf_tpl->setVar($vhost_data);
+ $nginx_directives_new = $ngx_conf_tpl->grab();
+ if(is_file($ngx_conf_tpl_tmp_file)) unlink($ngx_conf_tpl_tmp_file);
+ if($nginx_directives_new != '') $nginx_directives = $nginx_directives_new;
+ unset($nginx_directives_new);
+ }
// Make sure we only have Unix linebreaks
$nginx_directives = str_replace("\r\n", "\n", $nginx_directives);
@@ -1232,8 +1253,7 @@
($data['old']['ssl'] == 'n' || $data['old']['ssl_letsencrypt'] == 'n') // we have new let's encrypt configuration
|| ($data['old']['domain'] != $data['new']['domain']) // we have domain update
|| ($data['old']['subdomain'] != $data['new']['subdomain']) // we have new or update on "auto" subdomain
- || ($data['new']['type'] == 'subdomain') // we have new or update on subdomain
- || ($data['old']['type'] == 'alias' || $data['new']['type'] == 'alias') // we have new or update on alias domain
+ || $this->update_letsencrypt == true
)) {
// default values
$temp_domains = array();
@@ -1261,8 +1281,8 @@
if(is_array($aliasdomains)) {
foreach($aliasdomains as $aliasdomain) {
$temp_domains[] = $aliasdomain['domain'];
- if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) {
- $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
+ if(isset($aliasdomain['subdomain']) && ($aliasdomain['subdomain'] != "none")) {
+ $temp_domains[] = "www." . $aliasdomain['domain'];
}
foreach($sub_prefixes as $s) {
@@ -1290,13 +1310,27 @@
$webroot = $data['new']['document_root']."/web";
//* check if we have already a Let's Encrypt cert
- if(!file_exists($crt_tmp_file) && !file_exists($key_tmp_file)) {
+ //if(!file_exists($crt_tmp_file) && !file_exists($key_tmp_file)) {
+ // we must not skip if cert exists, otherwise changed domains (alias or sub) won't make it to the cert
$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
-
- if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
- $this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
+
+ $success = false;
+ $letsencrypt = explode("\n", shell_exec('which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt'));
+ $letsencrypt = reset($letsencrypt);
+ if(is_executable($letsencrypt)) {
+ $success = $this->_exec($letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
}
- };
+ if(!$success) {
+ // error issuing cert
+ $app->log('Let\'s Encrypt SSL Cert for: ' . $domain . ' could not be issued.', LOGLEVEL_WARN);
+ $data['new']['ssl_letsencrypt'] = 'n';
+ if($data['old']['ssl'] == 'n') $data['new']['ssl'] = 'n';
+ /* Update the DB of the (local) Server */
+ $app->db->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
+ /* Update also the master-DB of the Server-Farm */
+ $app->dbmaster->query("UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ?", $data['new']['ssl'], 'n', $data['new']['domain']);
+ }
+ //}
//* check is been correctly created
if(file_exists($crt_tmp_file) OR file_exists($key_tmp_file)) {
@@ -1328,11 +1362,11 @@
/* we don't need to store it.
/* Update the DB of the (local) Server */
- $app->db->query("UPDATE web_domain SET ssl_request = '', ssl_cert = '', ssl_key = '' WHERE domain = '".$data['new']['domain']."'");
- $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
+ $app->db->query("UPDATE web_domain SET ssl_request = '', ssl_cert = '', ssl_key = '' WHERE domain = ?", $data['new']['domain']);
+ $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = ?", $data['new']['domain']);
/* Update also the master-DB of the Server-Farm */
- $app->dbmaster->query("UPDATE web_domain SET ssl_request = '', ssl_cert = '', ssl_key = '' WHERE domain = '".$data['new']['domain']."'");
- $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
+ $app->dbmaster->query("UPDATE web_domain SET ssl_request = '', ssl_cert = '', ssl_key = '' WHERE domain = ?", $data['new']['domain']);
+ $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = ?", $data['new']['domain']);
}
};
@@ -2093,6 +2127,18 @@
//exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
}
+
+ // remove letsencrypt if it exists (renew will always fail otherwise)
+ $domain = $data['old']['ssl_domain'];
+ if(!$domain) $domain = $data['old']['domain'];
+ if(substr($domain, 0, 2) === '*.') {
+ // wildcard domain not yet supported by letsencrypt!
+ $domain = substr($domain, 2);
+ }
+ //$crt_tmp_file = "/etc/letsencrypt/live/".$domain."/cert.pem";
+ //$key_tmp_file = "/etc/letsencrypt/live/".$domain."/privkey.pem";
+ $le_conf_file = '/etc/letsencrypt/renewal/' . $domain . '.conf';
+ @rename('/etc/letsencrypt/renewal/' . $domain . '.conf', '/etc/letsencrypt/renewal/' . $domain . '.conf~backup');
}
//* remove mountpoint from fstab
@@ -2114,6 +2160,7 @@
$data['new'] = $tmp;
$data['old'] = $tmp;
$this->action = 'update';
+ $this->update_letsencrypt = true;
// just run the update function
$this->update($event_name, $data);
@@ -2733,7 +2780,7 @@
$tpl->setVar('fpm_pool', $pool_name);
$tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);
$tpl->setVar('fpm_user', $data['new']['system_user']);
- $tpl->setVar('fpm_group', $data['new']['system_group']);
+ $tpl->setVar('fpm_group', $web_config['group']);
$tpl->setVar('pm', $data['new']['pm']);
$tpl->setVar('pm_max_children', $data['new']['pm_max_children']);
$tpl->setVar('pm_start_servers', $data['new']['pm_start_servers']);
@@ -3085,8 +3132,12 @@
//* Wrapper for exec function for easier debugging
private function _exec($command) {
global $app;
+ $out = array();
+ $ret = 0;
$app->log('exec: '.$command, LOGLEVEL_DEBUG);
- exec($command);
+ exec($command, $out, $ret);
+ if($ret != 0) return false;
+ else return true;
}
private function _checkTcp ($host, $port) {
--
Gitblit v1.9.1