X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Femail%2FSendmail.java;h=601130500e96719c1fe913db1b61f7240a5dd94d;hb=8b8d9aeca13b47b9d865b2aa230f40c1d910351a;hp=c61494b7eb4fe96cf9923c41e687b21ea7f69660;hpb=634b7f75c8fc2ed8799bad74731278fb59198c48;p=gigi.git

diff --git a/src/org/cacert/gigi/email/Sendmail.java b/src/org/cacert/gigi/email/Sendmail.java
index c61494b7..60113050 100644
--- a/src/org/cacert/gigi/email/Sendmail.java
+++ b/src/org/cacert/gigi/email/Sendmail.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.Socket;
+import java.security.GeneralSecurityException;
 import java.text.SimpleDateFormat;
 import java.util.Base64;
 import java.util.Date;
@@ -12,97 +13,91 @@ import java.util.Locale;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
+import org.cacert.gigi.util.ServerConstants;
+
 public class Sendmail extends EmailProvider {
-	protected Sendmail(Properties props) {
-	}
-	private static final Pattern NON_ASCII = Pattern
-			.compile("[^a-zA-Z0-9 .-\\[\\]!_@]");
 
-	@Override
-	public void sendmail(String to, String subject, String message,
-			String from, String replyto, String toname, String fromname,
-			String errorsto, boolean extra) throws IOException {
+    protected Sendmail(Properties props) {}
+
+    private static final Pattern NON_ASCII = Pattern.compile("[^a-zA-Z0-9 .-\\[\\]!_@]");
+
+    @Override
+    public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException {
+
+        String[] bits = from.split(",");
 
-		String[] bits = from.split(",");
+        Socket smtp = new Socket("localhost", 25);
+        PrintWriter out = new PrintWriter(smtp.getOutputStream());
+        BufferedReader in = new BufferedReader(new InputStreamReader(smtp.getInputStream()));
+        readResponse(in);
+        out.print("HELO www.cacert.org\r\n");
+        out.flush();
+        readResponse(in);
+        out.print("MAIL FROM:<returns@cacert.org>\r\n");
+        out.flush();
+        readResponse(in);
+        bits = to.split(",");
+        for (String user : bits) {
+            out.print("RCPT TO:<" + user.trim() + ">\r\n");
+            out.flush();
+            readResponse(in);
+        }
+        out.print("DATA\r\n");
+        out.flush();
+        readResponse(in);
+        out.print("X-Mailer: CAcert.org Website\r\n");
+        // if (array_key_exists("REMOTE_ADDR", $_SERVER)) {
+        // out.print("X-OriginatingIP: ".$_SERVER["REMOTE_ADDR"]."\r\n");
+        // }
+        // TODO
+        SimpleDateFormat emailDate = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss ZZZZ (z)", Locale.ENGLISH);
+        out.print("Date: " + emailDate.format(new Date(System.currentTimeMillis())) + "\r\n");
+        out.print("Sender: " + errorsto + "\r\n");
+        out.print("Errors-To: " + errorsto + "\r\n");
+        if (replyto != null) {
+            out.print("Reply-To: " + replyto + "\r\n");
+        } else {
+            out.print("Reply-To: " + from + "\r\n");
+        }
+        out.print("From: support@" + ServerConstants.getWwwHostName().replaceAll("^www.", "") + "\r\n");
+        out.print("To: " + to + "\r\n");
+        if (NON_ASCII.matcher(subject).matches()) {
 
-		Socket smtp = new Socket("dogcraft.de", 25);
-		PrintWriter out = new PrintWriter(smtp.getOutputStream());
-		BufferedReader in = new BufferedReader(new InputStreamReader(
-				smtp.getInputStream()));
-		readResponse(in);
-		out.print("HELO www.cacert.org\r\n");
-		out.flush();
-		readResponse(in);
-		out.print("MAIL FROM:<returns@cacert.org>\r\n");
-		out.flush();
-		readResponse(in);
-		bits = to.split(",");
-		for (String user : bits) {
-			out.print("RCPT TO:<" + user.trim() + ">\r\n");
-			out.flush();
-			readResponse(in);
-		}
-		out.print("DATA\r\n");
-		out.flush();
-		readResponse(in);
-		out.print("X-Mailer: CAcert.org Website\r\n");
-		// if (array_key_exists("REMOTE_ADDR", $_SERVER)) {
-		// out.print("X-OriginatingIP: ".$_SERVER["REMOTE_ADDR"]."\r\n");
-		// }
-		// TODO
-		SimpleDateFormat emailDate = new SimpleDateFormat(
-				"E, d MMM yyyy HH:mm:ss ZZZZ (z)", Locale.ENGLISH);
-		out.print("Date: "
-				+ emailDate.format(new Date(System.currentTimeMillis()))
-				+ "\r\n");
-		out.print("Sender: " + errorsto + "\r\n");
-		out.print("Errors-To: " + errorsto + "\r\n");
-		if (replyto != null) {
-			out.print("Reply-To: " + replyto + "\r\n");
-		} else {
-			out.print("Reply-To: " + from + "\r\n");
-		}
-		out.print("From: " + from + "\r\n");
-		out.print("To: " + to + "\r\n");
-		if (NON_ASCII.matcher(subject).matches()) {
+            out.print("Subject: =?utf-8?B?" + Base64.getEncoder().encodeToString(subject.getBytes()) + "?=\r\n");
+        } else {
+            out.print("Subject: " + subject + "\r\n");
+        }
+        StringBuffer headers = new StringBuffer();
+        headers.append("Content-Type: text/plain; charset=\"utf-8\"\r\n");
+        headers.append("Content-Transfer-Encoding: base64\r\n");
+        // out.print(chunk_split(base64_encode(recode("html..utf-8",
+        // $message)))."\r\n.\r\n");
+        headers.append("\r\n");
+        headers.append(Base64.getEncoder().encodeToString(message.getBytes("UTF-8")).replaceAll("(.{64})(?=.)", "$1\r\n"));
+        headers.append("\r\n");
 
-			out.print("Subject: =?utf-8?B?"
-					+ Base64.getEncoder().encodeToString(subject.getBytes())
-					+ "?=\r\n");
-		} else {
-			out.print("Subject: " + subject + "\r\n");
-		}
-		out.print("Mime-Version: 1.0\r\n");
-		if (!extra) {
-			out.print("Content-Type: text/plain; charset=\"utf-8\"\r\n");
-			out.print("Content-Transfer-Encoding: 8bit\r\n");
-		} else {
-			out.print("Content-Type: text/plain; charset=\"iso-8859-1\"\r\n");
-			out.print("Content-Transfer-Encoding: quoted-printable\r\n");
-			out.print("Content-Disposition: inline\r\n");
-		}
-		// out.print("Content-Transfer-Encoding: BASE64\r\n");
-		out.print("\r\n");
-		// out.print(chunk_split(base64_encode(recode("html..utf-8",
-		// $message)))."\r\n.\r\n");
-		message = message + "\r\n";
+        try {
+            sendSigned(headers.toString(), out);
+            out.print("\r\n.\r\n");
+            out.flush();
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+            smtp.close();
+            return;
+        }
+        readResponse(in);
+        out.print("QUIT\n");
+        out.flush();
+        readResponse(in);
+        smtp.close();
+    }
 
-		String sendM = message.replace("\r", "").replace("\n.\n", "\n")
-				.replace("\n.\n", "\n").replace("\n", "\r\n")
-				+ ".\r\n";
-		out.print(sendM);
-		out.flush();
-		readResponse(in);
-		out.print("QUIT\n");
-		out.flush();
-		readResponse(in);
-		smtp.close();
-	}
-	private static void readResponse(BufferedReader in) throws IOException {
-		String line;
-		while ((line = in.readLine()) != null && line.matches("\\d+-")) {
-		}
+    private static void readResponse(BufferedReader in) throws IOException {
+        String line;
+        while ((line = in.readLine()) != null && line.matches("\\d+-")) {
+            System.out.println(line);
+        }
 
-	}
+    }
 
 }