add mail conf task #1238
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * This file is part of the Froxlor project. | ||
| * Copyright (c) 2010 the Froxlor Team (see authors). | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, you can also view it online at | ||
| * https://files.froxlor.org/misc/COPYING.txt | ||
| * | ||
| * @copyright the authors | ||
| * @author Froxlor team <[email protected]> | ||
| * @license https://files.froxlor.org/misc/COPYING.txt GPLv2 | ||
| */ | ||
|
|
||
| namespace Froxlor\Cron\Mail; | ||
|
|
||
| use Froxlor\Cron\Http\DomainSSL; | ||
| use Froxlor\Cron\Http\WebserverBase; | ||
| use Froxlor\Database\Database; | ||
| use Froxlor\FileDir; | ||
| use Froxlor\FroxlorLogger; | ||
| use Froxlor\Settings; | ||
| use PDO; | ||
|
|
||
| class Dovecot | ||
| { | ||
| private $content = ""; | ||
|
|
||
| public function createVirtualSSLHost() | ||
| { | ||
| $domains = WebserverBase::getVhostsToCreate(); | ||
| foreach ($domains as $domain) { | ||
| FroxlorLogger::getInstanceOf()->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, 'dovecot::createVirtualHosts: creating vhost container for domain ' . $domain['id'] . ', customer ' . $domain['loginname']); | ||
| if ($domain['deactivated'] == '0' && $domain['customer_deactivated'] == '0' && $domain['isemaildomain'] == '1' | ||
| && $domain['ssl_enabled'] == '1' && $domain['ssl'] == '1') { | ||
| $this->content .= $this->getSSLConf($domain); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private function getSSLConf($domain) | ||
| { | ||
| $query = "SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` `i`, `" . TABLE_DOMAINTOIP . "` `dip` | ||
| WHERE dip.id_domain = :domainid AND i.id = dip.id_ipandports AND i.ssl = '1' ORDER BY i.ssl_cert_file ASC;"; | ||
|
|
||
| $result_stmt = Database::prepare($query); | ||
| Database::pexecute($result_stmt, [ | ||
| 'domainid' => $domain['id'] | ||
| ]); | ||
| $content = ""; | ||
| while ($ipandport = $result_stmt->fetch(PDO::FETCH_ASSOC)) { | ||
| $domain['ssl_cert_file'] = $ipandport['ssl_cert_file']; | ||
| $domain['ssl_key_file'] = $ipandport['ssl_key_file']; | ||
| $domain['ssl_ca_file'] = $ipandport['ssl_ca_file']; | ||
| $domain['ssl_cert_chainfile'] = $ipandport['ssl_cert_chainfile']; | ||
|
|
||
| // SSL STUFF | ||
| $dssl = new DomainSSL(); | ||
| // this sets the ssl-related array-indices in the $domain array | ||
| // if the domain has customer-defined ssl-certificates | ||
| $dssl->setDomainSSLFilesArray($domain); | ||
|
|
||
| if($domain['ssl_cert_file'] != '') { | ||
| $content .= 'local_name ' . $domain['domain'] . " {\n"; | ||
| $content .= ' ssl_cert = <' . FileDir::makeCorrectFile($domain['ssl_cert_file']) . "\n"; | ||
|
|
||
| if ($domain['ssl_key_file'] != '') { | ||
| $content .= ' ssl_key = <' . FileDir::makeCorrectFile($domain['ssl_key_file']) . "\n"; | ||
| } | ||
| $content .="}\n"; | ||
|
|
||
| } | ||
| } | ||
|
|
||
| return $content; | ||
| } | ||
|
|
||
| public function writeConfigs() | ||
| { | ||
| if($this->content !== "") { | ||
| $vhosts_filename = FileDir::makeCorrectFile(Settings::Get('system.mda_conf_dir') . '99-froxlor-vhost.ssl.conf'); | ||
| $vhosts_file = '# ' . basename($vhosts_filename) . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n" . "\n" . $this->content; | ||
| $vhosts_file_handler = fopen($vhosts_filename, 'w'); | ||
| fwrite($vhosts_file_handler, $vhosts_file); | ||
| fclose($vhosts_file_handler); | ||
| } | ||
| } | ||
|
|
||
| public function reload() | ||
| { | ||
| if($this->content !== "") { | ||
| FileDir::safe_exec(escapeshellcmd(Settings::Get('system.mda_reload_command'))); | ||
| } | ||
| } | ||
|
|
||
| public function init() | ||
| { | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * This file is part of the Froxlor project. | ||
| * Copyright (c) 2010 the Froxlor Team (see authors). | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, you can also view it online at | ||
| * https://files.froxlor.org/misc/COPYING.txt | ||
| * | ||
| * @copyright the authors | ||
| * @author Froxlor team <[email protected]> | ||
| * @license https://files.froxlor.org/misc/COPYING.txt GPLv2 | ||
| */ | ||
|
|
||
| namespace Froxlor\Cron\Mail; | ||
|
|
||
| use Froxlor\Cron\Http\DomainSSL; | ||
| use Froxlor\Cron\Http\WebserverBase; | ||
| use Froxlor\Database\Database; | ||
| use Froxlor\FileDir; | ||
| use Froxlor\FroxlorLogger; | ||
| use Froxlor\Settings; | ||
| use PDO; | ||
|
|
||
| class Postfix | ||
| { | ||
| private $content = ""; | ||
|
|
||
| private $postFixMapFile = "99-froxlor.map"; | ||
|
|
||
| public function createVirtualSSLHost() | ||
| { | ||
| $domains = WebserverBase::getVhostsToCreate(); | ||
| foreach ($domains as $domain) { | ||
| FroxlorLogger::getInstanceOf()->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, 'dovecot::createVirtualHosts: creating vhost container for domain ' . $domain['id'] . ', customer ' . $domain['loginname']); | ||
| if ($domain['deactivated'] == '0' && $domain['customer_deactivated'] == '0' && $domain['isemaildomain'] == '1' | ||
| && $domain['ssl_enabled'] == '1' && $domain['ssl'] == '1') { | ||
| $this->content .= $this->getSSLConf($domain); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private function getSSLConf($domain) | ||
| { | ||
| $query = "SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` `i`, `" . TABLE_DOMAINTOIP . "` `dip` | ||
| WHERE dip.id_domain = :domainid AND i.id = dip.id_ipandports AND i.ssl = '1' ORDER BY i.ssl_cert_file ASC;"; | ||
|
|
||
| $result_stmt = Database::prepare($query); | ||
| Database::pexecute($result_stmt, [ | ||
| 'domainid' => $domain['id'] | ||
| ]); | ||
| $content = ""; | ||
| while ($ipandport = $result_stmt->fetch(PDO::FETCH_ASSOC)) { | ||
| $domain['ssl_cert_file'] = $ipandport['ssl_cert_file']; | ||
| $domain['ssl_key_file'] = $ipandport['ssl_key_file']; | ||
| $domain['ssl_ca_file'] = $ipandport['ssl_ca_file']; | ||
| $domain['ssl_cert_chainfile'] = $ipandport['ssl_cert_chainfile']; | ||
|
|
||
| // SSL STUFF | ||
| $dssl = new DomainSSL(); | ||
| // this sets the ssl-related array-indices in the $domain array | ||
| // if the domain has customer-defined ssl-certificates | ||
| $dssl->setDomainSSLFilesArray($domain); | ||
|
|
||
| if($domain['ssl_cert_file'] != '' && $domain['ssl_key_file'] != '') { | ||
| $content .= $domain['domain'].' ' . FileDir::makeCorrectFile($domain['ssl_key_file']) . " " . FileDir::makeCorrectFile($domain['ssl_cert_file']). "\n"; | ||
| } | ||
| } | ||
|
|
||
| return $content; | ||
| } | ||
|
|
||
| public function writeConfigs() | ||
| { | ||
| if($this->content !== "") { | ||
| $vhosts_filename = FileDir::makeCorrectFile(Settings::Get('system.mta_conf_dir') . $this->postFixMapFile); | ||
| FileDir::safe_exec('postconf -e tls_server_sni_maps=hash:'.$vhosts_filename); | ||
| $vhosts_file = '# ' . basename($vhosts_filename) . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n" . "\n" . $this->content; | ||
| $vhosts_file_handler = fopen($vhosts_filename, 'w'); | ||
| fwrite($vhosts_file_handler, $vhosts_file); | ||
| fclose($vhosts_file_handler); | ||
| FileDir::safe_exec('postmap -F hash:'.$vhosts_filename); | ||
|
There was a problem hiding this comment. how is this map integrated in the postfix config and being used? There was a problem hiding this comment. okay, missed the 'postconf -e tls_server_sni_maps' command there, sorry |
||
| } | ||
| } | ||
|
|
||
| public function reload() | ||
| { | ||
| if($this->content !== "") { | ||
| FileDir::safe_exec(escapeshellcmd(Settings::Get('system.mta_reload_command'))); | ||
| } | ||
| } | ||
|
|
||
| public function init() | ||
| { | ||
|
|
||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please dont change stuff in the build - this needs to be available on our servers for the update/autoupdate to work and does not have anything to do with the feature you are working on in any way