Changeset 140

Timestamp:

04/08/06 00:03:14 (3 years ago)

Author:

jfp

Message:

fixed maildir writer (tested with solid-pop3d), added a wrapper to chown

Files:

• trunk/jsmtpd/etc/jsmtpd-plugin-config.xml (modified) (2 diffs)
• trunk/jsmtpd/src/org/jsmtpd/plugins/deliveryServices/MaildirWriter.java (modified) (6 diffs)
• trunk/jsmtpd/src/org/jsmtpd/plugins/deliveryServices/UnixMailboxWriter.java (modified) (6 diffs)
• trunk/jsmtpd/src/org/jsmtpd/plugins/filters/ClamAV/ClamAVFilter.java (modified) (1 diff)
• trunk/jsmtpd/src/org/jsmtpd/tools/rights/IChown.java (added)
• trunk/jsmtpd/src/org/jsmtpd/tools/rights/RightException.java (added)
• trunk/jsmtpd/src/org/jsmtpd/tools/rights/UnixChown.java (added)

trunk/jsmtpd/etc/jsmtpd-plugin-config.xml

@@ -13 +13 @@
-        
-        <ACLSetup name="Basic ACL" class="org.jsmtpd.plugins.acls.SimpleACL">
-R
-V
+r
+v
-        </ACLSetup>
-        
-        <DNSSetup class="org.jsmtpd.plugins.dnsServices.DNSJavaResolver" name="DNS Java">
-D
+d
-        </DNSSetup>
-        
@@ -24 +24 @@
-
-        <LocalDeliveryService name="umw" class="org.jsmtpd.plugins.deliveryServices.UnixMailboxWriter">
-M
+m
-        </LocalDeliveryService>
-        

trunk/jsmtpd/src/org/jsmtpd/plugins/deliveryServices/MaildirWriter.java

@@ -35 +35 @@
-import org.jsmtpd.core.common.delivery.IDeliveryService;
-import org.jsmtpd.core.common.delivery.TemporaryDeliveryException;
-import org.jsmtpd.core.common.io.InvalidStreamParserInitialisation;
-import org.jsmtpd.core.common.io.dataStream.DataStreamParser;
-import org.jsmtpd.core.mail.Email;
-import org.jsmtpd.core.mail.Rcpt;
-import org.jsmtpd.tools.ByteArrayTool;
-
+
+
+
-/**
-
-
+
+
+
+
+
+
+
+
- * @author Jean-Francois POUX
- *
- */
-public class MaildirWriter implements IDeliveryService {
-jsmtpd/mails
-/./
+mail
+
-        private String host = ReadConfig.getInstance().getLocalDomain();
-        private Log log = LogFactory.getLog(MaildirWriter.class);
-
+
+
+
+
+
+
+
+
+
+
+
+
-        public void doDelivery(Email in, List<Rcpt> rcpts) {
-                log.debug("Starting batch");
@@ -66 +83 @@
-                rcpt.setDelivered(Rcpt.STATUS_ERROR_NOT_FATAL);
-                log.debug("temporary delivery error for "+rcpt.getEmailAddress().toString());
+            } catch (RightException e) {
+                log.debug("Fatal delivery error for rcpt (right error)"+rcpt.getEmailAddress().toString());
+                rcpt.setDelivered(Rcpt.STATUS_ERROR_FATAL);
-            }
-                }
@@ -83 +103 @@
-        }
-        
-
-
+
+
+
+
-                String mpath = basePath+"/"+rcpt.getEmailAddress().getUser()+"/"+postPath+"/";
-                File fl = new File (mpath);
-
+
+
+
+
+
+
-                File tmp = new File (mpath+"/tmp/");
-isDirectory())
+exists()) {
-                        tmp.mkdirs();
+                        if (tryChown)
+                                chown.recursiveChown(tmp.toString(),user);
+                }
-                File cur = new File (mpath+"/cur/");
-isDirectory())
+exists()) {
-                        cur.mkdirs();
+                        if (tryChown)
+                                chown.recursiveChown(cur.toString(),user);
+                }
-                File newF = new File(mpath+"/new/");
-isDirectory())
+exists()) {
-                        newF.mkdirs();
+                        if (tryChown)
+                                chown.chown(newF.toString(),user);
+                }
-                
-                // Write to tmp directory
@@ -105 +141 @@
-                                raf = new RandomAccessFile (target,"rw");
-                                raf.seek(0);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                raf.close();
-                        } catch (FileNotFoundException e) {
@@ -117 +165 @@
-                                log.error("Io error ",e);
-                                throw new TemporaryDeliveryException (e);
-
-
+
+
+
+
-                
-                //TODO: Fix permissions ?
-                        
-                // Commit = mv
-                File commit = new File (cur.getAbsolutePath()+"/"+fileName);
@@ -150 +198 @@
-                this.postPath = postPath;
-        }
+
+        public void setTryChown(boolean tryChown) {
+                this.tryChown = tryChown;
+        }
+        
-}

trunk/jsmtpd/src/org/jsmtpd/plugins/deliveryServices/UnixMailboxWriter.java

@@ -21 +21 @@
-package org.jsmtpd.plugins.deliveryServices;
-
+import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
@@ -44 +45 @@
-import org.jsmtpd.tools.ByteArrayTool;
-import org.jsmtpd.tools.DateUtil;
+import org.jsmtpd.tools.rights.IChown;
+import org.jsmtpd.tools.rights.RightException;
+import org.jsmtpd.tools.rights.UnixChown;
-
-/**
@@ -55 +59 @@
-    private String mailboxDir = null;
-    private Map<String,FileLock> locks = Collections.synchronizedMap(new HashMap<String,FileLock>());
+    private boolean tryChown = false;
+    private IChown chown = new UnixChown();
-    
-
+
+
+
+
+
-        log.debug("Begin  ");
-        for (Rcpt rcpt : rcpts) {
@@ -81 +91 @@
-        RandomAccessFile fp = null;
-        String mailbox = mailboxDir + "/" + rcpt.getUser().toLowerCase();
+        boolean exist = new File (mailbox).exists();
-        try {
-            fp = openMBox(mailbox);
@@ -105 +116 @@
-            lf[0] = 10;
-            fp.write(lf);
-
+
+
-            //File is unlocked in the finally
-            log.debug("Mail "+in.getDiskName()+ " delivered to : " + rcpt.getUser());
@@ -120 +132 @@
-                    + ", mail to this rcpt is lost",e);
-            throw new FatalDeliveryException();
-
+
+
+
-                closeMBox(mailbox,fp);
-        }

trunk/jsmtpd/src/org/jsmtpd/plugins/filters/ClamAV/ClamAVFilter.java

@@ -88 +88 @@
-         * read the response
-         */
-
+
+
-        ClamAVChat chat = new ClamAVChat(clamdHost, clamdPort, input.getDataAsByte(), connectionTimeout);
-
+
+
+
-            return true;
-        }