Author: norman
Date: Fri Nov 18 15:09:15 2011
New Revision: 1203685
URL: http://svn.apache.org/viewvc?rev=1203685&view=rev
Log:
cleanup a bit
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -19,7 +19,9 @@
package org.apache.james.protocols.smtp.core;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -43,6 +45,8 @@ import org.apache.mailet.MailAddress;
*/
public class DataCmdHandler implements CommandHandler<SMTPSession>,
ExtensibleHandler {
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("DATA"));
+
public static final class DataConsumerLineHandler implements
LineHandler<SMTPSession> {
/**
@@ -128,10 +132,7 @@ public class DataCmdHandler implements C
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add("DATA");
-
- return implCommands;
+ return COMMANDS;
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -21,8 +21,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
@@ -40,7 +41,7 @@ public class ExpnCmdHandler implements C
/**
* The name of the command handled by the command handler
*/
- private final static String COMMAND_NAME = "EXPN";
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("EXPN"));
/**
* Handler method called upon receipt of a EXPN command.
@@ -56,10 +57,7 @@ public class ExpnCmdHandler implements C
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add(COMMAND_NAME);
-
- return implCommands;
+ return COMMANDS;
}
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -19,8 +19,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
@@ -34,19 +35,17 @@ import org.apache.james.protocols.smtp.h
*/
public class HeloCmdHandler extends AbstractHookableCmdHandler<HeloHook> {
+ private static final String COMMAND_NAME = "HELO";
/**
* The name of the command handled by the command handler
*/
- private final static String COMMAND_NAME = "HELO";
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList(COMMAND_NAME));
/**
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add(COMMAND_NAME);
-
- return implCommands;
+ return COMMANDS;
}
/**
@@ -56,7 +55,7 @@ public class HeloCmdHandler extends Abst
protected SMTPResponse doCoreCmd(SMTPSession session, String command,
String parameters) {
session.getConnectionState().put(SMTPSession.CURRENT_HELO_MODE,
- COMMAND_NAME);
+ COMMAND_NAME);
StringBuilder response = new StringBuilder();
response.append(session.getHelloName()).append(
" Hello ").append(parameters).append(" [").append(
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -21,8 +21,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
@@ -36,11 +37,12 @@ import org.apache.james.protocols.smtp.d
* Handles HELP command
*/
public class HelpCmdHandler implements CommandHandler<SMTPSession> {
- /**
+ private static final String COMMAND_NAME = "HELP";
+
+ /**
* The name of the command handled by the command handler
*/
- private final static String COMMAND_NAME = "HELP";
-
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList(COMMAND_NAME));
/**
* handles HELP command
@@ -54,9 +56,6 @@ public class HelpCmdHandler implements C
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add(COMMAND_NAME);
-
- return implCommands;
+ return COMMANDS;
}
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -19,8 +19,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -43,6 +44,7 @@ import org.apache.mailet.MailAddress;
* Handles MAIL command
*/
public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("MAIL"));
/**
* A map of parameterHooks
@@ -92,10 +94,7 @@ public class MailCmdHandler extends Abst
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add("MAIL");
-
- return implCommands;
+ return COMMANDS;
}
/**
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -21,8 +21,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
@@ -40,7 +41,7 @@ public class NoopCmdHandler implements C
/**
* The name of the command handled by the command handler
*/
- private final static String COMMAND_NAME = "NOOP";
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("NOOP"));
/**
* Handler method called upon receipt of a NOOP command.
@@ -55,10 +56,7 @@ public class NoopCmdHandler implements C
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add(COMMAND_NAME);
-
- return implCommands;
+ return COMMANDS;
}
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -19,8 +19,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
@@ -37,7 +38,7 @@ public class QuitCmdHandler extends Abst
/**
* The name of the command handled by the command handler
*/
- private final static String COMMAND_NAME = "QUIT";
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("QUIT"));
/**
* Handler method called upon receipt of a QUIT command. This method
informs
@@ -73,10 +74,7 @@ public class QuitCmdHandler extends Abst
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add(COMMAND_NAME);
-
- return implCommands;
+ return COMMANDS;
}
/**
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -20,7 +20,9 @@
package org.apache.james.protocols.smtp.core;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Locale;
import java.util.StringTokenizer;
@@ -40,6 +42,7 @@ public class RcptCmdHandler extends Abst
CommandHandler<SMTPSession> {
public static final String CURRENT_RECIPIENT = "CURRENT_RECIPIENT"; //
Current recipient
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("RCPT"));
@@ -229,10 +232,7 @@ public class RcptCmdHandler extends Abst
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add("RCPT");
-
- return implCommands;
+ return COMMANDS;
}
/**
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -21,8 +21,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
@@ -39,7 +40,7 @@ public class RsetCmdHandler implements C
/**
* The name of the command handled by the command handler
*/
- private final static String COMMAND_NAME = "RSET";
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("RSET"));
/**
* handles RSET command
@@ -71,10 +72,7 @@ public class RsetCmdHandler implements C
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add(COMMAND_NAME);
-
- return implCommands;
+ return COMMANDS;
}
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -21,8 +21,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
@@ -40,15 +41,13 @@ public class UnknownCmdHandler extends A
* The name of the command handled by the command handler
*/
public static final String UNKNOWN_COMMAND = "UNKNOWN";
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList(UNKNOWN_COMMAND));
/**
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add(UNKNOWN_COMMAND);
-
- return implCommands;
+ return COMMANDS;
}
@Override
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -21,8 +21,9 @@
package org.apache.james.protocols.smtp.core;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
@@ -36,8 +37,9 @@ import org.apache.james.protocols.smtp.d
* Command handler for handling VRFY command
*/
public class VrfyCmdHandler implements CommandHandler<SMTPSession> {
+
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("VRFY"));
- private static final String COMMAND_NAME = "VRFY";
/**
* Handler method called upon receipt of a VRFY command.
@@ -54,10 +56,7 @@ public class VrfyCmdHandler implements C
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add(COMMAND_NAME);
-
- return implCommands;
+ return COMMANDS;
}
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -23,8 +23,9 @@ package org.apache.james.protocols.smtp.
import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
+import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.StringTokenizer;
@@ -57,7 +58,10 @@ import org.apache.james.protocols.smtp.h
*/
public class AuthCmdHandler
implements CommandHandler<SMTPSession>, EhloExtension, ExtensibleHandler,
MailParametersHook {
-
+ private static final Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList("AUTH"));
+ private static final String[] MAIL_PARAMS = { "AUTH" };
+ private static final List<String> ESMTP_FEATURES =
Collections.unmodifiableList(Arrays.asList("AUTH LOGIN PLAIN", "AUTH=LOGIN
PLAIN"));
+
private final static Charset CHARSET = Charset.forName("US-ASCII");
private abstract class AbstractSMTPLineHandler implements
LineHandler<SMTPSession> {
@@ -443,10 +447,7 @@ public class AuthCmdHandler
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add("AUTH");
-
- return implCommands;
+ return COMMANDS;
}
/**
@@ -454,12 +455,9 @@ public class AuthCmdHandler
*/
public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
if (session.isAuthSupported()) {
- List<String> resp = new LinkedList<String>();
- resp.add("AUTH LOGIN PLAIN");
- resp.add("AUTH=LOGIN PLAIN");
- return resp;
+ return ESMTP_FEATURES;
} else {
- return null;
+ return Collections.EMPTY_LIST;
}
}
@@ -511,7 +509,7 @@ public class AuthCmdHandler
* @see
org.apache.james.protocols.smtp.hook.MailParametersHook#getMailParamNames()
*/
public String[] getMailParamNames() {
- return new String[] { "AUTH" };
+ return MAIL_PARAMS;
}
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -19,8 +19,9 @@
package org.apache.james.protocols.smtp.core.esmtp;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import org.apache.james.protocols.smtp.SMTPResponse;
@@ -40,7 +41,9 @@ public class EhloCmdHandler extends Abst
* The name of the command handled by the command handler
*/
private final static String COMMAND_NAME = "EHLO";
-
+ private final static Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList(COMMAND_NAME));
+ // see http://issues.apache.org/jira/browse/JAMES-419
+ private final static List<String> ESMTP_FEATURES =
Collections.unmodifiableList(Arrays.asList("PIPELINING", "ENHANCEDSTATUSCODES",
"8BITMIME"));
private List<EhloExtension> ehloExtensions;
/**
@@ -56,7 +59,7 @@ public class EhloCmdHandler extends Abst
private SMTPResponse doEHLO(SMTPSession session, String argument) {
SMTPResponse resp = new SMTPResponse(SMTPRetCode.MAIL_OK, new
StringBuilder(session.getHelloName()).append(" Hello ").append(argument)
.append(" [")
- .append(session.getRemoteIPAddress()).append("])"));
+
.append(session.getRemoteAddress().getAddress().getHostAddress()).append("])"));
session.getConnectionState().put(SMTPSession.CURRENT_HELO_MODE,
COMMAND_NAME);
@@ -73,10 +76,7 @@ public class EhloCmdHandler extends Abst
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> implCommands = new ArrayList<String>();
- implCommands.add(COMMAND_NAME);
-
- return implCommands;
+ return COMMANDS;
}
/**
@@ -169,12 +169,7 @@ public class EhloCmdHandler extends Abst
* @see
org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
*/
public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
- List<String> extensions = new ArrayList<String>();
- extensions.add("PIPELINING");
- extensions.add("ENHANCEDSTATUSCODES");
- // see http://issues.apache.org/jira/browse/JAMES-419
- extensions.add("8BITMIME");
- return extensions;
+ return ESMTP_FEATURES;
}
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
Fri Nov 18 15:09:15 2011
@@ -19,6 +19,8 @@
package org.apache.james.protocols.smtp.core.esmtp;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -41,6 +43,8 @@ public class MailSizeEsmtpExtension impl
private final static String MESG_SIZE = "MESG_SIZE"; // The size of the
private final static String MESG_FAILED = "MESG_FAILED"; // Message
failed flag
+ private final static String[] MAIL_PARAMS = { "SIZE" };
+
/**
@@ -57,20 +61,21 @@ public class MailSizeEsmtpExtension impl
* @see
org.apache.james.protocols.smtp.hook.MailParametersHook#getMailParamNames()
*/
public String[] getMailParamNames() {
- return new String[] { "SIZE" };
+ return MAIL_PARAMS;
}
/**
* @see
org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
*/
+ @SuppressWarnings("unchecked")
public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
- LinkedList<String> resp = new LinkedList<String>();
// Extension defined in RFC 1870
long maxMessageSize = session.getMaxMessageSize();
if (maxMessageSize > 0) {
- resp.add("SIZE " + maxMessageSize);
+ return Arrays.asList("SIZE " + maxMessageSize);
+ } else {
+ return Collections.EMPTY_LIST;
}
- return resp;
}
@@ -113,8 +118,8 @@ public class MailSizeEsmtpExtension impl
StringBuilder errorBuffer = new StringBuilder(256).append(
"Rejected message from ").append(
tempSender != null ? tempSender : null).append(
- " from host ").append(session.getRemoteHost()).append(" (")
- .append(session.getRemoteIPAddress()).append(") of size ")
+ " from ")
+
.append(session.getRemoteAddress().getAddress().getHostAddress()).append(" of
size ")
.append(size).append(
" exceeding system maximum message size of ")
.append(maxMessageSize).append("based on SIZE option.");
@@ -186,9 +191,8 @@ public class MailSizeEsmtpExtension impl
StringBuilder errorBuffer = new StringBuilder(256).append(
"Rejected message from ").append(
session.getState().get(SMTPSession.SENDER).toString())
- .append(" from host ").append(session.getRemoteHost())
- .append(" (").append(session.getRemoteIPAddress())
- .append(") exceeding system maximum message size of ")
+ .append(" from
").append(session.getRemoteAddress().getAddress().getHostAddress())
+ .append(" exceeding system maximum message size of ")
.append(
session.getMaxMessageSize());
session.getLogger().error(errorBuffer.toString());
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
Fri Nov 18 15:09:15 2011
@@ -19,8 +19,9 @@
package org.apache.james.protocols.smtp.core.esmtp;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import org.apache.james.protocols.api.Request;
@@ -40,14 +41,14 @@ public class StartTlsCmdHandler implemen
* The name of the command handled by the command handler
*/
private final static String COMMAND_NAME = "STARTTLS";
+ private final static Collection<String> COMMANDS =
Collections.unmodifiableCollection(Arrays.asList(COMMAND_NAME));
+ private final static List<String> FEATURES =
Collections.unmodifiableList(Arrays.asList(COMMAND_NAME));
/**
* @see
org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
- Collection<String> commands = new ArrayList<String>();
- commands.add(COMMAND_NAME);
- return commands;
+ return COMMANDS;
}
/**
@@ -84,13 +85,14 @@ public class StartTlsCmdHandler implemen
/**
* @see
org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
*/
+ @SuppressWarnings("unchecked")
public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
- List<String> esmtpextensions = new ArrayList<String>();
// SMTP STARTTLS
if (!session.isTLSStarted() && session.isStartTLSSupported()) {
- esmtpextensions.add("STARTTLS");
+ return FEATURES;
+ } else {
+ return Collections.EMPTY_LIST;
}
- return esmtpextensions;
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java
Fri Nov 18 15:09:15 2011
@@ -69,7 +69,7 @@ public abstract class AbstractGreylistHa
if (senderAddress != null) sender = senderAddress.toString();
long time = System.currentTimeMillis();
- String ipAddress = session.getRemoteIPAddress();
+ String ipAddress =
session.getRemoteAddress().getAddress().getHostAddress();
try {
long createTimeStamp = 0;
@@ -208,7 +208,7 @@ public abstract class AbstractGreylistHa
if (!session.isRelayingAllowed()) {
return doGreyListCheck(session, sender,rcpt);
} else {
- session.getLogger().info("IpAddress " +
session.getRemoteIPAddress() + " is allowed to send. Skip greylisting.");
+ session.getLogger().info("IpAddress " +
session.getRemoteAddress().getAddress().getHostAddress() + " is allowed to
send. Skip greylisting.");
}
return new HookResult(HookReturnCode.DECLINED);
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
Fri Nov 18 15:09:15 2011
@@ -34,7 +34,7 @@ public class ReverseEqualsEhloHeloHandle
try {
// get reverse entry
String reverse = dnsService.getHostName(dnsService.getByName(
- session.getRemoteIPAddress()));
+ session.getRemoteAddress().getAddress().getHostAddress()));
if (!argument.equals(reverse)) {
return true;
}
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java?rev=1203685&r1=1203684&r2=1203685&view=diff
==============================================================================
---
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
(original)
+++
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
Fri Nov 18 15:09:15 2011
@@ -58,13 +58,14 @@ public class SpamTrapHandler implements
* @see
org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession,
org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender,
MailAddress rcpt) {
- if (isBlocked(session.getRemoteIPAddress(), session)) {
+ String address =
session.getRemoteAddress().getAddress().getHostAddress();
+ if (isBlocked(address, session)) {
return new HookResult(HookReturnCode.DENY);
} else {
if (spamTrapRecips.contains(rcpt.toString().toLowerCase())){
- addIp(session.getRemoteIPAddress(), session);
+ addIp(address, session);
return new HookResult(HookReturnCode.DENY);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
