From 79c7f3af6bde6b4d3a42db69b7671ae4e9c813f3 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 10 Jan 2019 15:56:48 +0100
Subject: [PATCH] FEAT #8489 encrypt/decrypt password
---
src/app/configuration/controllers/ConfigurationController.php | 2 +-
.../app/configuration/ConfigurationControllerTest.php | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/app/configuration/controllers/ConfigurationController.php b/src/app/configuration/controllers/ConfigurationController.php
index c419ab68980..7b3ab29ee42 100644
--- a/src/app/configuration/controllers/ConfigurationController.php
+++ b/src/app/configuration/controllers/ConfigurationController.php
@@ -32,7 +32,7 @@ class ConfigurationController
$configuration = ConfigurationModel::getByService(['service' => $aArgs['service']]);
$configuration['value'] = (array)json_decode($configuration['value']);
if (isset($configuration['value']['password'])) {
- unset($configuration['value']['password']);
+ $configuration['value']['password'] = '';
$configuration['value']['passwordAlreadyExists'] = true;
} else {
$configuration['value']['passwordAlreadyExists'] = false;
diff --git a/test/unitTests/app/configuration/ConfigurationControllerTest.php b/test/unitTests/app/configuration/ConfigurationControllerTest.php
index 7b149b99037..7609bb90aa6 100755
--- a/test/unitTests/app/configuration/ConfigurationControllerTest.php
+++ b/test/unitTests/app/configuration/ConfigurationControllerTest.php
@@ -55,6 +55,7 @@ class ConfigurationControllerTest extends TestCase
'port' => '45',
'auth' => true,
'user' => 'user@test.com',
+ 'password' => '',
'secure' => 'ssl',
'from' => 'info@maarch.org',
'charset' => 'utf-8',
@@ -103,6 +104,7 @@ class ConfigurationControllerTest extends TestCase
'port' => '231',
'auth' => false,
'user' => '',
+ 'password' => '',
'secure' => 'tls',
'from' => 'info@maarch.org',
'charset' => 'utf-8',
@@ -239,6 +241,7 @@ class ConfigurationControllerTest extends TestCase
'port' => '465',
'auth' => true,
'user' => 'name@maarch.org',
+ 'password' => '',
'secure' => 'ssl',
'from' => 'notifications@maarch.org',
'charset' => 'utf-8',
--
GitLab