\n" +
"
HTML body formatted
\n" +
- "
\n" +
+ "
\n" +
"
";
}
diff --git a/src/main/java/com/mockmock/http/MailAttachmentHandler.java b/src/main/java/com/mockmock/http/MailAttachmentHandler.java
new file mode 100644
index 0000000..38f6be9
--- /dev/null
+++ b/src/main/java/com/mockmock/http/MailAttachmentHandler.java
@@ -0,0 +1,121 @@
+package com.mockmock.http;
+
+import com.mockmock.mail.MailQueue;
+import com.mockmock.mail.MockMail;
+import org.apache.commons.io.IOUtils;
+import org.eclipse.jetty.server.Request;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MimeTypeUtils;
+
+import javax.mail.internet.MimeUtility;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLConnection;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by Pengzili on 2016/12/30.
+ */
+
+@Service
+public class MailAttachmentHandler extends BaseHandler{
+
+ private String pattern = "^/attachment/([0-9]+)/?$";
+
+ private MailQueue mailQueue;
+
+ @Override
+ public void handle(String target, Request request, HttpServletRequest httpServletRequest, HttpServletResponse response) throws IOException, ServletException {
+
+ if(!isMatch(target))
+ {
+ return;
+ }
+
+ long mailId = getMailId(target);
+ if(mailId == 0)
+ {
+ return;
+ }
+
+ MockMail mockMail = this.mailQueue.getById(mailId);
+
+ if(mockMail == null)
+ {
+ return;
+ }
+
+ if(mockMail.getBodyHtml() == null)
+ {
+ return;
+ }
+
+ String fileName = mockMail.getAttacheFileName();
+ String fileNameExt =fileName.substring(fileName.lastIndexOf(".")+1, fileName.length());
+ String mimeType = "application/octet-stream";
+
+ if (fileNameExt.equals("pdf")){
+ mimeType = "application/pdf";
+ }else if(fileNameExt.equals("doc")){
+ mimeType = "application/msword";
+ }else if(fileNameExt.equals("xls")){
+ mimeType = "application/vnd.ms-excel";
+ }
+
+ response.setContentType(mimeType);
+ response.setHeader("Content-Disposition", " attachment;filename="+ MimeUtility.encodeWord(mockMail.getAttacheFileName()));
+ response.getOutputStream().write(mockMail.getAttachment());
+ response.setStatus(HttpServletResponse.SC_OK);
+
+ request.setHandled(true);
+
+ }
+
+ /**
+ * Checks if this handler should be used for the given target
+ * @param target String
+ * @return boolean
+ */
+ private boolean isMatch(String target)
+ {
+ return target.matches(pattern);
+ }
+
+ /**
+ * Returns the mail id if it is part of the target
+ * @param target String
+ * @return long
+ */
+ private long getMailId(String target)
+ {
+ Pattern compiledPattern = Pattern.compile(pattern);
+
+ Matcher matcher = compiledPattern.matcher(target);
+ if(matcher.find())
+ {
+ String result = matcher.group(1);
+ try
+ {
+ return Long.valueOf(result);
+ }
+ catch (NumberFormatException e)
+ {
+ return 0;
+ }
+ }
+
+ return 0;
+ }
+
+ @Autowired
+ public void setMailQueue(MailQueue mailQueue) {
+ this.mailQueue = mailQueue;
+ }
+}
diff --git a/src/main/java/com/mockmock/mail/MailQueue.java b/src/main/java/com/mockmock/mail/MailQueue.java
index 43ff309..177bdde 100644
--- a/src/main/java/com/mockmock/mail/MailQueue.java
+++ b/src/main/java/com/mockmock/mail/MailQueue.java
@@ -1,7 +1,6 @@
package com.mockmock.mail;
import com.google.common.eventbus.Subscribe;
-import com.mockmock.AppStarter;
import com.mockmock.Settings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -13,7 +12,7 @@
@Service
public class MailQueue
{
- private static ArrayList
mailQueue = new ArrayList<>();
+ private static ArrayList mailQueue = new ArrayList();
private Settings settings;
diff --git a/src/main/java/com/mockmock/mail/MockMail.java b/src/main/java/com/mockmock/mail/MockMail.java
index 32739d7..16550ba 100644
--- a/src/main/java/com/mockmock/mail/MockMail.java
+++ b/src/main/java/com/mockmock/mail/MockMail.java
@@ -13,6 +13,8 @@ public class MockMail implements Comparable
private String rawMail;
private MimeMessage mimeMessage;
private long receivedTime;
+ private byte[] attachment;
+ private String attacheFileName;
public long getId()
{
@@ -113,4 +115,20 @@ public void setReceivedTime(long receivedTime)
{
this.receivedTime = receivedTime;
}
+
+ public byte[] getAttachment() {
+ return attachment;
+ }
+
+ public void setAttachment(byte[] attachment) {
+ this.attachment = attachment;
+ }
+
+ public String getAttacheFileName() {
+ return attacheFileName;
+ }
+
+ public void setAttacheFileName(String attacheFileName) {
+ this.attacheFileName = attacheFileName;
+ }
}
diff --git a/src/main/java/com/mockmock/mail/MockMockMessageHandlerFactory.java b/src/main/java/com/mockmock/mail/MockMockMessageHandlerFactory.java
index e45ee0f..32dab70 100644
--- a/src/main/java/com/mockmock/mail/MockMockMessageHandlerFactory.java
+++ b/src/main/java/com/mockmock/mail/MockMockMessageHandlerFactory.java
@@ -2,6 +2,7 @@
import com.google.common.eventbus.EventBus;
import com.mockmock.Settings;
+import org.apache.commons.io.IOUtils;
import org.joda.time.DateTime;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -15,6 +16,7 @@
import javax.mail.Multipart;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeUtility;
import java.io.*;
import java.util.Properties;
@@ -126,6 +128,9 @@ public void data(InputStream data) throws RejectException, IOException
{
BodyPart bodyPart = multipart.getBodyPart(i);
String contentType = bodyPart.getContentType();
+ contentType = contentType.replaceAll("\t|\r|\n", "");
+ System.out.println(contentType);
+
if(contentType.matches("text/plain.*"))
{
mockMail.setBody(convertStreamToString(bodyPart.getInputStream()));
@@ -134,6 +139,33 @@ else if(contentType.matches("text/html.*"))
{
mockMail.setBodyHtml(convertStreamToString(bodyPart.getInputStream()));
}
+ else if(contentType.matches("multipart/related.*")){
+ // compound documents
+ Multipart contentMulti = (Multipart)bodyPart.getContent();
+ for (int j = 0; j < contentMulti.getCount(); j++){
+ BodyPart subPart = contentMulti.getBodyPart(i);
+ String subContentType = subPart.getContentType();
+ System.out.println(subContentType);
+ String encoding = "UTF-8";
+
+ if(subContentType.matches("text/html.*")){
+ String originalBodyHtml = IOUtils.toString(subPart.getInputStream(), "utf-8");
+ String replacedBodyHtml = originalBodyHtml.replaceAll("(?