added SSL connections, improved error handling

darcs-hash:20070228064952-5007d-a2c0e2d0e10fe074617a1ac68561d6323c1341ef.gz

diff --git a/src/org/ibex/mail/Main.java b/src/org/ibex/mail/Main.java
index 0638a33..8bfa8c1 100644 (file)
--- a/src/org/ibex/mail/Main.java
+++ b/src/org/ibex/mail/Main.java
@@ -6,7 +6,6 @@ package org.ibex.mail;
 import org.ibex.mail.target.*;
 import org.ibex.mail.protocol.*;
 import org.ibex.util.*;
-import org.ibex.jinetd.*;
 import org.ibex.jetty.*;
 import org.ibex.io.*;
 import java.io.*;
@@ -14,8 +13,11 @@ import java.net.*;
 import java.util.*;
 import org.ibex.crypto.*;
 import org.ibex.jetty.*;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
 
-public class Main implements Listener {
+public class Main {
 
     public static void main(String[] s) throws Exception {
         try {
@@ -26,9 +28,22 @@ public class Main implements Listener {
     }
 
     public void main() throws Exception {
-        ServerSocket sock143 = new ServerSocket(143);
-        ServerSocket sock119 = new ServerSocket(119);
-        ServerSocket sock25  = new ServerSocket(25);
+        if (System.getProperty("javax.net.ssl.keyStore")==null)
+            System.setProperty("javax.net.ssl.keyStore", Mailbox.STORAGE_ROOT+"/conf/ssl/ssl.keystore");
+        if (System.getProperty("javax.net.ssl.keyStorePassword")==null)
+            System.setProperty("javax.net.ssl.keyStorePassword", "changeit");
+        SSLServerSocketFactory sslserversocketfactory =
+            (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
+        ServerSocket sslserversocket =
+            (ServerSocket) sslserversocketfactory.createServerSocket(9999);
+        ServerSocket sock143  = new ServerSocket(143);
+        ServerSocket sock119  = new ServerSocket(119);
+        ServerSocket sock25   = new ServerSocket(25);
+        ServerSocket sock8025 = new ServerSocket(8025);
+        ServerSocket sock993  = new ServerSocket(993);
+        ServerSocket sock563  = new ServerSocket(563);
+        //ServerSocket sock995  = new ServerSocket(995);
+        //ServerSocket sock113  = new ServerSocket(113);
         new Thread() {
             public void run() {
                 while(true) {
@@ -46,6 +61,11 @@ public class Main implements Listener {
         new Acceptor(sock143).start();
         new Acceptor(sock119).start();
         new Acceptor(sock25).start();
+        new Acceptor(sock8025).start();
+        new Acceptor(sock993).start();
+        new Acceptor(sock563).start();
+        //new Acceptor(sock995).start();
+        //new Acceptor(sock113).start();
     }
 
     private class Acceptor extends Thread {
@@ -69,15 +89,21 @@ public class Main implements Listener {
         }
     }
 
-    public boolean accept(Connection conn) {
+    public void accept(Connection conn) {
         try {
             if      (conn.getLocalPort() == 143)  new IMAP.Listener(auth).handleRequest(conn);
+            else if (conn.getLocalPort() == 993)  new IMAP.Listener(auth).handleRequest(conn);
             else if (conn.getLocalPort() == 119)  new NNTP.Listener(auth).handleRequest(conn);
+            else if (conn.getLocalPort() == 563)  new NNTP.Listener(auth).handleRequest(conn);
             else if (conn.getLocalPort() == 25)   new SMTP.Server().handleRequest(conn);
+            else if (conn.getLocalPort() == 8025) SMTP.whitelist.handleRequest(conn);
             //else if (conn.getLocalPort() == 110)  new POP3.Listener(auth).handleRequest(conn);
+            //else if (conn.getLocalPort() == 995)  new POP3.Listener(auth).handleRequest(conn);
             //else if (conn.getLocalPort() == 8099) GMail.handleRequest(conn);
-           else return false;
-           return true;
+        } catch (Stream.Closed c) {
+            Log.error(this, "connection abruptly closed by client");
+        } catch (IOException e) {
+            Log.error(this, e);
         } finally {
             conn.close();
         }
@@ -85,6 +111,7 @@ public class Main implements Listener {
 
     private static final Auth auth = new Auth();
     private static class Auth implements Login {
+        private KerberosAuth ka = new KerberosAuth("MEGACZ.COM", "godel.megacz.com");
         public Account anonymous() {
             try {
                 final Mailbox root =
@@ -100,6 +127,10 @@ public class Main implements Listener {
         public Object login(String user, String pass, Class protocol) { return login(user, pass); }
         public Account login(String user, String pass) {
             if (!EtcPasswd.verify(user, pass)) return null;
+
+            // currently broken, but should be used
+            //if (!ka.auth(user, pass)) return null;
+
             final Mailbox root =
                 FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT + "/user", true);
             return new Account(user, null, root.slash(user, true)){