inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
108276: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108214: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         108154: Merged DEV to V4.2-BUG-FIX (4.2.5)
            107925 : MNT-14140 : MAIL command with a null reverse-path causes java.lang.NullPointerException
               - Allowed null reverse-path, added some tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-07-15 17:12:38 +00:00
parent b96fa88669
commit 60451f01f8
5 changed files with 265 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/messages/email-service.properties
View File

@@ -3,6 +3,7 @@ email.server.msg.default_subject=Email-{0}
email.server.err.duplicate_alias=Node with email alias ''{0}'' already exists. Duplicate isn't allowed.
email.server.err.sender_blocked=''{0}'' has been denied access.
email.server.err.from_syntax=Syntax: MAIL FROM: <address> Error in parameters
email.server.err.inbound_mail_disabled=The Alfresco server is not configured to accept inbound emails.
email.server.err.access_denied=''{0}'' has been denied access to ''{1}''.
email.server.err.invalid_subject=The subject line must be a valid file name.

3
config/alfresco/subsystems/email/InboundSMTP/inboundSMTP-context.xml
View File

@@ -51,6 +51,9 @@
<property name="authenticationComponent">
<ref bean="authenticationComponent" />
</property>
<property name="unknownUser">
<value>${email.inbound.unknownUser}</value>
</property>
</bean>
<alias name="emailService" alias="EmailService"/>

29
source/java/org/alfresco/email/server/EmailServer.java
View File

@@ -42,6 +42,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public abstract class EmailServer extends AbstractLifecycleBean
{
private static final String ERR_SENDER_BLOCKED = "email.server.err.sender_blocked";
private static final String ERR_FROM_SYNTAX_INCORRECT = "email.server.err.from_syntax";
private boolean enabled;
private String domain;
@@ -56,6 +57,7 @@ public abstract class EmailServer extends AbstractLifecycleBean
private EmailService emailService;
private AuthenticationComponent authenticationComponent;
private String unknownUser;
protected EmailServer()
{
@@ -185,6 +187,20 @@ public abstract class EmailServer extends AbstractLifecycleBean
this.emailService = emailService;
}
/**
* Used only for check "isNullReversePatAllowed".
* @param unknownUser authority name
*/
public void setUnknownUser(String unknownUser)
{
this.unknownUser = unknownUser;
}
protected boolean isNullReversePatAllowed()
{
return isAuthenticate() || (unknownUser != null && !unknownUser.isEmpty());
}
/**
* Filter incoming message by its sender e-mail address.
*
@@ -193,6 +209,19 @@ public abstract class EmailServer extends AbstractLifecycleBean
*/
protected void filterSender(String sender)
{
if (sender == null)
{
if (isNullReversePatAllowed())
{
// allow null reverse-path: e.g.: an undeliverable mail response
return;
}
else
{
throw new EmailMessageException(ERR_FROM_SYNTAX_INCORRECT);
}
}
// Check if the sender is in the blocked list
for (String blockedSender : blockedSenders)
{

1
source/test-java/org/alfresco/Repository01TestSuite.java
View File

@@ -52,6 +52,7 @@ public class Repository01TestSuite extends TestSuite
static void tests3(TestSuite suite) // tests="76" time="82.566"
{
suite.addTestSuite(org.alfresco.email.server.EmailServiceImplTest.class);
suite.addTestSuite(org.alfresco.email.server.EmailServerTest.class);
suite.addTestSuite(org.alfresco.filesys.FTPServerTest.class);
suite.addTestSuite(org.alfresco.filesys.repo.CifsIntegrationTest.class);
suite.addTestSuite(org.alfresco.filesys.repo.ContentDiskDriverTest.class);

231
source/test-java/org/alfresco/email/server/EmailServerTest.java Normal file
View File

@@ -0,0 +1,231 @@
package org.alfresco.email.server;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.net.Socket;
import java.util.ArrayList;
import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
import org.alfresco.service.cmr.email.EmailService;
import org.alfresco.util.ApplicationContextHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
import junit.framework.TestCase;
public class EmailServerTest extends TestCase
{
/**
* Services used by the tests
*/
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
private EmailServer emailServer;
// Linux-based env. should use port bigger than 1024
private final int TEST_PORT = 2225;
private final String TEST_HOST = "localhost";
private final int TEST_CLIENT_TIMEOUT = 20000;
private EmailService emailService;
@Before
@Override
public void setUp() throws Exception
{
ChildApplicationContextFactory emailSubsystem = (ChildApplicationContextFactory) ctx.getBean("InboundSMTP");
assertNotNull("emailSubsystem", emailSubsystem);
ApplicationContext emailCtx = emailSubsystem.getApplicationContext();
emailServer = (EmailServer) emailCtx.getBean("emailServer");
emailService = (EmailService)emailCtx.getBean("emailService");
assertNotNull("emailService", emailService);
}
@After
public void tearDown() throws Exception
{
// nothing now
}
/*
* Check null reverse-path if
* email.server.auth.enabled=false
* and
* email.inbound.unknownUser isn't set
*
* Null reverse-path must be disallowed
*/
@Test
public void testDisallowedNulableFromUser() throws Exception
{
emailServer.onShutdown(null);
emailServer.setEnableTLS(false);
emailServer.setEnabled(true);
emailServer.setAuthenticate(false);
emailServer.setUnknownUser(null);
emailServer.setPort(TEST_PORT);
emailServer.startup();
String[] response = getMailFromNullableResponse(TEST_HOST, TEST_PORT);
checkResponse(response);
// expects smth. like: "504 some data"
// we are expect error code first
assertTrue("Response should have error code", response[1].indexOf("5") == 0);
}
/*
* Check null reverse-path if
* email.server.auth.enabled=true
* and
* email.inbound.unknownUser isn't set
*
* Null reverse-path must be allowed
*/
@Test
public void testAllowedNulableFromUserWithAuth() throws Exception
{
emailServer.onShutdown(null);
emailServer.setEnableTLS(false);
emailServer.setEnabled(true);
emailServer.setAuthenticate(true);
emailServer.setUnknownUser(null);
emailServer.setPort(TEST_PORT);
emailServer.startup();
String[] response = getMailFromNullableResponse(TEST_HOST, TEST_PORT);
checkResponse(response);
// expects smth. like: "250 some data"
// we aren't expect error code
assertTrue("Response should have error code", response[1].indexOf("2") == 0);
}
/*
* Check null reverse-path if
* email.server.auth.enabled=false
* and
* email.inbound.unknownUser is set
*
* Null reverse-path must be allowed
*/
@Test
public void testAllowedNulableFromUserWithAnonymous() throws Exception
{
emailServer.onShutdown(null);
emailServer.setEnableTLS(false);
emailServer.setEnabled(true);
emailServer.setAuthenticate(false);
emailServer.setUnknownUser("anonymous");
emailServer.setPort(TEST_PORT);
emailServer.startup();
String[] response = getMailFromNullableResponse(TEST_HOST, TEST_PORT);
checkResponse(response);
// expects smth. like: "250 some data"
// we aren't expect error code
assertTrue("Response should have error code", response[1].indexOf("2") == 0);
}
/*
* Check for data accepting if "From" user absent
* and
* "email.inbound.unknownUser" isn't set
* email.server.auth.enabled=true
*/
@Test
public void testForDataAcceptingIfUserIsEmpty() throws Exception
{
emailServer.onShutdown(null);
// we need to delete value from "email.inbound.unknownUser" in service too
if (emailService instanceof EmailServiceImpl)
{
((EmailServiceImpl) emailService).setUnknownUser("");
}
emailServer.setUnknownUser(null);
emailServer.setAuthenticate(true);
emailServer.setEnableTLS(false);
emailServer.setEnabled(true);
emailServer.setPort(TEST_PORT);
emailServer.startup();
String[] request = new String[]
{
"MAIL FROM:<>\r\n",
"RCPT TO:<buffy@sunnydale.high>\r\n",
"DATA\r\n",
"Hello world\r\n.\r\n",
"QUIT\r\n"
};
String[] response = getResponse(TEST_HOST, TEST_PORT, request);
checkResponse(response);
assertTrue("Response incorrect", response.length > 4);
// expects smth. like: "554 some data"
// we are expect error code
assertTrue("Response should have error code", response[4].indexOf("5") == 0);
}
private void checkResponse(String[] response)
{
assertNotNull("Client hasn't response", response);
assertNotNull("Client hasn empty response", response[0]);
}
private String[] getMailFromNullableResponse(String host, int port) throws Exception
{
// Send null reverse-path
return getResponse(host, port, new String[]{"MAIL FROM:<>\r\n", "QUIT\r\n"});
}
private String[] getResponse(String host, int port, String requestStrings[]) throws Exception
{
Socket sock = new Socket(host, port);
sock.setSoTimeout(TEST_CLIENT_TIMEOUT);
PrintWriter out = new PrintWriter(sock.getOutputStream(), true);
BufferedReader in = new BufferedReader(new InputStreamReader(sock.getInputStream()));
ArrayList<String> response = new ArrayList<String>();
try
{
// Read first server response. It is smth. like: ESMTP SubEthaSMTP 3.1.6
response.add(in.readLine());
for (String reqStr : requestStrings)
{
out.print(reqStr);
out.flush();
response.add(in.readLine());
}
// for (String s : response)
// {
// System.out.println(s);
// }
return response.toArray(new String[response.size()]);
}
finally
{
in.close();
out.close();
sock.close();
}
}
}