From 1332f5e105556b3db1c5a13f14ee13a3216985c3 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Mon, 10 Aug 2020 12:57:45 -0300
Subject: [PATCH] Bug 22343: Prevent passing password to the UI

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 admin/smtp_servers.pl                                         | 3 +++
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/smtp_servers.pl b/admin/smtp_servers.pl
index 9dff83d0a5..f5d7b083e5 100755
--- a/admin/smtp_servers.pl
+++ b/admin/smtp_servers.pl
@@ -123,6 +123,9 @@ elsif ( $op eq 'edit_save' ) {
         my $password   = $input->param('smtp_password') || undef;
         my $debug      = ( scalar $input->param('smtp_debug_mode') ) ? 1 : 0;
 
+        $password = undef
+            if defined $password and $password eq '****';
+
         try {
             $smtp_server->password( $password )
                 if $password;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
index 1d5813f8bf..732ec91df5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
@@ -171,7 +171,7 @@ SMTP servers
                 </li>
                 <li>
                     <label for="smtp_password">Password: </label>
-                    <input type="password" name="smtp_password" id="smtp_password" size="60"  value="[%- smtp_server.password | html -%]"/>
+                    <input type="password" name="smtp_password" id="smtp_password" size="60"  value="****"/>
                 </li>
                 <li>
                     <label for="smtp_debug_mode">Debug mode: </label>
-- 
2.20.1