maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

add letsencrypt, HSTS settings, oscp-stapling and phpenabled-flag to Domain-import; fixes #416

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2017-04-18 16:55:55 +02:00
parent 9fabfd539d
commit 9db7434876
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/classes/bulk/class.DomainBulkAction.php
View File

@@ -93,6 +93,12 @@ class DomainBulkAction
/* 16 */ 'use_ssl', /* 16 */ 'use_ssl',
/* 17 */ 'registration_date', /* 17 */ 'registration_date',
/* 18 */ 'ips', /* 18 */ 'ips',
/* 19 */ 'letsencrypt',
/* 20 */ 'hsts',
/* 21 */ 'hsts_sub',
/* 22 */ 'hsts_preload',
/* 23 */ 'ocsp_stapling',
/* 24 */ 'phpenabled',
/* automatically added */ /* automatically added */
'adminid', 'adminid',
'customerid', 'customerid',
@@ -200,7 +206,13 @@ class DomainBulkAction
`specialsettings` = :specialsettings, `specialsettings` = :specialsettings,
`ssl_redirect` = :ssl_redirect, `ssl_redirect` = :ssl_redirect,
`registration_date` = :registration_date, `registration_date` = :registration_date,
`add_date` = :add_date `add_date` = :add_date,
`letsencrypt` = :letsencrypt,
`hsts` = :hsts,
`hsts_sub` = :hsts_sub,
`hsts_preload` = :hsts_preload,
`ocsp_stapling` = :ocsp_stapling,
`phpenabled` = :phpenabled
"); ");
// prepare insert statement for ip/port <> domain // prepare insert statement for ip/port <> domain
@@ -335,6 +347,30 @@ class DomainBulkAction
$domain_data['ssl_redirect'] = 0; $domain_data['ssl_redirect'] = 0;
} }
// only check for letsencrypt, hsts and oscp-stapling if ssl is enabled
if ($domain_data['use_ssl'] == 1) {
//lets encrypt
if ($domain_data['letsencrypt'] != 1 || $domain_data['iswildcarddomain'] == 1) {
$domain_data['letsencrypt'] = 0;
}
} else {
$domain_data['letsencrypt'] = 0;
}
// hsts
if ($domain_data['hsts'] != 1) {
$domain_data['hsts'] = 0;
}
if ($domain_data['hsts_sub'] != 1) {
$domain_data['hsts_sub'] = 0;
}
if ($domain_data['hsts_preload'] != 1) {
$domain_data['hsts_preload'] = 0;
}
if ($domain_data['ocsp_stapling'] != 1) {
$domain_data['ocsp_stapling'] = 0;
}
// add to known domains // add to known domains
$this->_knownDomains[] = $domain_data['domain']; $this->_knownDomains[] = $domain_data['domain'];