From 9994af5b2aee70810acd1e4675c7a7c4a538a961 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 5 Aug 2016 01:27:21 +0200 Subject: [PATCH] upd: move support@... mail address to ServerConstant Change-Id: I7ef395baa8128b6955519fe8a5fa28b128d70be7 --- src/org/cacert/gigi/dbObjects/SupportedUser.java | 2 +- src/org/cacert/gigi/email/SendMail.java | 2 +- src/org/cacert/gigi/util/ServerConstants.java | 4 ++++ tests/org/cacert/gigi/email/TestSendmail.java | 2 +- .../cacert/gigi/pages/admin/TestSEAdminNotificationMail.java | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/org/cacert/gigi/dbObjects/SupportedUser.java b/src/org/cacert/gigi/dbObjects/SupportedUser.java index 975ef9b5..47c17e83 100644 --- 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 d7343fbe..c288e549 100644 --- 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 5ae4e1b3..09317c3e 100644 --- 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 aa0e8a35..d9af0a28 100644 --- 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 bd64f9bf..033f69a6 100644 --- 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)); -- 2.39.2