X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fibex%2Fmail%2FMain.java;h=4d0659b59a9960dbb3d3a4c8bfe6ec0e0ed16ad5;hb=7946ff49a5c3169b7581d8583ef3a30a4b36ca4d;hp=f354734c415d0e77e648d023594eaf7a1d83ec70;hpb=9a82f176e6cd96b6a2dc081a27ef124ce23d3307;p=org.ibex.mail.git

diff --git a/src/org/ibex/mail/Main.java b/src/org/ibex/mail/Main.java
index f354734..4d0659b 100644
--- a/src/org/ibex/mail/Main.java
+++ b/src/org/ibex/mail/Main.java
@@ -16,8 +16,12 @@ import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocket;
 
+// restrict the maximum number of open connections from any given source IP (probably max 4)
 public class Main {
 
+    public static final ThreadPool threadPool = new ThreadPool(10);
+    public static final Cron       cron       = new Cron(threadPool);
+
     public static void main(String[] s) throws Exception {
         try {
             File f = new File(Mailbox.STORAGE_ROOT + "/restart");
@@ -43,20 +47,19 @@ public class Main {
         ServerSocket sock563  = (ServerSocket) sslserversocketfactory.createServerSocket(563);
         //ServerSocket sock995  = new ServerSocket(995);
         //ServerSocket sock113  = new ServerSocket(113);
-        new Thread() {
+
+        cron.executeLater(500, new Runnable() {
             public void run() {
-                while(true) {
-                    try { Thread.sleep(500); } catch (Exception e) { }
-                    try {
-                        File f = new File(Mailbox.STORAGE_ROOT + "/restart");
-                        if (f.exists()) {
-                            Log.error("RESTART", "restarting...");
-                            System.exit(0);
-                        }
-                    } catch (Exception e) { Log.error(this, e); }
-                }
-            }
-        }.start();
+                try {
+                    File f = new File(Mailbox.STORAGE_ROOT + "/restart");
+                    if (f.exists()) {
+                        Log.error("RESTART", "restarting...");
+                        System.exit(0);
+                    }
+                } catch (Exception e) { Log.error(this, e); }
+                cron.executeLater(500, this);
+            } });
+            
         new Acceptor(sock143).start();
         new Acceptor(sock119).start();
         new Acceptor(sock25).start();
@@ -72,22 +75,22 @@ public class Main {
         private ServerSocket ss;
         public Acceptor(ServerSocket ss) { this.ss = ss; }
         public void run() {
-            try {
-                ss.setReuseAddress(true);
-
-                while(true) {
+            while(true) {
+                try {
+                    ss.setReuseAddress(true);
                     final Socket s = ss.accept();
-                    try {
-                        new Thread() {
-                            public void run() {
-                                try {
-                                    accept(new Connection(s, "megacz.com"));
-                                } catch (Exception e) { Log.error(Main.class, e); }
-                            }
-                        }.start();
-                    } catch (Exception e) { Log.error(Main.class, e); }
+                    threadPool.start(new Runnable() {
+                        public void run() {
+                            try {
+                                accept(new Connection(s, "megacz.com"));
+                            } catch (Throwable t) { Log.error(Main.class, t); }
+                        }
+                    });
+                } catch (Throwable t) {
+                    Log.error(Main.class, t);
+                    Misc.sleep(1000);
                 }
-            } catch (Exception e) { Log.error(Main.class, e); }
+            }
         }
     }
 
@@ -113,16 +116,16 @@ public class Main {
         }
     }
 
-    private static final Auth auth = new Auth();
-    private static class Auth implements Login {
-        private KerberosAuth ka = new KerberosAuth("MEGACZ.COM", "godel.megacz.com");
+    static final Auth auth = new Auth();
+    static class Auth implements Login {
+        private KerberosAuth ka = new KerberosAuth("MEGACZ.COM", "chaitin.megacz.com");
         public Account anonymous() {
             try {
-                final Mailbox root =
+                final MailTree root =
                     FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT + "/list", false);
                 if (root==null) return null;
-                return new Account("anonymous", null, root){
-                    public Mailbox getMailbox(Class protocol) {
+                return new Account("anonymous", null, root) {
+                    public MailTree getMailbox(Class protocol) {
                         return super.getMailbox(protocol);
                     }
                 };
@@ -130,15 +133,13 @@ public class Main {
         }
         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 =
+            //if (!EtcPasswd.verify(user, pass)) return null;
+            //if (!CheckPassword.verify(user, pass)) return null;
+            if (!ka.auth(user, pass)) return null;
+            final MailTree root =
                 FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT + "/user", true);
             return new Account(user, null, root.slash(user, true)){
-                    public Mailbox getMailbox(Class protocol) {
+                    public MailTree getMailbox(Class protocol) {
                         return super.getMailbox(protocol);
                     }
                 };