X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2Fprotocol%2FSMTP.java;h=18d49dbd8f116a3a46adb2c40f7b62c505a44c7a;hb=0704cf17772a0cfe704e8d379723e96137d7da95;hp=46b4c6eb0d0975ac2b4604c7c0e7a547f7321c55;hpb=54a106811798dd4d58cbf30af33a7066c0f4ebd3;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/protocol/SMTP.java b/src/org/ibex/mail/protocol/SMTP.java index 46b4c6e..18d49db 100644 --- a/src/org/ibex/mail/protocol/SMTP.java +++ b/src/org/ibex/mail/protocol/SMTP.java @@ -1,8 +1,12 @@ +// Copyright 2000-2005 the Contributors, as shown in the revision logs. +// Licensed under the Apache Public Source License 2.0 ("the License"). +// You may not use this file except in compliance with the License. + package org.ibex.mail.protocol; import org.ibex.mail.*; import org.ibex.mail.target.*; -import org.ibex.jinetd.Worker; import org.ibex.util.*; +import org.ibex.net.*; import org.ibex.io.*; import java.net.*; import java.io.*; @@ -11,20 +15,38 @@ import java.text.*; import javax.naming.*; import javax.naming.directory.*; +// FIXME: bounce messages (must go to return-path unless empty, in which case do not send +// FIXME: if more than 100 "Received" lines, must drop message +// FEATURE: infer messageid, date, if not present (?) +// FEATURE: RFC2822, section 4.5.1: special "postmaster" address +// FEATURE: RFC2822, section 4.5.4.1: retry strategies +// FEATURE: RFC2822, section 5, multiple MX records, preferences, ordering // FEATURE: exponential backoff on retry time? +// FEATURE: RFC2822, end of 4.1.2: backslashes in headers public class SMTP { + public static final SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z"); private static final Mailbox spool = FileBasedMailbox.getFileBasedMailbox(Mailbox.STORAGE_ROOT,false).slash("spool",true).slash("smtp",true); static { new Thread() { public void run() { Outgoing.runq(); } }.start(); } + public static void accept(Message m) throws IOException { + if (!m.envelopeTo.isLocal()) Outgoing.accept(m); + else Target.root.accept(m); + } + public static class SMTPException extends MailException { int code; String message; public SMTPException(String s) { - code = Integer.parseInt(s.substring(0, s.indexOf(' '))); - message = s.substring(s.indexOf(' ')+1); + try { + code = Integer.parseInt(s.substring(0, s.indexOf(' '))); + message = s.substring(s.indexOf(' ')+1); + } catch (NumberFormatException nfe) { + code = -1; + message = s; + } } public String toString() { return "SMTP " + code + ": " + message; } public String getMessage() { return toString(); } @@ -32,22 +54,31 @@ public class SMTP { // Server ////////////////////////////////////////////////////////////////////////////// - public static class Server implements Worker { + public static class Server { public void handleRequest(Connection conn) { conn.setTimeout(5 * 60 * 1000); conn.setNewline("\r\n"); conn.println("220 " + conn.vhost + " SMTP " + this.getClass().getName()); Address from = null; Vector to = new Vector(); + boolean ehlo = false; + String remotehost = null; for(String command = conn.readln(); ; command = conn.readln()) try { if (command == null) return; String c = command.toUpperCase(); - if (c.startsWith("HELO")) { conn.println("250 HELO " + conn.vhost); from = null; to = new Vector(); - } else if (c.startsWith("EHLO")) { conn.println("250"); from = null; to = new Vector(); + if (c.startsWith("HELO")) { + remotehost = c.substring(5).trim(); + conn.println("250 HELO " + conn.vhost); + from = null; to = new Vector(); + } else if (c.startsWith("EHLO")) { + remotehost = c.substring(5).trim(); + conn.println("250"); + ehlo = true; + from = null; to = new Vector(); } else if (c.startsWith("RSET")) { conn.println("250 reset ok"); from = null; to = new Vector(); } else if (c.startsWith("HELP")) { conn.println("214 you are beyond help. see a trained professional."); - } else if (c.startsWith("VRFY")) { conn.println("252 We don't VRFY; proceed anyway"); - } else if (c.startsWith("EXPN")) { conn.println("550 EXPN not available"); + } else if (c.startsWith("VRFY")) { conn.println("502 VRFY not supported"); + } else if (c.startsWith("EXPN")) { conn.println("502 EXPN not supported"); } else if (c.startsWith("NOOP")) { conn.println("250 OK"); } else if (c.startsWith("QUIT")) { conn.println("221 " + conn.vhost + " closing connection"); return; } else if (c.startsWith("MAIL FROM:")) { @@ -55,25 +86,32 @@ public class SMTP { from = command.equals("<>") ? null : new Address(command); conn.println("250 " + from + " is syntactically correct"); } else if (c.startsWith("RCPT TO:")) { - //if (from == null) { conn.println("503 MAIL FROM must precede RCPT TO"); continue; } + // some clients are broken and put RCPT first; we will tolerate this command = command.substring(8).trim(); if(command.indexOf(' ') != -1) command = command.substring(0, command.indexOf(' ')); Address addr = new Address(command); - if (addr.isLocal()) conn.println("250 " + addr + " is on this machine; I will deliver it"); - else if (conn.getRemoteAddress().isLoopbackAddress()) + if (addr.isLocal()) { + // FEATURE: should check the address further and give 550 if undeliverable + conn.println("250 " + addr + " is on this machine; I will deliver it"); + to.addElement(addr); + } else if (conn.getRemoteAddress().isLoopbackAddress()) { conn.println("250 you are connected locally, so I will let you send"); - else { conn.println("551 sorry, " + addr + " is not on this machine"); } - to.addElement(addr); + to.addElement(addr); + } else { + conn.println("551 sorry, " + addr + " is not on this machine"); + } } else if (c.startsWith("DATA")) { - if (from == null) { conn.println("503 MAIL FROM command must precede DATA"); continue; } - if (to == null) { conn.println("503 RCPT TO command must precede DATA"); continue; } + //if (from == null) { conn.println("503 MAIL FROM command must precede DATA"); continue; } + if (to == null || to.size()==0) { conn.println("503 RCPT TO command must precede DATA"); continue; } conn.println("354 Enter message, ending with \".\" on a line by itself"); conn.flush(); try { StringBuffer buf = new StringBuffer(); buf.append("Received: from " + conn.getRemoteHostname() + " (" + remotehost + ")\r\n"); buf.append(" by "+conn.vhost+" ("+SMTP.class.getName()+") with "+(ehlo?"ESMTP":"SMTP") + "\r\n"); - buf.append(" for "); for(int i=0; i= 100) Log.warn(SMTP.Outgoing.class, "Message with " + m.traces.length + " trace hops; dropping\n" + m.summary()); + */ else synchronized(Outgoing.class) { spool.add(m); Outgoing.class.notify(); @@ -124,6 +164,10 @@ public class SMTP { } public static boolean attempt(Message m) throws IOException { + if (m.envelopeTo == null) { + Log.warn(SMTP.Outgoing.class, "aieeee, null envelopeTo: " + m.summary()); + return false; + } InetAddress[] mx = getMailExchangerIPs(m.envelopeTo.host); if (mx.length == 0) { Log.warn(SMTP.Outgoing.class, "could not resolve " + m.envelopeTo.host + "; bouncing it\n" + m.summary()); @@ -143,7 +187,8 @@ public class SMTP { } private static void check(String s, Connection conn) { - while (s.charAt(3) == '-') s = conn.readln(); + if (s==null) return; + while (s.length() > 3 && s.charAt(3) == '-') s = conn.readln(); if (s.startsWith("4")||s.startsWith("5")) throw new SMTPException(s); } private static boolean attempt(final Message m, final InetAddress mx) { @@ -156,30 +201,68 @@ public class SMTP { conn.setTimeout(60 * 1000); Log.note(" connected"); check(conn.readln(), conn); // banner - conn.println("HELO " + conn.vhost); check(conn.readln(), conn); - conn.println("MAIL FROM:<" + m.envelope.from.user + "@" + m.envelope.from.host+">"); check(conn.readln(), conn); - conn.println("RCPT TO:<" + m.envelope.to.user + "@" + m.envelope.to.host+">"); check(conn.readln(), conn); + try { + conn.println("EHLO " + conn.vhost); + check(conn.readln(), conn); + } catch (SMTPException smtpe) { + conn.println("HELO " + conn.vhost); + check(conn.readln(), conn); + } + if (m.envelopeFrom==null) { + Log.warn("", "MAIL FROM:<>"); + conn.println("MAIL FROM:<>"); check(conn.readln(), conn); + } else { + Log.warn("", "MAIL FROM:<" + m.envelopeFrom.toString()+">"); + conn.println("MAIL FROM:<" + m.envelopeFrom.toString()+">"); check(conn.readln(), conn); + } + conn.println("RCPT TO:<" + m.envelopeTo.toString()+">"); check(conn.readln(), conn); conn.println("DATA"); check(conn.readln(), conn); - Stream stream = new Stream(m.toString()); - boolean inheaders = true; - while(true) { - String s = stream.readln(); - if (s == null) break; - if (s.length() == 0) inheaders = false; - // quash Return-Path; required by RFC2822 - if (inheaders && s.toLowerCase().startsWith("Return-Path:")) continue; + Headers head = m.headers; + head.remove("return-path"); + head.remove("bcc"); + Stream stream = head.getStream(); + for(String s = stream.readln(); s!=null; s=stream.readln()) { + if (s.startsWith(".")) conn.print("."); + //Log.warn("***",s); + conn.println(s); + } + //Log.warn("***",""); + conn.println(""); + stream = m.getBody().getStream(); + for(String s = stream.readln(); s!=null; s=stream.readln()) { if (s.startsWith(".")) conn.print("."); + //Log.warn("***",s); conn.println(s); } conn.println("."); - check(conn.readln(), conn); - Log.warn(SMTP.Outgoing.class, "success: " + mx + " accepted " + m.summary()); + String resp = conn.readln(); + if (resp == null) + throw new SMTPException("server " + mx + " closed connection without accepting message"); + check(resp, conn); + Log.warn(SMTP.Outgoing.class, "success: " + mx + " accepted " + m.summary() + "\n["+resp+"]"); accepted = true; conn.close(); + } catch (SMTPException e) { + if (accepted) return true; + Log.warn(SMTP.Outgoing.class, " unable to send; error=" + e); + Log.warn(SMTP.Outgoing.class, " message: " + m.summary()); + Log.warn(SMTP.Outgoing.class, e); + if (e.code >= 500 && e.code <= 599) { + try { + accept(m.bounce("unable to deliver: " + e)); + } catch (Exception ex) { + Log.error(SMTP.Outgoing.class, "very serious: exception while trying to deliver bounce"); + Log.error(SMTP.Outgoing.class, ex); + } + return true; + } + return false; } catch (Exception e) { if (accepted) return true; Log.warn(SMTP.Outgoing.class, " unable to send; error=" + e); + Log.warn(SMTP.Outgoing.class, " message: " + m.summary()); Log.warn(SMTP.Outgoing.class, e); + if (conn != null) Log.warn(SMTP.Outgoing.class, conn.dumpLog()); return false; } finally { if (conn != null) conn.close(); @@ -237,12 +320,14 @@ public class SMTP { } else { ret = new InetAddress[attr.size()]; NamingEnumeration ne = attr.getAll(); - for(int i=0; ne.hasMore(); i++) { + for(int i=0; ne.hasMore();) { String mx = (String)ne.next(); // FIXME we should be sorting here mx = mx.substring(mx.indexOf(" ") + 1); if (mx.charAt(mx.length() - 1) == '.') mx = mx.substring(0, mx.length() - 1); - ret[i] = InetAddress.getByName(mx); + InetAddress ia = InetAddress.getByName(mx); + if (ia.equals(IP.getIP(127,0,0,1))) continue; + ret[i++] = ia; } } } catch (Exception e) {