FIX: Typo

[gigi.git] / src / org / cacert / gigi / email / EmailProvider.java

diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java
index 3ccac586e24a47ce7794e3d87169a261d781a964..8e1881332101ae4bb5630d71a8c05115f23f9e8b 100644 (file)
--- a/src/org/cacert/gigi/email/EmailProvider.java
+++ b/src/org/cacert/gigi/email/EmailProvider.java
@@ -5,13 +5,21 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.Socket;
+import java.security.GeneralSecurityException;
+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.Properties;
 import java.util.regex.Pattern;
 
+import javax.naming.NamingException;
+
+import org.cacert.gigi.crypto.SMIME;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.util.DNSUtil;
 
 public abstract class EmailProvider {
 
@@ -19,6 +27,19 @@ public abstract class EmailProvider {
 
     private static EmailProvider instance;
 
+    private X509Certificate c;
+
+    private PrivateKey k;
+
+    protected final 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);
+    }
+
     public static EmailProvider getInstance() {
         return instance;
     }
@@ -27,10 +48,12 @@ public abstract class EmailProvider {
         EmailProvider.instance = instance;
     }
 
-    public static void init(Properties conf) {
+    public static void initSystem(Properties conf, Certificate cert, Key pk) {
         try {
             Class<?> c = Class.forName(conf.getProperty("emailProvider"));
-            instance = (EmailProvider) c.getDeclaredConstructor(Properties.class).newInstance(conf);
+            EmailProvider ep = (EmailProvider) c.getDeclaredConstructor(Properties.class).newInstance(conf);
+            ep.init(cert, pk);
+            instance = ep;
         } catch (ReflectiveOperationException e) {
             e.printStackTrace();
         }
@@ -47,7 +70,12 @@ public abstract class EmailProvider {
             String[] parts = address.split("@", 2);
             String domain = parts[1];
 
-            LinkedList<String> mxhosts = getMxHosts(domain);
+            String[] mxhosts;
+            try {
+                mxhosts = DNSUtil.getMXEntries(domain);
+            } catch (NamingException e1) {
+                return "MX lookup for your hostname failed.";
+            }
 
             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())) {
@@ -113,21 +141,4 @@ public abstract class EmailProvider {
         return FAIL;
     }
 
-    private static LinkedList<String> getMxHosts(String domain) throws IOException {
-        LinkedList<String> mxhosts = new LinkedList<String>();
-        Process dig = Runtime.getRuntime().exec(new String[] {
-                "dig", "+short", "MX", domain
-        });
-        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));
-            }
-        }
-        return mxhosts;
-    }
 }