Changeset 183

Timestamp:

02/23/08 01:20:15 (11 months ago)

Author:

jfp

Message:

cleanup/refact

Files:

• trunk/jsmtpd/src/org/jsmtpd/Controler.java (modified) (14 diffs)
• trunk/jsmtpd/src/org/jsmtpd/GetOpt.java (modified) (1 diff)
• trunk/jsmtpd/src/org/jsmtpd/config/PluginLoader.java (modified) (16 diffs)
• trunk/jsmtpd/src/org/jsmtpd/config/ReadConfig.java (modified) (3 diffs)
• trunk/jsmtpd/src/org/jsmtpd/core/common/PluginStore.java (modified) (1 diff)
• trunk/jsmtpd/src/org/jsmtpd/core/common/smtpExtension/ISmtpExtension.java (modified) (2 diffs)
• trunk/jsmtpd/src/org/jsmtpd/core/mail/Email.java (modified) (7 diffs)
• trunk/jsmtpd/src/org/jsmtpd/core/mail/EmailAddress.java (modified) (5 diffs)
• trunk/jsmtpd/src/org/jsmtpd/core/mail/InvalidAddress.java (modified) (1 diff)
• trunk/jsmtpd/src/org/jsmtpd/core/mail/Rcpt.java (modified) (5 diffs)
• trunk/jsmtpd/src/org/jsmtpd/core/receive/Receiver.java (modified) (1 diff)
• trunk/jsmtpd/src/org/jsmtpd/core/receive/ReceiverWorkerImpl.java (modified) (1 diff)
• trunk/jsmtpd/src/org/jsmtpd/core/send/DeliveryPicker.java (modified) (2 diffs)
• trunk/jsmtpd/src/org/jsmtpd/core/send/DeliveryWorker.java (modified) (2 diffs)
• trunk/jsmtpd/src/org/jsmtpd/core/send/QueueService.java (modified) (1 diff)
• trunk/jsmtpd/src/org/jsmtpd/plugins/AbstractRblPlugin.java (moved) (moved from trunk/jsmtpd/src/org/jsmtpd/plugins/GenericRBLFilter.java) (4 diffs)
• trunk/jsmtpd/src/org/jsmtpd/plugins/acls/LdapACL.java (modified) (1 diff)
• trunk/jsmtpd/src/org/jsmtpd/plugins/inputIPFilters/BlackList.java (modified) (4 diffs)
• trunk/jsmtpd/src/org/jsmtpd/plugins/inputIPFilters/RBLFilter.java (modified) (3 diffs)
• trunk/jsmtpd/src/org/jsmtpd/plugins/smtpExtension/ConnectBackCheck.java (deleted)
• trunk/jsmtpd/src/org/jsmtpd/plugins/smtpExtension/RblCheck.java (modified) (4 diffs)
• trunk/jsmtpd/src/org/jsmtpd/plugins/smtpExtension/SmtpAuthenticator.java (modified) (1 diff)
• trunk/jsmtpd/src/org/jsmtpd/tools/cache/SimpleCache.java (modified) (1 diff)

trunk/jsmtpd/src/org/jsmtpd/Controler.java

@@ -42 +42 @@
-
-/**
- * 
- * Initialises config & plugins<br>
- * Starts and shutdown listening service and delivery service<br>
- * TODO: Check paths, rebuild them, ensure they are writable<br>
- * @author Jean-Francois POUX
- */
-public class Controler extends Thread {
-    /**
-     * Log4j instance
-     */
-    private Log log = LogFactory.getLog(Controler.class);
-
-
-
-
-
+
-    private SslReceiver sslReceiver = null;
-    /**
-     * mail delivery services
-     */
-    private DeliveryPicker delivery = null;
-
-    private String configFile = "etc/jsmtpd.ini";
-    
-    private String xmlPluginFileName = "jsmtpd-plugin-config.xml";
-    
@@ -75 +62 @@
-        }
-    }
-public void startup()
-
+
+public void startup() 
-        Runtime.getRuntime().addShutdownHook(this);
-Environement
+
-            System.exit(-1);
-            return;
@@ -96 +83 @@
-    }
-
-    /**
-     * Initialises the delivery services
-     *
-     */
-    public boolean initDeliveryService() {
-        try {
-            delivery = new DeliveryPicker();
-
-
-
-
-
+
-            return false;
-        }
@@ -114 +93 @@
-    }
-
-
-
-
-
-
-
+
-        try {
-                ReadConfig.getInstance().loadConfig(configFile);
@@ -134 +108 @@
-        // Init plugin Loader
-
-ld
-ld
-
-ld
+pluginLoade
+pluginLoade
+
+pluginLoade
-        } catch (SAXException e2) {
-            log.fatal("Parse error in plugin-config.xml, " + e2.getMessage());
@@ -152 +126 @@
-        }
-
-
-
-
+
+
-        } catch (PluginLoaderException e) {
-            log.fatal("DNSService could not be loaded, " + e.getMessage(),e);
@@ -161 +134 @@
-        log.info("DNS Service plugin loaded : " + PluginStore.getInstance().getResolver().getPluginName());
-
-
-
-
+
+
-        } catch (PluginLoaderException e) {
-            log.fatal("ACL plugin could not be loaded, " + e.getMessage(),e);
@@ -170 +142 @@
-        log.info("ACL Service plugin loaded : " + PluginStore.getInstance().getAcl().getPluginName());
-
-
-
-
+
+
-        } catch (PluginLoaderException e) {
-            log.fatal("LocalDeliveryService plugin could not be loaded, " + e.getMessage(),e);
@@ -179 +150 @@
-        log.info("Local Delivery Service plugin loaded : " + PluginStore.getInstance().getLocalDeliveryService().getPluginName());
-
-
-
-
+
+
-        } catch (PluginLoaderException e) {
-            log.fatal("RemoteDeliveryService plugin could not be loaded, " + e.getMessage(),e);
@@ -188 +158 @@
-        log.info("Remote Delivery Service plugin loaded : " + PluginStore.getInstance().getRemoteDeliveryService().getPluginName());
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            return false;
-        } 
@@ -209 +178 @@
-
-        try {
-ld
+pluginLoade
-        } catch (ModuleNotFoundException e4) {
-            log.fatal( "Error while loading input IP filter chain , " + e4.getModName()
-                    + " is declared in the inputIPFilter, but not configured in filtersetup");
-
-
-
-
-
-
+
+
+
+
+
-        } catch (ModuleNotFoundException e1) {
-            log.fatal("Error while loading filter tree, " + e1.getModName()
@@ -227 +195 @@
-    }
-
-    /**
-     * Starts the receiver services
-     */
-    public boolean initReceiver() {
-        try {
-
+eiver
-            if ("on".equals(ReadConfig.getInstance().getProperty("ssl"))) {
-                int sslPort = Integer.parseInt(ReadConfig.getInstance().getProperty("sslPort"));
@@ -248 +213 @@
-    }
-
-
-
-
-
-
-
-
+
+
+
-        }
-
@@ -277 +238 @@
-    }
-
-    /**
-     * Shutdown hook invoked on VM shutdown
-     */
-    public void run() {
-Services
+
-    }
-

trunk/jsmtpd/src/org/jsmtpd/GetOpt.java

@@ -30 +30 @@
-public class GetOpt extends HashMap<String,String> {
-    
-
-
+
-        if (args==null)
-            return;

trunk/jsmtpd/src/org/jsmtpd/config/PluginLoader.java

@@ -26 +26 @@
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jsmtpd.core.common.IGenericPlugin;
-import org.jsmtpd.core.common.PluginInitException;
-import org.jsmtpd.core.common.PluginLoadingException;
-import org.jsmtpd.core.common.PluginStore;
-import org.jsmtpd.core.common.acl.IACL;
@@ -53 +50 @@
-
-/**
-and stores them in the pluginstore
+using reflection
- * @author Jean-Francois POUX
- * @see org.jsmtpd.core.common.PluginStore
- */
-public class PluginLoader implements ErrorHandler {
-
-    /**
-     * Loaded plugins are stored in this instance
-     */
-    private PluginStore store = PluginStore.getInstance();
-
-    /**
-     * To catch parse errors at end of init
-     */
-    private SAXParseException lastEx = null;
-
-    /**
-     * DOM document instance of plugin config file
-     */
-    private Document document;
-    /**
-     * This is the root node of the filter tree
-     */
-    private FilterTreeNode filterRoot = null;
-    /**
-     * Log4j instance
-     */
-    private Log log = LogFactory.getLog(PluginLoader.class);
-
@@ -124 +104 @@
-    }
-
-    /**
-     * Loads the DNS plugin
-     * @throws PluginLoaderException
-     */
-    public void loadDNSService() throws PluginLoaderException {
-
-        NodeList tmp = document.getElementsByTagName("DNSSetup");
-        Node dnsset = tmp.item(0);
@@ -143 +118 @@
-    }
-
-    /**
-     * Loads the local delivery service
-     * @throws PluginLoaderException
-     */
-
-    public void loadLocalDeliveryService() throws PluginLoaderException {
-
@@ -163 +133 @@
-    }
-
-    /**
-     * loads the remote delivery service
-     * @throws PluginLoaderException
-     */
-    public void loadRemoteDeliveryService() throws PluginLoaderException {
-
@@ -182 +148 @@
-    }
-
-    /**
-     * Load the acl plugin
-     * @throws PluginLoaderException
-     */
-    public void loadACL() throws PluginLoaderException {
-
@@ -233 +195 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
+
-        NodeList childs = node.getChildNodes();
-        if (childs == null)
-//has no child ?
+
-
-        for (int i = 0; i < childs.getLength(); i++) {
-            Node tmp = childs.item(i);
-
-mp.getNodeName().equals("true")
-NodeList tchilds = tmp.getChildNodes();
-if (tchilds != null) {
-for (int j = 0; j < tchilds.getLength(); j++
-ode ch = tchilds.item(j
-if (ch.getNodeName().equals("filter")) {
-    NamedNodeMap mp = ch.getAttributes(
-    String modName = mp.getNamedItem("name").getNodeValue(
-    log.debug("[tree] adding " + modName + " as true node to node " + pNode.getFilter().getPluginName());
-GenericPlugin plugin = (IGenericPlugin) PluginStore.getInstance().getPluginByLogicalName(modName)
-if (plugin instanceof IFilter) {
-    IFilter flt = (IFilter) plugin
-    FilterTreeNode newNode = new FilterTreeNode();
-    newNode.setFilter(flt
-    pNode.setTrueNode(newNode);
-    newNode.setParent(p
-    appendFilterTreeNode(ch, new
-} else {
-        log.debug( "The filter " + modName + " is not a body filter tree plugin !");
-    throw new ModuleNotFoundException(modName
-}
+
+childs != null
+for (int j = 0; j < tchilds.getLength(); j++) {
+    Node ch = tchilds.item(j);
+if (ch.getNodeName().equals("filter")
+amedNodeMap mp = ch.getAttributes(
+String modName = mp.getNamedItem("name").getNodeValue();
+log.debug("[tree] adding " + modName + " as "+tmp.getNodeName()+" node to node " + parentNode.getFilter().getPluginName()
+IGenericPlugin plugin = (IGenericPlugin) PluginStore.getInstance().getPluginByLogicalName(modName
+if (plugin instanceof IFilter) {
+Filter flt = (IFilter) plugin
+FilterTreeNode newNode = new FilterTreeNode();
+newNode.setFilter(flt)
+if (tmp.getNodeName().equals("true"))
+   parentNode.setTrueNode(newNode
+else
+   parentNode.setFalseNode(new
+newNode.setParent(parent
+appendFilterTreeNode(ch, newNode);
+} else {
+log.debug( "The filter " + modName + " is not a body filter tree plugin !"
+throw new ModuleNotFoundException(modName);
-                        }
-                    }
-                }
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    public void loadFilters() throws PluginLoaderException {
-        NodeList tmp = document.getElementsByTagName("filtersetup");
-        Node filterSetup = tmp.item(0);
-
-        NodeList filters = filterSetup.getChildNodes();
-
-        for (int i = 0; i < filters.getLength(); i++) {
-            Node current = filters.item(i);
@@ -335 +252 @@
-            }
-        }
-
-
-
-
-
-
-
+
+
-    public void loadInputIPFilterChain() throws ModuleNotFoundException {
-        NodeList tmp = document.getElementsByTagName("inputIPFilterChain");
-        Node treeRoot = tmp.item(0);
-
-        NodeList childs = treeRoot.getChildNodes();
-        for (int i = 0; i < childs.getLength(); i++) {
@@ -369 +280 @@
-        NodeList tmp = document.getElementsByTagName("smtpExtensions");
-        Node treeRoot = tmp.item(0);
-
-        NodeList childs = treeRoot.getChildNodes();
-        for (int i = 0; i < childs.getLength(); i++) {
@@ -397 +307 @@
-    }
-
-    /**
-     * Load a generic plugin (any services/filters)
-     * @param className the class name to use
-     * @param pNode node in the xml (will determine it's propertyset childs and apply them)
-     * @return the plugin instance configured
-     * @throws PluginLoadingException
-     * @throws IllegalArgumentException
-     * @throws MethodNotFoundException
-     * @throws MethodParameterNotSupported
-     * @throws IllegalAccessException
-     * @throws InvocationTargetException
-     */
-    private IGenericPlugin loadGenericPlugin(String className, Node pNode) throws PluginLoaderException {
-
@@ -423 +321 @@
-
-        NodeList tmp = pNode.getChildNodes();
-        //Apply each propertySet 
-        for (int i = 0; i < tmp.getLength(); i++) {
-            Node cur = tmp.item(i);
@@ -435 +332 @@
-    }
-
-    /**
-     * Queries the class to find out the function to use
-     * Sets a parameter (eg propertyset in the xml config file) to an instance of plugin
-     * @param plug the plugin instance
-     * @param name name of the parameter
-     * @param value the string value of the parameter, another method will do the casts if necessary
-     * @throws PluginLoaderException
-     */
-    private void setParam(IGenericPlugin plug, String name, String value) throws PluginLoaderException {
-        String rName = name.substring(0,1).toUpperCase()+name.substring(1);
@@ -451 +340 @@
-    }
-
-    /**
-     * Performs a recursive method lookup throught parent classes (extended)
-     * @param clazz originating class
-     * @param methodName
-     * @return the method when found
-     * @throws MethodNotFoundException
-     */
-    private Method methodLookup(Class clazz, String methodName) throws PluginLoaderException {
-        Method[] meths = clazz.getDeclaredMethods();
@@ -482 +364 @@
-    }
-
-    /**
-     * invoques a setPropertyName, casts the string value to something required by reflection
-     * @param plug plugin instance
-     * @param meth name of the method (will determine the cast needed)
-     * @param value value to apply
-     * @throws MethodParameterNotSupported
-     * @throws IllegalArgumentException
-     * @throws IllegalAccessException
-     * @throws InvocationTargetException
-     */
-    private void invoke(IGenericPlugin plug, Method meth, String value) throws PluginLoaderException {
-        Class[] params = meth.getParameterTypes();
@@ -504 +376 @@
-
-            if (params[0].getName().equals("int")) {
- //note: this is correct, the invoke() will cast Interger to int type
+
-                meth.invoke(plug, effectiveParams);
-                return;
@@ -510 +382 @@
-
-            if (params[0].getName().equals("boolean")) {
- //note: this is correct, the invoke() will cast Boolean to boolean type
+
-                meth.invoke(plug, effectiveParams);
-                return;

trunk/jsmtpd/src/org/jsmtpd/config/ReadConfig.java

@@ -25 +25 @@
-
-/**
- * 
- * Loads the config file<br>
- * Should be initialised in thread safe environnement<br>
@@ -41 +40 @@
-    }
-
-    /**
-     * 
-     * @param configFile the configuration file path used
-     * @throws ConfigErrorException when it can't load its config file
-     */
-    public void loadConfig(String configFile) throws ConfigErrorException {
-        try {
@@ -61 +55 @@
-        return Boolean.parseBoolean(getProperty(name));
-    }
-    
-    /**
-     * 
-     * @return true if in safe mode, false otherwise
-     */
-    public boolean getSafeMode() {
-        if (getProperty("safeMode", "on").trim().equals("on"))
-            return true;
-        return false;
-    }    
-}

trunk/jsmtpd/src/org/jsmtpd/core/common/PluginStore.java

@@ -49 +49 @@
-    private List<ISmtpExtension> smtpExtensions = new LinkedList<ISmtpExtension>();
-
-
-
-
+
-
-    public void addPlugin(IGenericPlugin module, String logicalName) {

trunk/jsmtpd/src/org/jsmtpd/core/common/smtpExtension/ISmtpExtension.java

@@ -46 +46 @@
-     * @return true if command has been handled
-     */
-
-
+
-
-    /**
@@ -65 +64 @@
-     * @throws IOException
-     * @throws InputSizeToBig
-     * @throws IOException
-     * @throws BareLFException
-     */
-
-
+
-}

trunk/jsmtpd/src/org/jsmtpd/core/mail/Email.java

@@ -94 +94 @@
-    }
-
-    /**
-     * Adds a recipient
-     */
-    public void addRcpt(EmailAddress in) {
-        rcpt.add(new Rcpt(in));
-    }
-
-    /**
-     * get the reception date
-     * @return reception data
-     */
-    public Date getArrival() {
-        return arrival;
@@ -136 +129 @@
-        return rcpt;
-    }
-
-
-
-
-
+
-    public String getRcptAsString() {
-        String rcp = "";
@@ -149 +138 @@
-    }
-
-    /**
-     * Dump for debugging
-     */
-    public String toString() {
-        String out = "Message Dump\n";
-
-        out += "Received on " + arrival + " From " + receivedFrom + "\n";
-        out += "Attempts :" + attemps + "\n";
@@ -163 +148 @@
-            out += "RCPT: " + re.getEmailAddress().toString() + "\n";
-        }
-
-        return out;
-    }
@@ -181 +165 @@
-    }
-
-    /**
-     * Saves the mail on disk
-     * @param fileName filename to use
-     * @param e the mail instance to save
-     * @throws IOException
-     */
-    public static void save(String fileName, Email e) throws IOException {
-        ObjectOutput out = new ObjectOutputStream(new FileOutputStream(fileName));
@@ -193 +171 @@
-    }
-
-    /**
-     * Creates an instance from a file on disk
-     * @param fileName the name of the serialized email
-     * @return the instance
-     * @throws IOException
-     */
-    public static Email load(String fileName) throws IOException {
-        RandomAccessFile fp = new RandomAccessFile(fileName, "r");
@@ -224 +196 @@
-        return true;    }
-
-    /**
-     * acces to the data buffer
-     * @return the buffer containing the mail
-     */
-    public byte[] getDataAsByte() {
-        return dataBuffer;
-    }
-
-    /**
-     * Convenient method to create an error message, as long as message parsing/processing tools are not thoughts yet ;)
-     * @param to recipient
-     * @param subject 
-     * @param mailMessages a linkedlist of strings of the error message
-     * @param attach not implemented, but will attach a copy of the mail generating the error
-     * @return the error Email instance
-     */
-    public static Email createInternalMail(EmailAddress to, String subject, LinkedList<String> mailMessages, Email attach) {
-        Email e = new Email();

trunk/jsmtpd/src/org/jsmtpd/core/mail/EmailAddress.java

@@ -63 +63 @@
-        
-        String[] res = mailPart.split("@");
-
-     
-        
-        if ((res[0].length() > 512) || (res[1].length() > 512))
-            throw new InvalidAddress();
-
-        
-        e.setUser(res[0]);
-        e.setHost(res[1].toLowerCase());
@@ -75 +72 @@
-    }
-
-    /**
-     * builds a user@domain string
-     */
-    public String toString() {
-        if (user.equals("<>"))
-            return user;
-
-        return (user + "@" + host);
-    }
@@ -101 +94 @@
-    }
-
-    /**
-     * test if to instances are equals. matches user and domain, or * as user @ domain
-     * @param in
-     * @return true if equals
-     */
-    public boolean isEqual(EmailAddress in) {
-        if (in == this)
-            return true;
-
-        if (in.getHost().equals(this.host) && in.getUser().equals(this.user))
-            return true;
-
-        if (in.getHost().equals(this.host) && in.getUser().equals("*"))
-            return true;
-
-        return false;
-
-    }
-
-
-
+
-    public int hashCode() {
-        String tmp=host;
@@ -132 +114 @@
-    }
-    
-
-
-
+
-    
-    public EmailAddress (EmailAddress original) {
@@ -141 +121 @@
-    }
-
-    
-    public String getAuthContext() {
-        return authContext;
-    }
-
-    
-    public void setAuthContext(String authContext) {
-        this.authContext = authContext;

trunk/jsmtpd/src/org/jsmtpd/core/mail/InvalidAddress.java

@@ -25 +25 @@
- * @author Jean-Francois POUX
- */
-
-
-
+

trunk/jsmtpd/src/org/jsmtpd/core/mail/Rcpt.java

@@ -28 +28 @@
- */
-public class Rcpt implements Serializable {
-
-    private EmailAddress emailAddress = null;
-    private int deliveryAttempts = STATUS_PENDING;
@@ -53 +52 @@
-    }
-
-    /**
-     * 
-     * @return number of attempts failed to deliver the mail
-     */
-    public int getDeliveryAttempts() {
-        return deliveryAttempts;
@@ -62 +57 @@
-
-    /**
-     * 
-     * @return the RCPT is consired delivered when :
-     *          Successufully delivered
@@ -84 +78 @@
-        this.lastError = lastError;
-    }
+
+    public int getStatus() {
+        return status;
+    }
+
+        public String toString() {
+                if (emailAddress==null)
+                        return "null adress";
+                return this.emailAddress.toString();
+        }
-    
-    public static final int STATUS_PENDING = 0;
@@ -89 +93 @@
-    public static final int STATUS_ERROR_FATAL = 2;
-    public static final int STATUS_DELIVERED = 3;
-    
-    
-    public int getStatus() {
-        return status;
-    }
-
-        @Override
-        public String toString() {
-                if (emailAddress==null)
-                        return "null adress";
-                return this.emailAddress.toString();
-        }
-}

trunk/jsmtpd/src/org/jsmtpd/core/receive/Receiver.java

@@ -48 +48 @@
-    protected Socket inc = null;
-
-
-
-
+
-    
-    public Receiver(int port, int maxInst) throws IOException, InstantiationException, IllegalAccessException, ClassNotFoundException {

trunk/jsmtpd/src/org/jsmtpd/core/receive/ReceiverWorkerImpl.java

@@ -32 +32 @@
- */
-public class ReceiverWorkerImpl implements IThreadedClass {
-
-    private ProtocolHandler proto = new ProtocolHandler();
-    private Socket rec = null;

trunk/jsmtpd/src/org/jsmtpd/core/send/DeliveryPicker.java

@@ -47 +47 @@
-    public void run() {
-        while (running) {
- //TODO: Also check if memory is available ?
+
-            {
-                Email e = null;
@@ -75 +75 @@
-        running = false;
-        wake();
-
-        // Wait for the running loop to end ?
-
-        try {
-            this.join();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        pool.forceShutdown();
-        queueService.shutdownService();
-
-    }
-

trunk/jsmtpd/src/org/jsmtpd/core/send/DeliveryWorker.java

@@ -53 +53 @@
-        handler.clearMail(); //this will generate a null pointer exception excplicitly. Catched in doJob for requeing
-        //wait for curmail to b