echosystem.fr
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG #853 

*fix - email_smtp_password is saved encrypted and not as plain text @see https://github.com/phpservermon/phpservermon/issues/853
This commit is contained in:
Ing. Petr Suchy 2020-02-07 18:00:21 +01:00
parent 45d1c03e5a
commit 23959c4151
No known key found for this signature in database
GPG Key ID: 5BC9AFE53BB0E8A2
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/includes/functions.inc.php
View File

@ -595,7 +595,7 @@ namespace {
$phpmailer->SMTPSecure = psm_get_conf('email_smtp_security');
$smtp_user = psm_get_conf('email_smtp_username');
$smtp_pass = psm_get_conf('email_smtp_password');
$smtp_pass = psm_password_decrypt(psm_get_conf('password_encrypt_key'), psm_get_conf('email_smtp_password'));
if ($smtp_user != '' && $smtp_pass != '') {
$phpmailer->SMTPAuth = true;

1
src/lang/en_US.lang.php
View File

@ -293,6 +293,7 @@ $sm_lang = array(
'email_smtp_security_none' => 'None',
'email_smtp_username' => 'SMTP username',
'email_smtp_password' => 'SMTP password',
'email_smtp_password_description' => 'Fill only to set or change.',
'email_smtp_noauth' => 'Leave blank for no authentication',
'sms_status' => 'Allow sending text messages',
'sms_gateway' => 'Gateway to use for sending messages',

8
src/psm/Module/Config/Controller/ConfigController.php
View File

@ -67,7 +67,7 @@ class ConfigController extends AbstractController
'email_smtp_host',
'email_smtp_port',
'email_smtp_username',
'email_smtp_password',
//'email_smtp_password', // not typical input - and saved encrypted
'sms_gateway_username',
'sms_gateway_password',
'sms_from',
@ -204,6 +204,8 @@ class ConfigController extends AbstractController
{
if (!empty($_POST)) {
// save new config
$emailSmtpPassword = filter_input(INPUT_POST, 'email_smtp_password');
$clean = array(
'language' => $_POST['language'],
'sms_gateway' => $_POST['sms_gateway'],
@ -216,6 +218,9 @@ class ConfigController extends AbstractController
'log_retention_period' => intval(psm_POST('log_retention_period', 365)),
'password_encrypt_key' => psm_POST('password_encrypt_key', sha1(microtime())),
);
if ($emailSmtpPassword !== null && $emailSmtpPassword !== '') {
$clean['email_smtp_password'] = psm_password_encrypt(psm_get_conf('password_encrypt_key'), $emailSmtpPassword);
}
foreach ($this->checkboxes as $input_key) {
$clean[$input_key] = (isset($_POST[$input_key])) ? '1' : '0';
}
@ -411,6 +416,7 @@ class ConfigController extends AbstractController
'label_email_smtp_security' => psm_get_lang('config', 'email_smtp_security'),
'label_email_smtp_username' => psm_get_lang('config', 'email_smtp_username'),
'label_email_smtp_password' => psm_get_lang('config', 'email_smtp_password'),
'label_email_smtp_password_description' => psm_get_lang('config', 'email_smtp_password_description'),
'label_email_smtp_noauth' => psm_get_lang('config', 'email_smtp_noauth'),
'label_sms_status' => psm_get_lang('config', 'sms_status'),
'label_sms_gateway' => psm_get_lang('config', 'sms_gateway'),

2
src/templates/default/module/config/config.tpl.html
View File

@ -99,7 +99,7 @@
<!-- email user -->
{{ macro.input_field("text", "email_smtp_username", null, "email_smtp_username", label_email_smtp_username, email_smtp_username, label_email_smtp_username, "255") }}
<!-- email password -->
{{ macro.input_field("password", "email_smtp_password", null, "email_smtp_password", label_email_smtp_password, email_smtp_password, label_email_smtp_password, "255", null, null, null, true) }}
{{ macro.input_field("password", "email_smtp_password", null, "email_smtp_password", label_email_smtp_password, email_smtp_password, label_email_smtp_password, "255", 'email_smtp_password_help', label_email_smtp_password_description, null, true) }}
{{ macro.button_test("testEmail", label_test) }}
{{ macro.input_hidden("test_email", "0") }}
{{ macro.button_save("email_submit", label_save) }}