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 rd...@apache.org on 2009/09/07 11:33:42 UTC
svn commit: r812058 - in
/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core:
./ esmtp/ filter/fastfail/
Author: rdonkin
Date: Mon Sep 7 09:33:40 2009
New Revision: 812058
URL: http://svn.apache.org/viewvc?rev=812058&view=rev
Log:
JAMES-917 Switch to session logging. https://issues.apache.org/jira/browse/JAMES-917
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AcceptRecipientIfRelayingIsAllowed.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthRequiredToRelayRcptHook.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/PostmasterAbuseRcptHook.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AbstractHookableCmdHandler.java Mon Sep 7 09:33:40 2009
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.ExtensibleHandler;
import org.apache.james.smtpserver.SMTPResponse;
@@ -36,8 +35,7 @@
* Abstract class which Handle hooks.
*
*/
-public abstract class AbstractHookableCmdHandler<Hook> extends AbstractLogEnabled
- implements CommandHandler, ExtensibleHandler {
+public abstract class AbstractHookableCmdHandler<Hook> implements CommandHandler, ExtensibleHandler {
private List<Hook> hooks;
@@ -85,12 +83,12 @@
int count = hooks.size();
for (int i = 0; i < count; i++) {
Hook rawHook = hooks.get(i);
- getLogger().debug("executing hook " + rawHook.getClass().getName());
+ session.getLogger().debug("executing hook " + rawHook.getClass().getName());
HookResult hRes = callHook(rawHook, session, parameters);
if (rHooks != null) {
for (int i2 = 0; i2 < rHooks.size(); i2++) {
Object rHook = rHooks.get(i2);
- getLogger().debug("executing hook " + rHook);
+ session.getLogger().debug("executing hook " + rHook);
hRes = ((HookResultHook) rHook).onHookResult(session, hRes, rawHook);
}
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AcceptRecipientIfRelayingIsAllowed.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AcceptRecipientIfRelayingIsAllowed.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AcceptRecipientIfRelayingIsAllowed.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AcceptRecipientIfRelayingIsAllowed.java Mon Sep 7 09:33:40 2009
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.smtpserver.core;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.smtpserver.hook.HookResult;
import org.apache.james.smtpserver.hook.HookReturnCode;
@@ -28,8 +27,7 @@
/**
* This hook will stop the hook chain if relaying is allowed
*/
-public class AcceptRecipientIfRelayingIsAllowed extends AbstractLogEnabled implements
- RcptHook {
+public class AcceptRecipientIfRelayingIsAllowed implements RcptHook {
/**
* @see org.apache.james.smtpserver.hook.RcptHook#doRcpt(org.apache.james.smtpserver.SMTPSession,
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthRequiredToRelayRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthRequiredToRelayRcptHook.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthRequiredToRelayRcptHook.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthRequiredToRelayRcptHook.java Mon Sep 7 09:33:40 2009
@@ -20,7 +20,6 @@
import javax.annotation.Resource;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.SMTPRetCode;
@@ -33,8 +32,7 @@
/**
* Handler which check for authenticated users
*/
-public class AuthRequiredToRelayRcptHook extends AbstractLogEnabled implements
- RcptHook {
+public class AuthRequiredToRelayRcptHook implements RcptHook {
private MailServer mailServer;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/DataCmdHandler.java Mon Sep 7 09:33:40 2009
@@ -30,7 +30,6 @@
import javax.annotation.Resource;
import javax.mail.MessagingException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.Constants;
import org.apache.james.core.MailHeaders;
import org.apache.james.core.MimeMessageInputStreamSource;
@@ -50,9 +49,7 @@
/**
* handles DATA command
*/
-public class DataCmdHandler
- extends AbstractLogEnabled
- implements CommandHandler, ExtensibleHandler {
+public class DataCmdHandler implements CommandHandler, ExtensibleHandler {
public final class DataConsumerLineHandler implements LineHandler {
/**
@@ -166,10 +163,10 @@
session.getState().put(DATA_MIMEMESSAGE_OUTPUTSTREAM, out);
} catch (IOException e) {
- getLogger().warn("Error creating temporary outputstream for incoming data",e);
+ session.getLogger().warn("Error creating temporary outputstream for incoming data",e);
return new SMTPResponse(SMTPRetCode.LOCAL_ERROR, "Unexpected error preparing to receive DATA.");
} catch (MessagingException e) {
- getLogger().warn("Error creating mimemessagesource for incoming data",e);
+ session.getLogger().warn("Error creating mimemessagesource for incoming data",e);
return new SMTPResponse(SMTPRetCode.LOCAL_ERROR, "Unexpected error preparing to receive DATA.");
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/MailCmdHandler.java Mon Sep 7 09:33:40 2009
@@ -203,25 +203,25 @@
}
} else {
// Unexpected option attached to the Mail command
- if (getLogger().isDebugEnabled()) {
+ if (session.getLogger().isDebugEnabled()) {
StringBuffer debugBuffer = new StringBuffer(128)
.append(
"MAIL command had unrecognized/unexpected option ")
.append(mailOptionName).append(
" with value ").append(
mailOptionValue);
- getLogger().debug(debugBuffer.toString());
+ session.getLogger().debug(debugBuffer.toString());
}
}
}
}
if (session.useAddressBracketsEnforcement()
&& (!sender.startsWith("<") || !sender.endsWith(">"))) {
- if (getLogger().isErrorEnabled()) {
+ if (session.getLogger().isErrorEnabled()) {
StringBuffer errorBuffer = new StringBuffer(128).append(
"Error parsing sender address: ").append(sender)
.append(": did not start and end with < >");
- getLogger().error(errorBuffer.toString());
+ session.getLogger().error(errorBuffer.toString());
}
return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,
DSNStatus.getStatus(DSNStatus.PERMANENT,
@@ -249,12 +249,12 @@
try {
senderAddress = new MailAddress(sender);
} catch (Exception pe) {
- if (getLogger().isErrorEnabled()) {
+ if (session.getLogger().isErrorEnabled()) {
StringBuffer errorBuffer = new StringBuffer(256)
.append("Error parsing sender address: ")
.append(sender).append(": ").append(
pe.getMessage());
- getLogger().error(errorBuffer.toString());
+ session.getLogger().error(errorBuffer.toString());
}
return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,
DSNStatus.getStatus(DSNStatus.PERMANENT,
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/PostmasterAbuseRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/PostmasterAbuseRcptHook.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/PostmasterAbuseRcptHook.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/PostmasterAbuseRcptHook.java Mon Sep 7 09:33:40 2009
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.smtpserver.core;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.smtpserver.hook.HookResult;
import org.apache.james.smtpserver.hook.HookReturnCode;
@@ -28,14 +27,14 @@
/**
* Handler which whitelist "postmaster" and "abuse" recipients.
*/
-public class PostmasterAbuseRcptHook extends AbstractLogEnabled implements RcptHook {
+public class PostmasterAbuseRcptHook implements RcptHook {
/**
* @see org.apache.james.smtpserver.hook.RcptHook#doRcpt(org.apache.james.smtpserver.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (rcpt.getLocalPart().equalsIgnoreCase("postmaster") || rcpt.getLocalPart().equalsIgnoreCase("abuse")) {
- getLogger().debug("Sender allowed");
+ session.getLogger().debug("Sender allowed");
return new HookResult(HookReturnCode.OK);
} else {
return new HookResult(HookReturnCode.DECLINED);
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/RcptCmdHandler.java Mon Sep 7 09:33:40 2009
@@ -141,12 +141,12 @@
}
if (session.useAddressBracketsEnforcement()
&& (!recipient.startsWith("<") || !recipient.endsWith(">"))) {
- if (getLogger().isErrorEnabled()) {
+ if (session.getLogger().isErrorEnabled()) {
StringBuffer errorBuffer = new StringBuffer(192).append(
"Error parsing recipient address: ").append(
"Address did not start and end with < >").append(
getContext(session, null, recipient));
- getLogger().error(errorBuffer.toString());
+ session.getLogger().error(errorBuffer.toString());
}
return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS,
DSNStatus.getStatus(DSNStatus.PERMANENT,
@@ -170,12 +170,12 @@
try {
recipientAddress = new MailAddress(recipient);
} catch (Exception pe) {
- if (getLogger().isErrorEnabled()) {
+ if (session.getLogger().isErrorEnabled()) {
StringBuffer errorBuffer = new StringBuffer(192).append(
"Error parsing recipient address: ").append(
getContext(session, recipientAddress, recipient))
.append(pe.getMessage());
- getLogger().error(errorBuffer.toString());
+ session.getLogger().error(errorBuffer.toString());
}
/*
* from RFC2822; 553 Requested action not taken: mailbox name
@@ -202,7 +202,7 @@
rcptOptionValue = rcptOption.substring(equalIndex + 1);
}
// Unexpected option attached to the RCPT command
- if (getLogger().isDebugEnabled()) {
+ if (session.getLogger().isDebugEnabled()) {
StringBuffer debugBuffer = new StringBuffer(128)
.append(
"RCPT command had unrecognized/unexpected option ")
@@ -210,7 +210,7 @@
.append(rcptOptionValue).append(
getContext(session, recipientAddress,
recipient));
- getLogger().debug(debugBuffer.toString());
+ session.getLogger().debug(debugBuffer.toString());
}
return new SMTPResponse(
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SendMailHandler.java Mon Sep 7 09:33:40 2009
@@ -26,7 +26,6 @@
import javax.annotation.Resource;
import javax.mail.MessagingException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.SMTPSession;
@@ -39,7 +38,7 @@
/**
* Adds the header to the message
*/
-public class SendMailHandler extends AbstractLogEnabled implements MessageHook {
+public class SendMailHandler implements MessageHook {
private MailServer mailServer;
@@ -65,7 +64,7 @@
* @see org.apache.james.smtpserver#onMessage(SMTPSession)
*/
public HookResult onMessage(SMTPSession session, Mail mail) {
- getLogger().debug("sending mail");
+ session.getLogger().debug("sending mail");
try {
mailServer.sendMail(mail);
@@ -74,7 +73,7 @@
if (theRecipients != null) {
recipientString = theRecipients.toString();
}
- if (getLogger().isInfoEnabled()) {
+ if (session.getLogger().isInfoEnabled()) {
StringBuffer infoBuffer =
new StringBuffer(256)
.append("Successfully spooled mail ")
@@ -85,10 +84,10 @@
.append(session.getRemoteIPAddress())
.append(" for ")
.append(recipientString);
- getLogger().info(infoBuffer.toString());
+ session.getLogger().info(infoBuffer.toString());
}
} catch (MessagingException me) {
- getLogger().error("Unknown error occurred while processing DATA.", me);
+ session.getLogger().error("Unknown error occurred while processing DATA.", me);
return new HookResult(HookReturnCode.DENYSOFT,DSNStatus.getStatus(DSNStatus.TRANSIENT,DSNStatus.UNDEFINED_STATUS)+" Error processing message.");
}
return new HookResult(HookReturnCode.OK, DSNStatus.getStatus(DSNStatus.SUCCESS,DSNStatus.CONTENT_OTHER)+" Message received");
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SenderAuthIdentifyVerificationRcptHook.java Mon Sep 7 09:33:40 2009
@@ -22,7 +22,6 @@
import javax.annotation.Resource;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.SMTPRetCode;
@@ -35,8 +34,7 @@
/**
* Handler which check if the authenticated user is incorrect
*/
-public class SenderAuthIdentifyVerificationRcptHook extends AbstractLogEnabled
- implements RcptHook {
+public class SenderAuthIdentifyVerificationRcptHook implements RcptHook {
private MailServer mailServer;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/SetMimeHeaderHandler.java Mon Sep 7 09:33:40 2009
@@ -21,25 +21,22 @@
package org.apache.james.smtpserver.core;
+import javax.mail.internet.MimeMessage;
+
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.smtpserver.hook.HookResult;
import org.apache.james.smtpserver.hook.HookReturnCode;
import org.apache.james.smtpserver.hook.MessageHook;
import org.apache.mailet.Mail;
-import javax.mail.internet.MimeMessage;
-
/**
* Adds the header to the message
*/
-public class SetMimeHeaderHandler
- extends AbstractLogEnabled
- implements MessageHook, Configurable {
+public class SetMimeHeaderHandler implements MessageHook, Configurable {
/**
* The header name and value that needs to be added
@@ -98,7 +95,7 @@
}
} catch (javax.mail.MessagingException me) {
- getLogger().error(me.getMessage());
+ session.getLogger().error(me.getMessage());
}
return new HookResult(HookReturnCode.DECLINED);
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/AuthCmdHandler.java Mon Sep 7 09:33:40 2009
@@ -29,7 +29,6 @@
import java.util.Locale;
import java.util.StringTokenizer;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.ExtensibleHandler;
@@ -55,7 +54,6 @@
* system (simple pluggabilty against external authentication services).
*/
public class AuthCmdHandler
- extends AbstractLogEnabled
implements CommandHandler, EhloExtension, ExtensibleHandler, MailParametersHook {
private abstract class AbstractSMTPLineHandler implements LineHandler {
@@ -298,14 +296,14 @@
int count = hooks.size();
for (int i = 0; i < count; i++) {
AuthHook rawHook = hooks.get(i);
- getLogger().debug("executing hook " + rawHook);
+ session.getLogger().debug("executing hook " + rawHook);
HookResult hRes = rawHook.doAuth(session, user, pass);
if (rHooks != null) {
for (int i2 = 0; i2 < rHooks.size(); i2++) {
Object rHook = rHooks.get(i2);
- getLogger().debug("executing hook " + rHook);
+ session.getLogger().debug("executing hook " + rHook);
hRes = ((HookResultHook) rHook).onHookResult(session, hRes, rHook);
}
@@ -315,11 +313,11 @@
if (res != null) {
if (SMTPRetCode.AUTH_FAILED.equals(res.getRetCode())) {
- getLogger().error("AUTH method "+authType+" failed");
+ session.getLogger().error("AUTH method "+authType+" failed");
} else if (SMTPRetCode.AUTH_OK.equals(res.getRetCode())) {
- if (getLogger().isDebugEnabled()) {
+ if (session.getLogger().isDebugEnabled()) {
// TODO: Make this string a more useful debug message
- getLogger().debug("AUTH method "+authType+" succeeded");
+ session.getLogger().debug("AUTH method "+authType+" succeeded");
}
}
return res;
@@ -329,7 +327,7 @@
res = new SMTPResponse(SMTPRetCode.AUTH_FAILED, "Authentication Failed");
// TODO: Make this string a more useful error message
- getLogger().error("AUTH method "+authType+" failed");
+ session.getLogger().error("AUTH method "+authType+" failed");
return res;
}
@@ -384,13 +382,13 @@
* @param initialResponse the initial response line passed in with the AUTH command
*/
private SMTPResponse doUnknownAuth(SMTPSession session, String authType, String initialResponse) {
- if (getLogger().isErrorEnabled()) {
+ if (session.getLogger().isErrorEnabled()) {
StringBuffer errorBuffer =
new StringBuffer(128)
.append("AUTH method ")
.append(authType)
.append(" is an unrecognized authentication type");
- getLogger().error(errorBuffer.toString());
+ session.getLogger().error(errorBuffer.toString());
}
return new SMTPResponse(SMTPRetCode.PARAMETER_NOT_IMPLEMENTED, "Unrecognized Authentication Type");
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/esmtp/MailSizeEsmtpExtension.java Mon Sep 7 09:33:40 2009
@@ -6,7 +6,6 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.LineHandler;
import org.apache.james.smtpserver.SMTPRetCode;
@@ -21,8 +20,7 @@
/**
* Handle the ESMTP SIZE extension.
*/
-public class MailSizeEsmtpExtension extends AbstractLogEnabled implements
- MailParametersHook, EhloExtension, DataLineFilter, MessageHook {
+public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension, DataLineFilter, MessageHook {
private final static String MESG_SIZE = "MESG_SIZE"; // The size of the
private final static String MESG_FAILED = "MESG_FAILED"; // Message failed flag
@@ -77,7 +75,7 @@
try {
size = Integer.parseInt(mailOptionValue);
} catch (NumberFormatException pe) {
- getLogger().error("Rejected syntactically incorrect value for SIZE parameter.");
+ session.getLogger().error("Rejected syntactically incorrect value for SIZE parameter.");
// This is a malformed option value. We return an error
return new HookResult(HookReturnCode.DENY,
@@ -86,11 +84,11 @@
DSNStatus.DELIVERY_INVALID_ARG)
+ " Syntactically incorrect value for SIZE parameter");
}
- if (getLogger().isDebugEnabled()) {
+ if (session.getLogger().isDebugEnabled()) {
StringBuffer debugBuffer = new StringBuffer(128).append(
"MAIL command option SIZE received with value ").append(
size).append(".");
- getLogger().debug(debugBuffer.toString());
+ session.getLogger().debug(debugBuffer.toString());
}
long maxMessageSize = session.getMaxMessageSize();
if ((maxMessageSize > 0) && (size > maxMessageSize)) {
@@ -103,7 +101,7 @@
.append(size).append(
" exceeding system maximum message size of ")
.append(maxMessageSize).append("based on SIZE option.");
- getLogger().error(errorBuffer.toString());
+ session.getLogger().error(errorBuffer.toString());
return new HookResult(HookReturnCode.DENY, SMTPRetCode.QUOTA_EXCEEDED, DSNStatus
.getStatus(DSNStatus.PERMANENT,
@@ -173,7 +171,7 @@
.append(") exceeding system maximum message size of ")
.append(
session.getMaxMessageSize());
- getLogger().error(errorBuffer.toString());
+ session.getLogger().error(errorBuffer.toString());
// TODO ???
// session.pushLineHandler(new DataCmdHandler.DataConsumerLineHandler());
return response;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/MaxRcptHandler.java Mon Sep 7 09:33:40 2009
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.SMTPRetCode;
import org.apache.james.smtpserver.SMTPSession;
@@ -33,8 +32,7 @@
import org.apache.james.smtpserver.hook.RcptHook;
import org.apache.mailet.MailAddress;
-public class MaxRcptHandler extends AbstractLogEnabled implements
- RcptHook, Configurable {
+public class MaxRcptHandler implements RcptHook, Configurable {
private int maxRcpt = 0;
@@ -68,7 +66,7 @@
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if ((session.getRcptCount() + 1) > maxRcpt) {
- getLogger().info("Maximum recipients of " + maxRcpt + " reached");
+ session.getLogger().info("Maximum recipients of " + maxRcpt + " reached");
return new HookResult(HookReturnCode.DENY, SMTPRetCode.SYSTEM_STORAGE_ERROR, DSNStatus.getStatus(DSNStatus.NETWORK, DSNStatus.DELIVERY_TOO_MANY_REC)
+ " Requested action not taken: max recipients reached");
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java Mon Sep 7 09:33:40 2009
@@ -26,7 +26,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.SMTPRetCode;
@@ -41,7 +40,7 @@
/**
* This CommandHandler can be used to reject not resolvable EHLO/HELO
*/
-public class ResolvableEhloHeloHandler extends AbstractLogEnabled implements Configurable, RcptHook, HeloHook {
+public class ResolvableEhloHeloHandler implements Configurable, RcptHook, HeloHook {
public final static String BAD_EHLO_HELO = "BAD_EHLO_HELO";
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java Mon Sep 7 09:33:40 2009
@@ -28,7 +28,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.smtpserver.hook.HookResult;
@@ -53,8 +52,7 @@
* <spamdRejectionHits>15.0</spamdRejectionHits>
* <checkAuthNetworks>false</checkAuthNetworks> </handler>
*/
-public class SpamAssassinHandler extends AbstractLogEnabled implements
- MessageHook, Configurable {
+public class SpamAssassinHandler implements MessageHook, Configurable {
/**
* The port spamd is listen on
@@ -183,7 +181,7 @@
.append(session.getRemoteIPAddress()).append(") This message reach the spam hits treshold. Required rejection hits: ")
.append(spamdRejectionHits).append(" hits: ")
.append(hits);
- getLogger().info(buffer.toString());
+ session.getLogger().info(buffer.toString());
// Message reject .. abort it!
return new HookResult(HookReturnCode.DENY,DSNStatus.getStatus(DSNStatus.PERMANENT,
@@ -194,7 +192,7 @@
}
}
} catch (MessagingException e) {
- getLogger().error(e.getMessage());
+ session.getLogger().error(e.getMessage());
}
return new HookResult(HookReturnCode.DECLINED);
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/SupressDuplicateRcptHandler.java Mon Sep 7 09:33:40 2009
@@ -24,7 +24,6 @@
import java.util.Collection;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.dsn.DSNStatus;
import org.apache.james.smtpserver.SMTPRetCode;
import org.apache.james.smtpserver.SMTPSession;
@@ -37,7 +36,7 @@
*
* This handler can be used to just ignore duplicated recipients.
*/
-public class SupressDuplicateRcptHandler extends AbstractLogEnabled implements RcptHook {
+public class SupressDuplicateRcptHandler implements RcptHook {
/**
* @see org.apache.james.smtpserver.hook.RcptHook#doRcpt(org.apache.james.smtpserver.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
@@ -53,7 +52,7 @@
.append(" Recipient <")
.append(rcpt.toString())
.append("> OK");
- getLogger().debug("Duplicate recipient not add to recipient list: " + rcpt.toString());
+ session.getLogger().debug("Duplicate recipient not add to recipient list: " + rcpt.toString());
return new HookResult(HookReturnCode.OK,SMTPRetCode.MAIL_OK, responseBuffer.toString());
}
return new HookResult(HookReturnCode.DECLINED);
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/TarpitHandler.java Mon Sep 7 09:33:40 2009
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.smtpserver.hook.HookResult;
import org.apache.james.smtpserver.hook.HookReturnCode;
@@ -35,8 +34,7 @@
* Add tarpit support to SMTPServer. See http://www.palomine.net/qmail/tarpit.html for more information
*
*/
-public class TarpitHandler extends AbstractLogEnabled implements
- RcptHook, Configurable {
+public class TarpitHandler implements RcptHook, Configurable {
private int tarpitRcptCount = 0;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java?rev=812058&r1=812057&r2=812058&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java Mon Sep 7 09:33:40 2009
@@ -25,7 +25,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.dnsservice.TemporaryResolutionException;
import org.apache.james.dsn.DSNStatus;
@@ -40,9 +39,7 @@
* Add MFDNSCheck feature to SMTPServer. This handler reject mail from domains which have not an an valid MX record.
*
*/
-public class ValidSenderDomainHandler
- extends AbstractLogEnabled
- implements MailHook, Configurable {
+public class ValidSenderDomainHandler implements MailHook, Configurable {
private boolean checkAuthNetworks = false;
private DNSService dnsService = null;
@@ -91,7 +88,7 @@
// Not scan the message if relaying allowed
if (session.isRelayingAllowed() && !checkAuthNetworks) {
- getLogger().info("YES");
+ session.getLogger().info("YES");
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org