You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2006/12/25 18:59:56 UTC
svn commit: r490159 - in
/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core:
./ filter/ filter/fastfail/
Author: norman
Date: Mon Dec 25 09:59:54 2006
New Revision: 490159
URL: http://svn.apache.org/viewvc?view=rev&rev=490159
Log:
Fix some javadocs and some minor cleanups etc. See JAMES-750
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/EhloCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HeloCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HelpCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/MailCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/NoopCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/QuitCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RsetCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/DataFilterCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/EhloFilterCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/HeloFilterCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/RcptFilterCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/EhloCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/EhloCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/EhloCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/EhloCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -41,10 +41,10 @@
*/
private final static String COMMAND_NAME = "EHLO";
- /*
+ /**
* processes EHLO command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
**/
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
return doEHLO(session, arguments);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/ExpnCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -44,7 +44,7 @@
* This method informs the client that the command is
* not implemented.
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
return new SMTPResponse("502", DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SYSTEM_NOT_CAPABLE)+" EXPN is not supported");
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HeloCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HeloCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HeloCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HeloCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -44,7 +44,7 @@
/**
* process HELO command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
**/
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
return doHELO(session, arguments);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HelpCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HelpCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HelpCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/HelpCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -39,13 +39,13 @@
private final static String COMMAND_NAME = "HELP";
- /*
+ /**
* handles HELP command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
**/
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
- return new SMTPResponse("502", DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SYSTEM_NOT_CAPABLE)+" HELP is not supported");
+ return new SMTPResponse("502", DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.SYSTEM_NOT_CAPABLE)+" " + COMMAND_NAME + " is not supported");
}
/**
@@ -53,7 +53,7 @@
*/
public Collection getImplCommands() {
Collection implCommands = new ArrayList();
- implCommands.add("HELP");
+ implCommands.add(COMMAND_NAME);
return implCommands;
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/MailCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/MailCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/MailCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/MailCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -42,7 +42,7 @@
/**
* handles MAIL command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
return doMAIL(session, arguments);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/NoopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/NoopCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/NoopCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/NoopCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -43,7 +43,7 @@
* Handler method called upon receipt of a NOOP command.
* Just sends back an OK and logs the command.
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
return new SMTPResponse("250", DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.UNDEFINED_STATUS)+" OK");
@@ -54,7 +54,7 @@
*/
public Collection getImplCommands() {
Collection implCommands = new ArrayList();
- implCommands.add("NOOP");
+ implCommands.add(COMMAND_NAME);
return implCommands;
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/QuitCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/QuitCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/QuitCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/QuitCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -42,7 +42,7 @@
/**
* handles QUIT command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
return doQUIT(session, parameters);
@@ -79,7 +79,7 @@
*/
public Collection getImplCommands() {
Collection implCommands = new ArrayList();
- implCommands.add("QUIT");
+ implCommands.add(COMMAND_NAME);
return implCommands;
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -40,7 +40,7 @@
/**
* handles RCPT command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
**/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
return doRCPT(session, parameters);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RsetCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RsetCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RsetCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RsetCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -38,10 +38,10 @@
*/
private final static String COMMAND_NAME = "RSET";
- /*
+ /**
* handles RSET command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
**/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
return doRSET(session, session.getCommandArgument());
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/UnknownCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -43,7 +43,7 @@
* Handler method called upon receipt of an unrecognized command.
* Returns an error response and logs the command.
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
**/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -42,7 +42,7 @@
* This method informs the client that the command is
* not implemented.
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
**/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
return new SMTPResponse(SMTPRetCode.UNIMPLEMENTED_COMMAND,
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/DataFilterCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/DataFilterCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/DataFilterCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/DataFilterCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -41,7 +41,7 @@
/**
* process DATA command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
return doDATA(session, parameters);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/EhloFilterCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/EhloFilterCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/EhloFilterCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/EhloFilterCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -43,7 +43,7 @@
/**
* processes EHLO command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
**/
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
return doEHLO(session, arguments);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/HeloFilterCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/HeloFilterCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/HeloFilterCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/HeloFilterCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -43,9 +43,9 @@
/**
* process HELO command
- *
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
- **/
+ *
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
+ */
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
return doHELO(session, arguments);
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -47,7 +47,7 @@
/**
* handles MAIL command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
return doMAIL(session, arguments);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/RcptFilterCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/RcptFilterCmdHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/RcptFilterCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/RcptFilterCmdHandler.java Mon Dec 25 09:59:54 2006
@@ -45,7 +45,7 @@
/**
* handles RCPT command
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
**/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
return doRCPT(session, parameters);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java Mon Dec 25 09:59:54 2006
@@ -286,7 +286,7 @@
}
/**
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String arguments) {
if (!session.isRelayingAllowed() && !(session.isAuthRequired() && session.getUser() != null)) {
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java Mon Dec 25 09:59:54 2006
@@ -109,11 +109,10 @@
}
/**
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
- if (command.equals("HELO")
- || command.equals("EHLO")) {
+ if (command.equals("HELO") || command.equals("EHLO")) {
checkEhloHelo(session, parameters);
} else if (command.equals("RCPT")) {
return doProcessing(session);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java Mon Dec 25 09:59:54 2006
@@ -59,36 +59,21 @@
}
/**
- * @see JunkHandlerData#getJunkScoreLogString()
+ * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#getJunkHandlerData(org.apache.james.smtpserver.SMTPSession)
*/
- protected String getJunkScoreLogString(SMTPSession session) {
- return "Provided EHLO/HELO " + session.getState().get(SMTPSession.CURRENT_HELO_NAME) + " not equal reverse of "
- + session.getRemoteIPAddress() + ". Add junkScore: " + getScore();
- }
-
- /**
- * @see JunkHandlerData#getRejectLogString()
- */
- protected String getRejectLogString(SMTPSession session) {
- return getResponseString(session);
- }
-
- /**
- * @see JunkHandlerData#getRejectResponseString()
- */
- protected String getResponseString(SMTPSession session) {
- String responseString = "501 "
- + DSNStatus.getStatus(DSNStatus.PERMANENT,
- DSNStatus.DELIVERY_INVALID_ARG)
- + " Provided EHLO/HELO " + session.getState().get(SMTPSession.CURRENT_HELO_NAME) + " not equal reverse of "
- + session.getRemoteIPAddress();
- return responseString;
- }
-
- /**
- * @see JunkHandlerData#getScoreName()
- */
- protected String getScoreName() {
- return "ReverseEqualsEhloHeloCheck";
+ public JunkHandlerData getJunkHandlerData(SMTPSession session) {
+ JunkHandlerData data = new JunkHandlerData();
+
+ data.setJunkScoreLogString("Provided EHLO/HELO " + session.getState().get(SMTPSession.CURRENT_HELO_NAME) + " not equal reverse of "
+ + session.getRemoteIPAddress() + ". Add junkScore: " + getScore());
+ data.setRejectLogString("501 " + DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG)
+ + " Provided EHLO/HELO " + session.getState().get(SMTPSession.CURRENT_HELO_NAME) + " not equal reverse of "
+ + session.getRemoteIPAddress());
+
+ data.setRejectResponseString("501 " + DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_ARG)
+ + " Provided EHLO/HELO " + session.getState().get(SMTPSession.CURRENT_HELO_NAME) + " not equal reverse of "
+ + session.getRemoteIPAddress());
+ data.setScoreName("ReverseEqualsEhloHeloCheck");
+ return data;
}
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SPFHandler.java Mon Dec 25 09:59:54 2006
@@ -159,12 +159,12 @@
/**
* Calls the SPFcheck
*
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
- if (session.getCommandName().equals("MAIL")) {
+ if (command.equals("MAIL")) {
doSPFCheck(session);
- } else if (session.getCommandName().equals("RCPT")) {
+ } else if (command.equals("RCPT")) {
return doProcessing(session);
}
return null;
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java Mon Dec 25 09:59:54 2006
@@ -49,7 +49,9 @@
}
/**
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * Ignore duplicated recipients and just return 250 as return code.
+ *
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
MailAddress rcpt = (MailAddress) session.getState().get(SMTPSession.CURRENT_RECIPIENT);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java Mon Dec 25 09:59:54 2006
@@ -32,6 +32,10 @@
import org.apache.james.smtpserver.SMTPResponse;
import org.apache.james.smtpserver.SMTPSession;
+/**
+ * Add tarpit support to SMTPServer. See http://www.palomine.net/qmail/tarpit.html for more information
+ *
+ */
public class TarpitHandler extends AbstractLogEnabled implements
CommandHandler, Configurable {
@@ -92,14 +96,16 @@
* @param timeInMillis
* Time in ms
* @throws InterruptedException
+ *
+ * TODO: Remember to add an sleep method to our IO implementation
*/
private void sleep(float timeInMillis) throws InterruptedException {
Thread.sleep((long) timeInMillis);
}
/**
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
- */
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
+ */
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
int rcptCount = 0;
@@ -110,6 +116,7 @@
try {
sleep(tarpitSleepTime);
} catch (InterruptedException e) {
+ // ignore
}
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java Mon Dec 25 09:59:54 2006
@@ -171,7 +171,7 @@
}
/**
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
if (!session.isRelayingAllowed() && !(session.isAuthRequired() && session.getUser() != null)) {
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptMX.java Mon Dec 25 09:59:54 2006
@@ -115,7 +115,7 @@
}
/**
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
return doProcessing(session);
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java?view=diff&rev=490159&r1=490158&r2=490159
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java Mon Dec 25 09:59:54 2006
@@ -35,6 +35,10 @@
import org.apache.james.util.mail.dsn.DSNStatus;
import org.apache.mailet.MailAddress;
+/**
+ * Add MFDNSCheck feature to SMTPServer. This handler reject mail from domains which have not an an valid MX record.
+ *
+ */
public class ValidSenderDomainHandler
extends AbstractJunkHandler
implements CommandHandler, Configurable, Serviceable {
@@ -83,7 +87,7 @@
}
/**
- * @see org.apache.james.smtpserver.CommandHandler#onCommand(SMTPSession)
+ * @see org.apache.james.smtpserver.CommandHandler#onCommand(org.apache.james.smtpserver.SMTPSession, java.lang.String, java.lang.String)
*/
public SMTPResponse onCommand(SMTPSession session, String command, String parameters) {
return doProcessing(session);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org