X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Femail%2FEmailProvider.java;h=6834d461d0060c850438491de3c5246995c4f2a9;hp=e82a44d72f0571f09ad3423864711a4120b1386e;hb=680b03f826182ea5d743b9fa6bc4b5b16e001e10;hpb=fd17f68ac74d7b0f3e7a1ede403ec773fc452509 diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java index e82a44d7..6834d461 100644 --- a/src/org/cacert/gigi/email/EmailProvider.java +++ b/src/org/cacert/gigi/email/EmailProvider.java @@ -3,6 +3,7 @@ package org.cacert.gigi.email; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.net.Socket; import java.security.GeneralSecurityException; @@ -10,18 +11,22 @@ import java.security.Key; import java.security.PrivateKey; import java.security.cert.Certificate; import java.security.cert.X509Certificate; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.LinkedList; +import java.util.Arrays; +import java.util.Comparator; import java.util.Properties; import java.util.regex.Pattern; +import javax.naming.NamingException; +import javax.net.ssl.SSLSocketFactory; + import org.cacert.gigi.crypto.SMIME; -import org.cacert.gigi.database.DatabaseConnection; +import org.cacert.gigi.database.GigiPreparedStatement; +import org.cacert.gigi.util.DNSUtil; +import org.cacert.gigi.util.DomainAssessment; public abstract class EmailProvider { - public abstract void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException; + public abstract void sendMail(String to, String subject, String message, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException; private static EmailProvider instance; @@ -29,13 +34,19 @@ public abstract class EmailProvider { private PrivateKey k; - protected final void init(Certificate c, Key k) { + protected void init(Certificate c, Key k) { this.c = (X509Certificate) c; this.k = (PrivateKey) k; } protected final void sendSigned(String contents, PrintWriter output) throws IOException, GeneralSecurityException { - SMIME.smime(contents, k, c, output); + if (k == null || c == null) { + output.println("Content-Transfer-Encoding: base64"); + output.println(); + output.print(contents); + } else { + SMIME.smime(contents, k, c, output); + } } public static EmailProvider getInstance() { @@ -61,56 +72,102 @@ public abstract class EmailProvider { public static final String FAIL = "FAIL"; - public static final Pattern MAIL = Pattern.compile("^([a-zA-Z0-9])+([a-zA-Z0-9\\+\\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\\._-]+)+$"); + private static final String MAIL_P_RFC_WORD = "[A-Za-z0-9\\+\\.!#$%&'*/=?^_`|~{}-]+"; + + private static final String MAIL_P_RFC_LOCAL = MAIL_P_RFC_WORD + "(?:\\." + MAIL_P_RFC_WORD + ")*"; + + private static final String MAIL_P_RFC_LABEL = "(?!(?!xn)..--|-)(?:[A-Za-z0-9-]+)(? mxhosts = getMxHosts(domain); + String[] mxhosts; + try { + mxhosts = DNSUtil.getMXEntries(domain); + } catch (NamingException e1) { + return "MX lookup for your hostname failed."; + } + sortMX(mxhosts); for (String host : mxhosts) { - try (Socket s = new Socket(host, 25); BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream())); PrintWriter pw = new PrintWriter(s.getOutputStream())) { + host = host.split(" ", 2)[1]; + if (host.endsWith(".")) { + host = host.substring(0, host.length() - 1); + } else { + return "Strange MX records."; + } + try (Socket s = new Socket(host, 25); + BufferedReader br0 = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8"));// + PrintWriter pw0 = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"))) { + BufferedReader br = br0; + PrintWriter pw = pw0; String line; - while ((line = br.readLine()) != null && line.startsWith("220-")) { - } - if (line == null || !line.startsWith("220")) { + if ( !SendMail.readSMTPResponse(br, 220)) { continue; } - pw.print("HELO www.cacert.org\r\n"); + pw.print("EHLO www.cacert.org\r\n"); pw.flush(); - - while ((line = br.readLine()) != null && line.startsWith("220")) { + boolean starttls = false; + do { + line = br.readLine(); + if (line == null) { + break; + } + starttls |= line.substring(4).equals("STARTTLS"); + } while (line.startsWith("250-")); + if (line == null || !line.startsWith("250 ")) { + continue; } - if (line == null || !line.startsWith("250")) { - continue; + if (starttls) { + pw.print("STARTTLS\r\n"); + pw.flush(); + if ( !SendMail.readSMTPResponse(br, 220)) { + continue; + } + Socket s1 = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(s, host, 25, true); + br = new BufferedReader(new InputStreamReader(s1.getInputStream(), "UTF-8")); + pw = new PrintWriter(new OutputStreamWriter(s1.getOutputStream(), "UTF-8")); + pw.print("EHLO www.cacert.org\r\n"); + pw.flush(); + if ( !SendMail.readSMTPResponse(br, 250)) { + continue; + } } + pw.print("MAIL FROM: \r\n"); pw.flush(); - line = br.readLine(); - - if (line == null || !line.startsWith("250")) { + if ( !SendMail.readSMTPResponse(br, 250)) { continue; } pw.print("RCPT TO: <" + address + ">\r\n"); pw.flush(); - line = br.readLine(); + if ( !SendMail.readSMTPResponse(br, 250)) { + continue; + } pw.print("QUIT\r\n"); pw.flush(); + if ( !SendMail.readSMTPResponse(br, 221)) { + continue; + } - try { - PreparedStatement statmt = DatabaseConnection.getInstance().prepare("insert into `pinglog` set `when`=NOW(), `email`=?, `result`=?, `uid`=?"); + try (GigiPreparedStatement statmt = new GigiPreparedStatement("INSERT INTO `emailPinglog` SET `when`=NOW(), `email`=?, `result`=?, `uid`=?, `type`='fast', `status`=?::`pingState`")) { statmt.setString(1, address); statmt.setString(2, line); statmt.setInt(3, forUid); + statmt.setString(4, "success"); statmt.execute(); - } catch (SQLException e) { - e.printStackTrace(); } if (line == null || !line.startsWith("250")) { @@ -122,33 +179,49 @@ public abstract class EmailProvider { } } - try { - PreparedStatement statmt = DatabaseConnection.getInstance().prepare("insert into `pinglog` set `when`=NOW(), `email`=?, `result`=?, `uid`=?"); + try (GigiPreparedStatement statmt = new GigiPreparedStatement("INSERT INTO `emailPinglog` SET `when`=NOW(), `email`=?, `result`=?, `uid`=?, `type`='fast', `status`=?::`pingState`")) { statmt.setString(1, address); statmt.setString(2, "Failed to make a connection to the mail server"); statmt.setInt(3, forUid); + statmt.setString(4, "failed"); statmt.execute(); - } catch (SQLException e) { - e.printStackTrace(); } return FAIL; } - private static LinkedList getMxHosts(String domain) throws IOException { - LinkedList mxhosts = new LinkedList(); - Process dig = Runtime.getRuntime().exec(new String[] { - "dig", "+short", "MX", domain + private static void sortMX(String[] mxhosts) { + Arrays.sort(mxhosts, new Comparator() { + + @Override + public int compare(String o1, String o2) { + int i1 = Integer.parseInt(o1.split(" ")[0]); + int i2 = Integer.parseInt(o2.split(" ")[0]); + return Integer.compare(i1, i2); + } }); - try (BufferedReader br = new BufferedReader(new InputStreamReader(dig.getInputStream()))) { - String line; - while ((line = br.readLine()) != null) { - String[] mxparts = line.split(" ", 2); - if (mxparts.length != 2) { - continue; - } - mxhosts.add(mxparts[1].substring(0, mxparts[1].length() - 1)); + } + + public static boolean isValidMailAddress(String address) { + if ( !MAIL_ADDRESS.matcher(address).matches()) { + return false; + } + + String[] parts = address.split("@", 2); + + String local = parts[0]; + String domain = parts[1]; + + if ( !MAIL_LOCAL.matcher(local).matches()) { + return false; + } + + for (String domainPart : domain.split("\\.", -1)) { + if ( !DomainAssessment.isValidDomainPart(domainPart)) { + return false; } } - return mxhosts; + + return true; } + }