upd: move support@... mail address to ServerConstant

Change-Id: I7ef395baa8128b6955519fe8a5fa28b128d70be7

diff --git a/src/org/cacert/gigi/dbObjects/SupportedUser.java b/src/org/cacert/gigi/dbObjects/SupportedUser.java
index 975ef9b51e02055fb444819a4330d43a42cadbab..47c17e83460662e70b15cd1828bcdb81946a4249 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/SupportedUser.java
+++ b/src/org/cacert/gigi/dbObjects/SupportedUser.java
@@ -94,7 +94,7 @@ public class SupportedUser {
             vars.put("ticket", this.getTicket());
             vars.put("subject", subject);
 
-            String supportemailaddress = "support@" + ServerConstants.getWwwHostName().replaceFirst("^www\\.", "");
+            String supportemailaddress = ServerConstants.getSupportMailAddress();
             supportNotification.sendMail(Language.getInstance(Locale.ENGLISH), vars, supportemailaddress);
         } catch (IOException e) {
             e.printStackTrace();

diff --git a/src/org/cacert/gigi/email/SendMail.java b/src/org/cacert/gigi/email/SendMail.java
index d7343fbe9a4f6348962625a84032dcd0040f146b..c288e5497d3d0b0b16843f50cdac5707e86b95b9 100644 (file)
--- a/src/org/cacert/gigi/email/SendMail.java
+++ b/src/org/cacert/gigi/email/SendMail.java
@@ -32,7 +32,7 @@ public class SendMail extends EmailProvider {
 
     @Override
     public void sendMail(String to, String subject, String message, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
-        String from = "support@" + ServerConstants.getWwwHostName().replaceAll("^www.", "");
+        String from = ServerConstants.getSupportMailAddress();
         try (Socket smtp = new Socket(targetHost, targetPort); PrintWriter out = new PrintWriter(new OutputStreamWriter(smtp.getOutputStream(), "UTF-8")); BufferedReader in = new BufferedReader(new InputStreamReader(smtp.getInputStream(), "UTF-8"));) {
             readSMTPResponse(in, 220);
             out.print("HELO www.cacert.org\r\n");

diff --git a/src/org/cacert/gigi/util/ServerConstants.java b/src/org/cacert/gigi/util/ServerConstants.java
index 5ae4e1b320435fbf40f7bce0f020b1d042fcf072..09317c3ec643f8c53dfc16b3b27309b4b7ac2883 100644 (file)
--- a/src/org/cacert/gigi/util/ServerConstants.java
+++ b/src/org/cacert/gigi/util/ServerConstants.java
@@ -90,4 +90,8 @@ public class ServerConstants {
         return suffix;
     }
 
+    public static String getSupportMailAddress() {
+        return "support@" + ServerConstants.getWwwHostName().replaceFirst("^www\\.", "");
+    }
+
 }

diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/org/cacert/gigi/email/TestSendmail.java
index aa0e8a351164633c7ad629dec2eea8baf4d086de..d9af0a28f62e6fceaaefb998afc3466243cc6c5c 100644 (file)
--- a/tests/org/cacert/gigi/email/TestSendmail.java
+++ b/tests/org/cacert/gigi/email/TestSendmail.java
@@ -85,7 +85,7 @@ public class TestSendmail extends ConfiguredTest {
             imapUntil(br, "exp");
             pw.println("log logout");
             imapUntil(br, "log");
-            assertThat(body, containsString("From: support@" + ServerConstants.getWwwHostName().replaceAll("^www.", "")));
+            assertThat(body, containsString("From: " + ServerConstants.getSupportMailAddress()));
             assertThat(body, containsString("To: gigi-testuser@dogcraft.de"));
             assertThat(body, containsString("Subject: " + subj));
             assertThat(body, containsString(Base64.getEncoder().encodeToString(msg.getBytes("UTF-8"))));

diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminNotificationMail.java b/tests/org/cacert/gigi/pages/admin/TestSEAdminNotificationMail.java
index bd64f9bf2e0da906ef282323ea588b0912eb7ad2..033f69a6a8445b43b637d7f99e788e318631a59c 100644 (file)
--- a/tests/org/cacert/gigi/pages/admin/TestSEAdminNotificationMail.java
+++ b/tests/org/cacert/gigi/pages/admin/TestSEAdminNotificationMail.java
@@ -43,7 +43,7 @@ public class TestSEAdminNotificationMail extends ClientTest {
     public void testPasswordReset() throws MalformedURLException, IOException {
         executeBasicWebInteraction(cookie, SupportUserDetailsPage.PATH + targetID, "aword=SecretWord&resetPass", 0);
         TestMail tm;
-        String targetMail = "support@" + ServerConstants.getWwwHostName().replaceFirst("^www\\.", "");
+        String targetMail = ServerConstants.getSupportMailAddress();
         do {
             tm = getMailReceiver().receive();
         } while ( !tm.getTo().equals(targetMail));