Commit @8be433932cb0f9ac18262fe4988f566f6cd09d89

[Notice] Announcing the End of Demo Server [Read me]

Yi EungJun 2014-10-28

Introduce Mailbox Service

Mailbox Service is a service which fetches emails from the IMAP server
configured by imap.* and posts the emails.

If the email address to yobi is "yobi@mail.com":

* If a user want to posts an issue in project "my/proj", just send an
  email to "yobi+my/project@mail.com". The email will be posted as an issue.
* Users can post a comment by replying to notification emails. It works
  only if the notification email can accept replies; The footer of the
  notification email describes the ability.
* If a user discuss using email with many people and you want that Yobi
  records the discussion as an issue and comments in project "my/proj",
  just add an address "yobi+my/proj@mail.com" in CC list. Note: But Yobi
  will records only the emails from Yobi users.
* If a user don't know how to send emails he or she can send an email to
  "yobi+help@mail.com". Then yobi replies with help messages.

Mailbox Service fetches emails in two ways: polling and listening.

* Listening - Yobi listens updates from the IMAP server and
  process new emails immediately. Listening works only if the IMAP
  server supports IDLE command.
* Polling - Yobi fetches new emails on the interval configured by
  `application.mailbox.polling.interval`.

Yobi tries listening first and only if it fails tries polling.

If you want to know how to add the configuration for the IMAP server,
see the Mailbox Service section in conf/application.conf.default file.

@8be433932cb0f9ac18262fe4988f566f6cd09d89

27fbc9b

8be4339

app/Global.java

--- app/Global.java

+++ app/Global.java


  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.SecureRandom;
-import java.util.Date;
 
+import mailbox.MailboxService;
 import com.avaje.ebean.Ebean;
 import controllers.SvnApp;
-import models.*;
-
 import controllers.UserApp;
 import controllers.routes;
+import models.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.impl.cookie.DateUtils;
 import play.Application;

 import play.Play;
 import play.api.mvc.Handler;
 import play.data.Form;
-import play.mvc.*;
+import play.mvc.Action;
+import play.mvc.Http;
 import play.mvc.Http.RequestHeader;
 import play.mvc.Result;
 import play.libs.F.Promise;

 import java.security.SecureRandom;
 import java.util.Date;
 
-import views.html.welcome.secret;
-import views.html.welcome.restart;
 import static play.data.Form.form;
 import static play.mvc.Results.badRequest;
 

 
     private boolean isSecretInvalid = false;
     private boolean isRestartRequired = false;
+
+    private MailboxService mailboxService = new MailboxService();
 
     @Override
     public void onStart(Application app) {

         Attachment.onStart();
         YobiUpdate.onStart();
         AccessControl.onStart();
+        mailboxService.start();
     }
 
     private boolean equalsDefaultSecret() {

     }
 
     public void onStop(Application app) {
+        mailboxService.stop();
     }
 
     @Override

8be4339

app/mailbox/Content.java (added)

+++ app/mailbox/Content.java

...	...	@@ -0,0 +1,29 @@
	1	+package mailbox;
	2	+
	3	+import org.apache.commons.lang3.StringUtils;
	4	+
	5	+import javax.mail.internet.MimePart;
	6	+import java.util.ArrayList;
	7	+import java.util.List;
	8	+
	9	+public class Content {
	10	+ public String body = "";
	11	+ public final List<MimePart> attachments = new ArrayList<>();
	12	+ public String type;
	13	+
	14	+ public Content() { }
	15	+
	16	+ public Content(MimePart attachment) {
	17	+ this.attachments.add(attachment);
	18	+ }
	19	+
	20	+ public Content merge(Content that) {
	21	+ body += that.body;
	22	+ if (StringUtils.isEmpty(type)) {
	23	+ type = that.type;
	24	+ }
	25	+ attachments.addAll(that.attachments);
	26	+
	27	+ return this;
	28	+ }
	29	+}

8be4339

app/mailbox/CreationViaEmail.java (added)

+++ app/mailbox/CreationViaEmail.java

...	...	@@ -0,0 +1,500 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox;
	22	+
	23	+import com.sun.mail.imap.IMAPMessage;
	24	+import mailbox.exceptions.IssueNotFound;
	25	+import mailbox.exceptions.MailHandlerException;
	26	+import mailbox.exceptions.PermissionDenied;
	27	+import mailbox.exceptions.PostingNotFound;
	28	+import models.*;
	29	+import models.enumeration.ResourceType;
	30	+import models.resource.Resource;
	31	+import org.apache.commons.lang3.StringUtils;
	32	+import org.jsoup.Jsoup;
	33	+import org.jsoup.nodes.Document;
	34	+import org.jsoup.nodes.Element;
	35	+import org.jsoup.select.Elements;
	36	+import play.Logger;
	37	+import play.api.i18n.Lang;
	38	+import play.db.ebean.Transactional;
	39	+import play.i18n.Messages;
	40	+import utils.AccessControl;
	41	+import utils.MimeType;
	42	+
	43	+import javax.annotation.Nonnull;
	44	+import javax.mail.Address;
	45	+import javax.mail.BodyPart;
	46	+import javax.mail.MessagingException;
	47	+import javax.mail.Part;
	48	+import javax.mail.internet.*;
	49	+import java.io.IOException;
	50	+import java.security.NoSuchAlgorithmException;
	51	+import java.util.Collection;
	52	+import java.util.HashMap;
	53	+import java.util.HashSet;
	54	+import java.util.Map;
	55	+
	56	+/**
	57	+ * A set of methods to create a resource from an incoming email.
	58	+ */
	59	+public class CreationViaEmail {
	60	+ /**
	61	+ * Create a comment from the given email.
	62	+ *
	63	+ * @param message
	64	+ * @param target
	65	+ * @throws MessagingException
	66	+ * @throws MailHandlerException
	67	+ * @throws IOException
	68	+ * @throws NoSuchAlgorithmException
	69	+ */
	70	+ @Transactional
	71	+ public static Comment saveComment(IMAPMessage message, Resource target)
	72	+ throws MessagingException, MailHandlerException, IOException, NoSuchAlgorithmException {
	73	+ User author = IMAPMessageUtil.extractSender(message);
	74	+
	75	+ if (!AccessControl.isProjectResourceCreatable(
	76	+ author, target.getProject(), target.getType())) {
	77	+ throw new PermissionDenied(cannotCreateMessage(author,
	78	+ target.getProject(), target.getType()));
	79	+ }
	80	+
	81	+ Content parsedMessage = extractContent(message);
	82	+
	83	+ Comment comment = makeNewComment(target, author, parsedMessage.body);
	84	+
	85	+ comment.save();
	86	+
	87	+ Map<String, Attachment> relatedAttachments = saveAttachments(
	88	+ parsedMessage.attachments,
	89	+ comment.asResource());
	90	+
	91	+ if (new ContentType(parsedMessage.type).match(MimeType.HTML)) {
	92	+ // replace cid with attachments
	93	+ comment.contents = replaceCidWithAttachments(
	94	+ comment.contents, relatedAttachments);
	95	+ comment.update();
	96	+ }
	97	+
	98	+ new OriginalEmail(message.getMessageID(), comment.asResource()).save();
	99	+
	100	+ // Add the event
	101	+ addEvent(NotificationEvent.forNewComment(comment, author),
	102	+ message.getAllRecipients(), author);
	103	+
	104	+ return comment;
	105	+ }
	106	+
	107	+ private static Comment makeNewComment(Resource target, User sender, String body) throws IssueNotFound, PostingNotFound {
	108	+ Comment comment;
	109	+ Long id = Long.valueOf(target.getId());
	110	+
	111	+ switch(target.getType()) {
	112	+ case ISSUE_POST:
	113	+ Issue issue = Issue.finder.byId(id);
	114	+ if (issue == null) {
	115	+ throw new IssueNotFound(id);
	116	+ }
	117	+ comment = new IssueComment(issue, sender, body);
	118	+ break;
	119	+ case BOARD_POST:
	120	+ Posting posting = Posting.finder.byId(id);
	121	+ if (posting == null) {
	122	+ throw new PostingNotFound(id);
	123	+ }
	124	+ comment = new PostingComment(posting, sender, body);
	125	+ break;
	126	+ default:
	127	+ throw new IllegalArgumentException("Unsupported resource type: " + target.getType());
	128	+ }
	129	+
	130	+ return comment;
	131	+ }
	132	+
	133	+ /**
	134	+ * Create an issue from the given email.
	135	+ *
	136	+ * @param message
	137	+ * @param project
	138	+ * @throws MessagingException
	139	+ * @throws PermissionDenied
	140	+ * @throws IOException
	141	+ * @throws NoSuchAlgorithmException
	142	+ */
	143	+ static Issue saveIssue(IMAPMessage message,
	144	+ Project project)
	145	+ throws MessagingException, PermissionDenied, IOException, NoSuchAlgorithmException {
	146	+ User sender = IMAPMessageUtil.extractSender(message);
	147	+ if (!AccessControl.isProjectResourceCreatable(
	148	+ sender, project, ResourceType.ISSUE_POST)) {
	149	+ throw new PermissionDenied(cannotCreateMessage(sender, project,
	150	+ ResourceType.ISSUE_POST));
	151	+ }
	152	+ Content parsedMessage = extractContent(message);
	153	+ String messageId = message.getMessageID();
	154	+ Address[] recipients = message.getAllRecipients();
	155	+ String subject = message.getSubject();
	156	+
	157	+ return saveIssue(subject, project, sender, parsedMessage, messageId, recipients);
	158	+ }
	159	+
	160	+ @Transactional
	161	+ public static Issue saveIssue(String subject,
	162	+ Project project,
	163	+ User sender,
	164	+ Content parsedMessage,
	165	+ String messageId, Address[] recipients)
	166	+ throws MessagingException, IOException, NoSuchAlgorithmException {
	167	+ Issue issue = new Issue(project, sender, subject, parsedMessage.body);
	168	+ issue.save();
	169	+
	170	+ NotificationEvent event = NotificationEvent.forNewIssue(issue, sender);
	171	+
	172	+ Map<String, Attachment> relatedAttachments = saveAttachments(
	173	+ parsedMessage.attachments,
	174	+ issue.asResource());
	175	+
	176	+ if (new ContentType(parsedMessage.type).match(MimeType.HTML)) {
	177	+ // replace cid with attachments
	178	+ issue.body = replaceCidWithAttachments(
	179	+ issue.body, relatedAttachments);
	180	+ issue.update();
	181	+ }
	182	+
	183	+ new OriginalEmail(messageId, issue.asResource()).save();
	184	+
	185	+ // Add the event
	186	+ addEvent(event, recipients, sender);
	187	+
	188	+ return issue;
	189	+ }
	190	+
	191	+ /**
	192	+ * Create a review comment from the given email.
	193	+ *
	194	+ * @param message
	195	+ * @param target
	196	+ * @throws IOException
	197	+ * @throws MessagingException
	198	+ * @throws PermissionDenied
	199	+ * @throws NoSuchAlgorithmException
	200	+ */
	201	+ static void saveReviewComment(IMAPMessage message,
	202	+ Resource target)
	203	+ throws IOException, MessagingException, PermissionDenied, NoSuchAlgorithmException {
	204	+ User sender = IMAPMessageUtil.extractSender(message);
	205	+
	206	+ if (!AccessControl.isProjectResourceCreatable(
	207	+ sender, target.getProject(), ResourceType.REVIEW_COMMENT)) {
	208	+ throw new PermissionDenied(cannotCreateMessage(sender,
	209	+ target.getProject(), target.getType()));
	210	+ }
	211	+
	212	+ Content content = extractContent(message);
	213	+ String messageID = message.getMessageID();
	214	+ Address[] allRecipients = message.getAllRecipients();
	215	+
	216	+ saveReviewComment(target, sender, content, messageID, allRecipients);
	217	+ }
	218	+
	219	+ @Transactional
	220	+ protected static ReviewComment saveReviewComment(Resource target,
	221	+ User sender,
	222	+ Content content,
	223	+ String messageID,
	224	+ Address[] allRecipients)
	225	+ throws MessagingException, IOException, NoSuchAlgorithmException {
	226	+ ReviewComment comment;
	227	+ CommentThread thread = CommentThread.find.byId(Long.valueOf(target.getId()));
	228	+
	229	+ if (thread == null) {
	230	+ throw new IllegalArgumentException();
	231	+ }
	232	+
	233	+ comment = new ReviewComment();
	234	+ comment.setContents(content.body);
	235	+ comment.author = new UserIdent(sender);
	236	+ comment.thread = thread;
	237	+ comment.save();
	238	+
	239	+ Map<String, Attachment> relatedAttachments = saveAttachments(
	240	+ content.attachments,
	241	+ comment.asResource());
	242	+
	243	+ if (new ContentType(content.type).match(MimeType.HTML)) {
	244	+ // replace cid with attachments
	245	+ comment.setContents(replaceCidWithAttachments(
	246	+ comment.getContents(), relatedAttachments));
	247	+ comment.update();
	248	+ }
	249	+
	250	+ new OriginalEmail(messageID, comment.asResource()).save();
	251	+
	252	+ // Add the event
	253	+ if (thread.isOnPullRequest()) {
	254	+ addEvent(NotificationEvent.forNewComment(sender, thread.pullRequest, comment),
	255	+ allRecipients, sender);
	256	+ } else {
	257	+ try {
	258	+ String commitId;
	259	+
	260	+ if (thread instanceof CodeCommentThread) {
	261	+ commitId = ((CodeCommentThread)thread).commitId;
	262	+ } else if (thread instanceof NonRangedCodeCommentThread) {
	263	+ commitId = ((NonRangedCodeCommentThread)thread).commitId;
	264	+ } else {
	265	+ throw new IllegalArgumentException();
	266	+ }
	267	+
	268	+ addEvent(NotificationEvent.forNewCommitComment(target.getProject(), comment,
	269	+ commitId, sender), allRecipients, sender);
	270	+ } catch (Exception e) {
	271	+ Logger.warn("Failed to send a notification", e);
	272	+ }
	273	+ }
	274	+
	275	+ return comment;
	276	+ }
	277	+
	278	+ // You don't need to instantiate this class because this class is just
	279	+ // a set of static methods.
	280	+ private CreationViaEmail() { }
	281	+
	282	+ @Nonnull
	283	+ private static Content extractContent(MimePart part) throws IOException, MessagingException {
	284	+ return processPart(part, null);
	285	+ }
	286	+
	287	+ @Nonnull
	288	+ private static Content processPart(MimePart part,
	289	+ MimePart parent) throws MessagingException,
	290	+ IOException {
	291	+ if (part == null) {
	292	+ return new Content();
	293	+ }
	294	+
	295	+ if (part.getFileName() != null) {
	296	+ // Assume that a part which has a filename is an attachment.
	297	+ return new Content(part);
	298	+ }
	299	+
	300	+ if (part.isMimeType("text/*")) {
	301	+ return getContent(part);
	302	+ } else if (part.isMimeType("multipart/*")) {
	303	+ if (part.isMimeType(MimeType.MULTIPART_RELATED)) {
	304	+ return getContentWithAttachments(part);
	305	+ } else if (part.isMimeType(MimeType.MULTIPART_ALTERNATIVE)) {
	306	+ return getContentOfBestPart(part, parent);
	307	+ } else {
	308	+ return getJoinedContent(part);
	309	+ }
	310	+ }
	311	+
	312	+ return new Content();
	313	+ }
	314	+
	315	+ private static Content getJoinedContent(MimePart part) throws IOException, MessagingException {
	316	+ Content result = new Content();
	317	+ MimeMultipart mp = (MimeMultipart) part.getContent();
	318	+ for(int i = 0; i < mp.getCount(); i++) {
	319	+ MimeBodyPart p = (MimeBodyPart) mp.getBodyPart(i);
	320	+ result.merge(processPart(p, part));
	321	+ }
	322	+ return result;
	323	+ }
	324	+
	325	+ private static Content getContent(MimePart part) throws IOException, MessagingException {
	326	+ Content result = new Content();
	327	+ result.body = (String) part.getContent();
	328	+ result.type = part.getContentType();
	329	+ return result;
	330	+ }
	331	+
	332	+ private static Content getContentOfBestPart(MimePart part, MimePart parent) throws IOException, MessagingException {
	333	+ MimeBodyPart best = null;
	334	+ MimeMultipart mp = (MimeMultipart) part.getContent();
	335	+ for(int i = 0; i < mp.getCount(); i++) {
	336	+ // Prefer HTML if the parent is a multipart/related part which may contain
	337	+ // inline images, because text/plain cannot embed the images.
	338	+ boolean isHtmlPreferred =
	339	+ parent != null && parent.isMimeType(MimeType.MULTIPART_RELATED);
	340	+ best = better((MimeBodyPart) mp.getBodyPart(i), best, isHtmlPreferred);
	341	+ }
	342	+ return processPart(best, part);
	343	+ }
	344	+
	345	+ private static Content getContentWithAttachments(MimePart part) throws MessagingException, IOException {
	346	+ Content result = new Content();
	347	+ String rootId = new ContentType(part.getContentType())
	348	+ .getParameter("start");
	349	+ MimeMultipart mp = (MimeMultipart) part.getContent();
	350	+ for(int i = 0; i < mp.getCount(); i++) {
	351	+ MimePart p = (MimePart) mp.getBodyPart(i);
	352	+ if (isRootPart(p, i, rootId)) {
	353	+ result = result.merge(processPart(p, part));
	354	+ } else {
	355	+ result.attachments.add(p);
	356	+ }
	357	+ }
	358	+ return result;
	359	+ }
	360	+
	361	+ /**
	362	+ * Returns true if the given part is root part.
	363	+ *
	364	+ * The given part is root part, if the part is the first one and the given
	365	+ * root id is not defined or the content id of the part equals to the given
	366	+ * root id.
	367	+ *
	368	+ * @param part
	369	+ * @param nthPart
	370	+ * @param rootId
	371	+ * @return
	372	+ * @throws MessagingException
	373	+ */
	374	+ private static boolean isRootPart(MimePart part, int nthPart, String rootId) throws MessagingException {
	375	+ return (rootId == null && nthPart == 0) \|\| StringUtils.equals(part.getContentID(), rootId);
	376	+ }
	377	+
	378	+ private static int getPoint(BodyPart p, String[] preferences) throws MessagingException {
	379	+ if (p == null) {
	380	+ return 0;
	381	+ }
	382	+
	383	+ for (int i = 0; i < preferences.length; i++) {
	384	+ if (p.isMimeType(preferences[i])) {
	385	+ return preferences.length + 1 - i;
	386	+ }
	387	+ }
	388	+
	389	+ return 1;
	390	+ }
	391	+
	392	+ /**
	393	+ * multipart/related > text/plain > the others
	394	+ *
	395	+ * @param p
	396	+ * @param best
	397	+ * @param isHtmlPreferred
	398	+ * @return
	399	+ * @throws javax.mail.MessagingException
	400	+ */
	401	+ private static MimeBodyPart better(MimeBodyPart p, MimeBodyPart best, boolean isHtmlPreferred) throws
	402	+ MessagingException {
	403	+ String[] preferences;
	404	+ if (isHtmlPreferred) {
	405	+ preferences = new String[]{MimeType.MULTIPART_RELATED, MimeType.HTML, MimeType.PLAIN_TEXT};
	406	+ } else {
	407	+ preferences = new String[]{MimeType.MULTIPART_RELATED, MimeType.PLAIN_TEXT, MimeType.HTML};
	408	+ }
	409	+
	410	+ return getPoint(p, preferences) > getPoint(best, preferences) ? p : best;
	411	+ }
	412	+
	413	+ private static String cannotCreateMessage(User user, Project project,
	414	+ ResourceType resourceType) {
	415	+ Lang lang = Lang.apply(user.getPreferredLanguage());
	416	+ String resourceTypeName = resourceType.getName(lang);
	417	+ return Messages.get(lang, "viaEmail.error.cannotCreate", user, resourceTypeName, project);
	418	+ }
	419	+
	420	+
	421	+ private static void addEvent(NotificationEvent event, Address[] recipients,
	422	+ User sender) {
	423	+ HashSet<User> emailUsers = new HashSet<>();
	424	+ emailUsers.add(sender);
	425	+ for (Address addr : recipients) {
	426	+ emailUsers.add(
	427	+ User.findByEmail(((InternetAddress) addr).getAddress()));
	428	+ }
	429	+ event.receivers.removeAll(emailUsers);
	430	+ NotificationEvent.add(event);
	431	+ }
	432	+
	433	+ private static String replaceCidWithAttachments(String html,
	434	+ Map<String, Attachment> attachments) {
	435	+ Document doc = Jsoup.parse(html);
	436	+ String[] attrNames = {"src", "href"};
	437	+
	438	+ for (String attrName : attrNames) {
	439	+ Elements tags = doc.select("*[" + attrName + "]");
	440	+ for (Element tag : tags) {
	441	+ String uriString = tag.attr(attrName).trim();
	442	+
	443	+ if (!uriString.toLowerCase().startsWith("cid:")) {
	444	+ continue;
	445	+ }
	446	+
	447	+ String cid = uriString.substring("cid:".length());
	448	+
	449	+ if (!attachments.containsKey(cid)) {
	450	+ continue;
	451	+ }
	452	+
	453	+ Long id = attachments.get(cid).id;
	454	+ tag.attr(attrName,
	455	+ controllers.routes.AttachmentApp.getFile(id).url());
	456	+ }
	457	+ }
	458	+
	459	+ Elements bodies = doc.getElementsByTag("body");
	460	+
	461	+ if (bodies.size() > 0) {
	462	+ return bodies.get(0).html();
	463	+ } else {
	464	+ return doc.html();
	465	+ }
	466	+ }
	467	+
	468	+ private static Attachment saveAttachment(Part partToAttach, Resource container)
	469	+ throws MessagingException, IOException, NoSuchAlgorithmException {
	470	+ Attachment attach = new Attachment();
	471	+ String fileName = MimeUtility.decodeText(partToAttach.getFileName());
	472	+ attach.store(partToAttach.getInputStream(), fileName, container);
	473	+ if (!attach.mimeType.equalsIgnoreCase(partToAttach.getContentType())) {
	474	+ Logger.info("The email says the content type is '" + partToAttach
	475	+ .getContentType() + "' but Yobi determines it is '" +
	476	+ attach.mimeType + "'");
	477	+ }
	478	+
	479	+ return attach;
	480	+ }
	481	+
	482	+ private static Map<String, Attachment> saveAttachments(
	483	+ Collection<MimePart> partsToAttach, Resource container)
	484	+ throws MessagingException, IOException, NoSuchAlgorithmException {
	485	+ Map<String, Attachment> result = new HashMap<>();
	486	+
	487	+ for (MimePart partToAttach : partsToAttach) {
	488	+ Attachment attachment = saveAttachment(partToAttach, container);
	489	+ if(partToAttach.getContentID() != null) {
	490	+ String cid = partToAttach.getContentID().trim();
	491	+ cid = cid.replace("<", "");
	492	+ cid = cid.replace(">", "");
	493	+ result.put(cid, attachment);
	494	+ }
	495	+ }
	496	+
	497	+ return result;
	498	+ }
	499	+
	500	+}

8be4339

app/mailbox/EmailAddressWithDetail.java (added)

+++ app/mailbox/EmailAddressWithDetail.java

...	...	@@ -0,0 +1,104 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox;
	22	+
	23	+import org.apache.commons.lang3.StringUtils;
	24	+import play.Configuration;
	25	+
	26	+import javax.annotation.Nonnull;
	27	+
	28	+/**
	29	+ * An email address whose detail part is parsed.
	30	+ */
	31	+public class EmailAddressWithDetail {
	32	+ @Nonnull
	33	+ private final String user;
	34	+
	35	+ @Nonnull
	36	+ private String detail;
	37	+
	38	+ @Nonnull
	39	+ private final String domain;
	40	+
	41	+ public EmailAddressWithDetail(@Nonnull String address) {
	42	+ int plus = address.indexOf('+');
	43	+ int at = address.indexOf('@');
	44	+
	45	+ if (plus < 0) {
	46	+ user = address.substring(0, at);
	47	+ detail = "";
	48	+ } else {
	49	+ user = address.substring(0, plus);
	50	+ detail = address.substring(plus + 1, at);
	51	+ }
	52	+
	53	+ domain = address.substring(at + 1);
	54	+ }
	55	+
	56	+ /**
	57	+ * @return whether this email address is to Yobi
	58	+ */
	59	+ public boolean isToYobi() {
	60	+ Configuration imapConfig = Configuration.root().getConfig("imap");
	61	+ String yobiAddr = imapConfig.getString("address", imapConfig.getString("user"));
	62	+ return this.equalsExceptDetails(new EmailAddressWithDetail(yobiAddr));
	63	+ }
	64	+
	65	+ @Nonnull
	66	+ public String getUser() {
	67	+ return user;
	68	+ }
	69	+
	70	+ @Nonnull
	71	+ public String getDetail() {
	72	+ return detail;
	73	+ }
	74	+
	75	+ @Nonnull
	76	+ public String getDomain() {
	77	+ return domain;
	78	+ }
	79	+
	80	+ /**
	81	+ * Set the detail part.
	82	+ *
	83	+ * @param detail
	84	+ */
	85	+ public void setDetail(@Nonnull String detail) {
	86	+ if (detail == null) {
	87	+ throw new IllegalArgumentException("detail must not be null");
	88	+ }
	89	+ this.detail = detail;
	90	+ }
	91	+
	92	+ /**
	93	+ * @param that
	94	+ * @return whether the given address has the same detail with this
	95	+ */
	96	+ public boolean equalsExceptDetails(@Nonnull EmailAddressWithDetail that) {
	97	+ return this.getUser().equals(that.getUser())
	98	+ && this.getDomain().equals(that.getDomain());
	99	+ }
	100	+
	101	+ public String toString() {
	102	+ return StringUtils.join(new String[]{user, detail}, "+") + "@" + domain;
	103	+ }
	104	+}

8be4339

app/mailbox/EmailHandler.java (added)

+++ app/mailbox/EmailHandler.java

...	...	@@ -0,0 +1,489 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox;
	22	+
	23	+import com.sun.mail.imap.IMAPFolder;
	24	+import com.sun.mail.imap.IMAPMessage;
	25	+import info.schleichardt.play2.mailplugin.Mailer;
	26	+import mailbox.exceptions.*;
	27	+import models.Project;
	28	+import models.Property;
	29	+import models.User;
	30	+import models.enumeration.Operation;
	31	+import models.resource.Resource;
	32	+import org.apache.commons.lang3.ArrayUtils;
	33	+import org.apache.commons.lang3.StringUtils;
	34	+import org.apache.commons.lang3.exception.ExceptionUtils;
	35	+import org.apache.commons.mail.HtmlEmail;
	36	+import play.Logger;
	37	+import play.api.i18n.Lang;
	38	+import play.i18n.Messages;
	39	+import utils.AccessControl;
	40	+import utils.Config;
	41	+
	42	+import javax.annotation.Nonnull;
	43	+import javax.mail.Address;
	44	+import javax.mail.Message;
	45	+import javax.mail.MessagingException;
	46	+import javax.mail.internet.InternetAddress;
	47	+import java.io.IOException;
	48	+import java.security.NoSuchAlgorithmException;
	49	+import java.util.*;
	50	+import java.util.regex.Matcher;
	51	+import java.util.regex.Pattern;
	52	+
	53	+/**
	54	+ * A set of methods to process incoming emails.
	55	+ *
	56	+ * See {@link MailboxService} for more detailed rules to process the emails.
	57	+ */
	58	+class EmailHandler {
	59	+ /**
	60	+ * Fetches new emails from the given IMAP folder and process them.
	61	+ *
	62	+ * @param folder
	63	+ * @throws MessagingException
	64	+ */
	65	+ static void handleNewMessages(IMAPFolder folder) throws MessagingException {
	66	+ Long lastUIDValidity = Property.getLong(Property.Name.MAILBOX_LAST_UID_VALIDITY);
	67	+ Long lastSeenUID = Property.getLong(Property.Name.MAILBOX_LAST_SEEN_UID);
	68	+
	69	+ long uidValidity = folder.getUIDValidity();
	70	+
	71	+ // Get new messages and handle them
	72	+ if (lastUIDValidity != null
	73	+ && lastUIDValidity.equals(uidValidity)
	74	+ && lastSeenUID != null) {
	75	+ // Use the next uid instead of folder.LASTUID which possibly be
	76	+ // smaller than lastSeenUID + 1.
	77	+ handleMessages(folder, folder.getMessagesByUID(lastSeenUID + 1,
	78	+ folder.getUIDNext()));
	79	+ }
	80	+
	81	+ Property.set(Property.Name.MAILBOX_LAST_UID_VALIDITY, uidValidity);
	82	+ }
	83	+
	84	+ /**
	85	+ * Processes the given emails.
	86	+ *
	87	+ * @param folder
	88	+ * @param messages
	89	+ */
	90	+ static void handleMessages(IMAPFolder folder, Message[] messages) {
	91	+ handleMessages(folder, Arrays.asList(messages));
	92	+ }
	93	+
	94	+ private EmailHandler() {
	95	+ // You don't need to instantiate this class because this class is just
	96	+ // a set of static methods.
	97	+ }
	98	+
	99	+ private static List<String> parseMessageIds(String headerValue) {
	100	+ // in-reply-to = "In-Reply-To:" 1*msg-id CRLF
	101	+ // references = "References:" 1*msg-id CRLF
	102	+ // msg-id = [CFWS] "<" id-left "@" id-right ">" [CFWS]
	103	+ // CFWS = (1*([FWS] comment) [FWS]) / FWS
	104	+ // comment = "(" *([FWS] ccontent) [FWS] ")"
	105	+ // ccontent = ctext / quoted-pair / comment
	106	+ // FWS = ([WSP CRLF] 1WSP) / obs-FWS
	107	+ // obs-FWS = 1WSP (CRLF 1*WSP)
	108	+ // WSP = SP / HTAB
	109	+ // ctext = %d33-39 / ; Printable US-ASCII
	110	+ // %d42-91 / ; characters not including
	111	+ // %d93-126 / ; "(", ")", or "\"
	112	+ // obs-ctext
	113	+ List<String> result = new ArrayList<>();
	114	+ String cfws = "[^<](?:\\([^\\(]\\))?[^<]*";
	115	+ Pattern pattern = Pattern.compile(cfws + "(<[^>]*>)" + cfws);
	116	+ Matcher matcher = pattern.matcher(headerValue);
	117	+ while(matcher.find()) {
	118	+ result.add(matcher.group(1));
	119	+ }
	120	+ return result;
	121	+ }
	122	+
	123	+ private static void handleMessages(final IMAPFolder folder, List<Message> messages) {
	124	+ // Sort messages by uid; If they are not sorted, it is possible to miss
	125	+ // a email as a followed example:
	126	+ //
	127	+ // 1. Yobi fetches two messages with uid of 1, 3 and 2.
	128	+ // 2. Yobi handles a message with uid of 1 and update lastseenuid to 1.
	129	+ // 3. Yobi handles a message with uid of 3 and update lastseenuid to 3.
	130	+ // 4. Yobi Shutdown Abnormally
	131	+ // 5. The system administrator restarts Yobi.
	132	+ // 6. Yobi fetches messages with uid larger than 3, the value of the
	133	+ // lastseenuid; It means that **the message with uid of 2 will be
	134	+ // never handled!**
	135	+ Collections.sort(messages, new Comparator<Message>() {
	136	+ @Override
	137	+ public int compare(Message m1, Message m2) {
	138	+ try {
	139	+ return Long.compare(folder.getUID(m1), folder.getUID(m2));
	140	+ } catch (MessagingException e) {
	141	+ play.Logger.warn(
	142	+ "Failed to compare uids of " + m1 + " and " + m2 +
	143	+ " while sorting messages by the uid; " +
	144	+ "There is some remote chance of loss of " +
	145	+ "mail requests.");
	146	+ return 0;
	147	+ }
	148	+ }
	149	+ });
	150	+
	151	+ for (Message msg : messages) {
	152	+ handleMessage((IMAPMessage) msg);
	153	+ }
	154	+ }
	155	+
	156	+ private static void handleMessage(@Nonnull IMAPMessage msg) {
	157	+ Exception exception = null;
	158	+ long startTime = System.currentTimeMillis();
	159	+ User author;
	160	+
	161	+ InternetAddress[] senderAddresses;
	162	+
	163	+ try {
	164	+ senderAddresses = (InternetAddress[]) msg.getFrom();
	165	+ } catch (Exception e) {
	166	+ play.Logger.error("Failed to get senders from an email", e);
	167	+ return;
	168	+ }
	169	+
	170	+ if (senderAddresses == null \|\| senderAddresses.length == 0) {
	171	+ play.Logger.warn("This email has no sender: " + msg);
	172	+ return;
	173	+ }
	174	+
	175	+ for (InternetAddress senderAddress : senderAddresses) {
	176	+ List<String> errors = new ArrayList<>();
	177	+
	178	+ author = User.findByEmail(senderAddress.getAddress());
	179	+
	180	+ try {
	181	+ createResources(msg, author, errors);
	182	+ } catch (MailHandlerException e) {
	183	+ exception = e;
	184	+ errors.add(e.getMessage());
	185	+ } catch (Exception e) {
	186	+ exception = e;
	187	+ String shortDescription;
	188	+ try {
	189	+ shortDescription = IMAPMessageUtil.asString(msg);
	190	+ } catch (MessagingException e1) {
	191	+ shortDescription = msg.toString();
	192	+ }
	193	+ play.Logger.warn("Failed to process an email: " + shortDescription, e);
	194	+ errors.add("Unexpected error occurs");
	195	+ }
	196	+
	197	+ if (errors.size() > 0) {
	198	+ String username = senderAddress.getPersonal();
	199	+ String emailAddress = senderAddress.getAddress();
	200	+ String helpMessage = getHelpMessage(
	201	+ Lang.apply(author.getPreferredLanguage()), username, errors);
	202	+ reply(msg, username, emailAddress, helpMessage);
	203	+ }
	204	+
	205	+ try {
	206	+ log(msg, startTime, exception);
	207	+ } catch (MessagingException e) {
	208	+ play.Logger.warn("Failed to log mail request", e);
	209	+ }
	210	+
	211	+ try {
	212	+ MailboxService.updateLastSeenUID(msg);
	213	+ } catch (MessagingException e) {
	214	+ play.Logger.warn("Failed to update the lastSeenUID", e);
	215	+ }
	216	+ }
	217	+ }
	218	+
	219	+ private static void createResources(IMAPMessage msg, User sender, List<String> errors)
	220	+ throws MessagingException, IOException, MailHandlerException, NoSuchAlgorithmException {
	221	+
	222	+ // Find all threads by message-ids in In-Reply-To and References headers in the email.
	223	+ Set<Resource> threads = getThreads(msg);
	224	+
	225	+ // Note: It is possible that an email creates many resources.
	226	+ for (Project project : getProjects(msg, sender, errors)) {
	227	+ boolean hasCommented = false;
	228	+
	229	+ // If there is a related thread, we assume the author wants to comment the thread.
	230	+ for (Resource thread : threads) {
	231	+ if (thread.getProject().id.equals(project.id)) {
	232	+ switch(thread.getType()) {
	233	+ case COMMENT_THREAD:
	234	+ CreationViaEmail.saveReviewComment(msg, thread);
	235	+ break;
	236	+ case ISSUE_POST:
	237	+ case BOARD_POST:
	238	+ CreationViaEmail.saveComment(msg, thread);
	239	+ break;
	240	+ }
	241	+ hasCommented = true;
	242	+ }
	243	+ }
	244	+
	245	+ // If there is no related thread, we assume the author wants to create new issue.
	246	+ if (!hasCommented) {
	247	+ CreationViaEmail.saveIssue(msg, project);
	248	+ }
	249	+ }
	250	+ }
	251	+
	252	+ private static Set<Project> getProjects(IMAPMessage msg, User sender, List<String> errors) throws MessagingException {
	253	+ Set<Project> projects = new HashSet<>();
	254	+ for (EmailAddressWithDetail address : getMailAddressesToYobi(msg.getAllRecipients())) {
	255	+ Project project;
	256	+ String detail = address.getDetail();
	257	+
	258	+ if (StringUtils.isEmpty(detail)) {
	259	+ // TODO: Do we need send help message?
	260	+ continue;
	261	+ }
	262	+
	263	+ Lang lang = Lang.apply(sender.getPreferredLanguage());
	264	+
	265	+ if (StringUtils.equalsIgnoreCase(detail, "help")) {
	266	+ reply(msg, sender, getHelpMessage(lang, sender));
	267	+ continue;
	268	+ }
	269	+
	270	+ try {
	271	+ project = getProjectFromDetail(detail);
	272	+ } catch (IllegalDetailException e) {
	273	+ errors.add(Messages.get(lang, "viaEmail.error.email", address.toString()));
	274	+ continue;
	275	+ }
	276	+
	277	+ if (project == null \|\|
	278	+ !AccessControl.isAllowed(sender, project.asResource(), Operation.READ)) {
	279	+ errors.add(Messages.get(lang, "viaEmail.error.forbidden.or.notfound",
	280	+ address.toString()));
	281	+ continue;
	282	+ }
	283	+
	284	+ projects.add(project);
	285	+ }
	286	+ return projects;
	287	+ }
	288	+
	289	+ private static Set<Resource> getThreads(IMAPMessage msg) throws MessagingException {
	290	+ // Get message-ids from In-Reply-To and References headers.
	291	+ Set<String> messageIds = new HashSet<>();
	292	+
	293	+ String inReplyTo = msg.getInReplyTo();
	294	+ if (inReplyTo != null) {
	295	+ messageIds.addAll(parseMessageIds(inReplyTo));
	296	+ }
	297	+
	298	+ for (String references : ArrayUtils.nullToEmpty(msg.getHeader("References"))) {
	299	+ if (references != null) {
	300	+ messageIds.addAll(parseMessageIds(references));
	301	+ }
	302	+ }
	303	+
	304	+ // Find threads by the message-id.
	305	+ Set<Resource> threads = new HashSet<>();
	306	+
	307	+ for (String messageId : messageIds) {
	308	+ for (Resource resource : findResourcesByMessageId(messageId)) {
	309	+ switch (resource.getType()) {
	310	+ case COMMENT_THREAD:
	311	+ case ISSUE_POST:
	312	+ case BOARD_POST:
	313	+ threads.add(resource);
	314	+ break;
	315	+ case REVIEW_COMMENT:
	316	+ threads.add(resource.getContainer());
	317	+ break;
	318	+ default:
	319	+ Logger.info(
	320	+ "Cannot comment a resource of unknown type: " + resource);
	321	+ break;
	322	+ }
	323	+ }
	324	+ }
	325	+
	326	+ return threads;
	327	+ }
	328	+
	329	+ private static Project getProjectFromDetail(String detail) throws IllegalDetailException {
	330	+ String[] segments = detail.split("/");
	331	+
	332	+ if (segments.length < 2) {
	333	+ throw new IllegalDetailException();
	334	+ }
	335	+
	336	+ return Project.findByOwnerAndProjectName(segments[0], segments[1]);
	337	+ }
	338	+
	339	+ private static String getHelpMessage(Lang lang, String username, List<String> errors) {
	340	+ String help = "";
	341	+ String paragraphSeparator = "\n\n";
	342	+ String sampleProject = "dlab/hive";
	343	+ EmailAddressWithDetail address = new EmailAddressWithDetail(Config.getEmailFromImap());
	344	+ address.setDetail("dlab/hive/issue");
	345	+ help += Messages.get(lang, "viaEmail.help.hello", username);
	346	+ if (errors != null && errors.size() > 0) {
	347	+ help += paragraphSeparator;
	348	+ String error;
	349	+ String messageKey;
	350	+ if (errors.size() > 1) {
	351	+ error = "\n* " + StringUtils.join(errors, "\n* ");
	352	+ messageKey = "viaEmail.help.errorMultiLine";
	353	+ } else {
	354	+ error = errors.get(0);
	355	+ messageKey = "viaEmail.help.errorSingleLine";
	356	+ }
	357	+ help += Messages.get(lang, messageKey, Config.getSiteName(), error);
	358	+ }
	359	+ help += paragraphSeparator;
	360	+ help += Messages.get(lang, "viaEmail.help.intro", Config.getSiteName());
	361	+ help += paragraphSeparator;
	362	+ help += Messages.get(lang, "viaEmail.help.description", sampleProject, address);
	363	+ help += paragraphSeparator;
	364	+ help += Messages.get(lang, "viaEmail.help.bye", Config.getSiteName());
	365	+ return help;
	366	+ }
	367	+
	368	+ private static String getHelpMessage(Lang lang, User to) {
	369	+ return getHelpMessage(lang, to, null);
	370	+ }
	371	+
	372	+ private static String getHelpMessage(Lang lang, User to, List<String> errors) {
	373	+ return getHelpMessage(lang, to.name, errors);
	374	+ }
	375	+
	376	+ private static void reply(IMAPMessage origin, String username, String emailAddress,
	377	+ String msg) {
	378	+ final HtmlEmail email = new HtmlEmail();
	379	+
	380	+ try {
	381	+ email.setFrom(Config.getEmailFromSmtp(), Config.getSiteName());
	382	+ email.addTo(emailAddress, username);
	383	+ String subject;
	384	+ if (!origin.getSubject().toLowerCase().startsWith("re:")) {
	385	+ subject = "Re: " + origin.getSubject();
	386	+ } else {
	387	+ subject = origin.getSubject();
	388	+ }
	389	+ email.setSubject(subject);
	390	+ email.setTextMsg(msg);
	391	+ email.setCharset("utf-8");
	392	+ email.setSentDate(new Date());
	393	+ email.addHeader("In-Reply-To", origin.getMessageID());
	394	+ email.addHeader("References", origin.getMessageID());
	395	+ Mailer.send(email);
	396	+ String escapedTitle = email.getSubject().replace("\"", "\\\"");
	397	+ String logEntry = String.format("\"%s\" %s", escapedTitle, email.getToAddresses());
	398	+ play.Logger.of("mail").info(logEntry);
	399	+ } catch (Exception e) {
	400	+ Logger.warn("Failed to send an email: "
	401	+ + email + "\n" + ExceptionUtils.getStackTrace(e));
	402	+ }
	403	+ }
	404	+
	405	+ private static void reply(IMAPMessage origin, User to, String msg) {
	406	+ reply(origin, to.name, to.email, msg);
	407	+ }
	408	+
	409	+ private static Set<EmailAddressWithDetail> getMailAddressesToYobi(Address[] addresses) {
	410	+ Set<EmailAddressWithDetail> addressesToYobi = new HashSet<>();
	411	+
	412	+ if (addresses != null) {
	413	+ for (Address recipient : addresses) {
	414	+ EmailAddressWithDetail address = new EmailAddressWithDetail(((InternetAddress) recipient).getAddress());
	415	+ if (address.isToYobi()) {
	416	+ addressesToYobi.add(address);
	417	+ }
	418	+ }
	419	+ }
	420	+
	421	+ return addressesToYobi;
	422	+ }
	423	+
	424	+ /**
	425	+ * Log a message for an E-mail request.
	426	+ *
	427	+ * @param message An email
	428	+ * @param startTime the time in milliseconds when the request is received
	429	+ */
	430	+ private static void log(@Nonnull IMAPMessage message, long startTime,
	431	+ Exception exception) throws MessagingException {
	432	+
	433	+ String time = ((Long) startTime != null) ?
	434	+ ((System.currentTimeMillis() - startTime) + "ms") : "-";
	435	+
	436	+ String entry = String.format("%s %s %s",
	437	+ IMAPMessageUtil.asString(message),
	438	+ exception == null ? "SUCCESS" : "FAILED",
	439	+ time);
	440	+
	441	+ if (exception != null &&
	442	+ !(exception instanceof MailHandlerException)) {
	443	+ Logger.of("mail.in").error(entry, exception);
	444	+ } else {
	445	+ Logger.of("mail.in").info(entry);
	446	+ }
	447	+ }
	448	+
	449	+ /**
	450	+ * Finds resources by the given message id.
	451	+ *
	452	+ * If there are resources created via an email which matches the message
	453	+ * id, returns the resources, else finds and returns resources which matches
	454	+ * the resource path taken from the id-left part of the message id.
	455	+ *
	456	+ * The format of message-id is defined by RFC 5322 as follows:
	457	+ *
	458	+ * msg-id = [CFWS] "<" id-left "@" id-right ">" [CFWS]
	459	+ *
	460	+ * @param messageId
	461	+ * @return the set of resources
	462	+ */
	463	+ @Nonnull
	464	+ public static Set<Resource> findResourcesByMessageId(String messageId) {
	465	+ Set<Resource> resources = new HashSet<>();
	466	+ Set<OriginalEmail> originalEmails = OriginalEmail.finder.where().eq
	467	+ ("messageId", messageId).findSet();
	468	+
	469	+ if (originalEmails.size() > 0) {
	470	+ for (OriginalEmail originalEmail : originalEmails) {
	471	+ resources.add(Resource.get(originalEmail.resourceType, originalEmail.resourceId));
	472	+ }
	473	+ return resources;
	474	+ }
	475	+
	476	+ try {
	477	+ String resourcePath = IMAPMessageUtil.getIdLeftFromMessageId(messageId);
	478	+ Resource resource = Resource.findByPath(resourcePath);
	479	+ if (resource != null) {
	480	+ resources.add(resource);
	481	+ }
	482	+ } catch (Exception e) {
	483	+ Logger.info(
	484	+ "Error while finding a resource by message-id '" + messageId + "'", e);
	485	+ }
	486	+
	487	+ return resources;
	488	+ }
	489	+}

8be4339

app/mailbox/IMAPMessageUtil.java (added)

+++ app/mailbox/IMAPMessageUtil.java

...	...	@@ -0,0 +1,54 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox;
	22	+
	23	+import com.sun.mail.imap.IMAPMessage;
	24	+import models.*;
	25	+import org.apache.commons.lang.ArrayUtils;
	26	+
	27	+import javax.mail.*;
	28	+import javax.mail.internet.*;
	29	+
	30	+public class IMAPMessageUtil {
	31	+ public static User extractSender(Message msg) throws MessagingException {
	32	+ for (Address addr : msg.getFrom()) {
	33	+ User user = User.findByEmail(((InternetAddress)addr).getAddress());
	34	+ if (!user.equals(User.anonymous)) {
	35	+ return user;
	36	+ }
	37	+ }
	38	+
	39	+ return User.anonymous;
	40	+ }
	41	+
	42	+ public static String asString(IMAPMessage msg) throws MessagingException {
	43	+ return String.format("{Subject: %s, From: %s, To: %s}",
	44	+ msg.getSubject(),
	45	+ ArrayUtils.toString(msg.getFrom()),
	46	+ ArrayUtils.toString(msg.getAllRecipients()));
	47	+ }
	48	+
	49	+ public static String getIdLeftFromMessageId(String messageId) {
	50	+ int start = messageId.indexOf('<');
	51	+ int at = messageId.indexOf('@');
	52	+ return messageId.substring(start + 1, at).trim().replaceFirst("^/", "");
	53	+ }
	54	+}

8be4339

app/mailbox/MailboxService.java (added)

+++ app/mailbox/MailboxService.java

...	...	@@ -0,0 +1,351 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox;
	22	+
	23	+import akka.actor.Cancellable;
	24	+import com.sun.mail.imap.IMAPFolder;
	25	+import com.sun.mail.imap.IMAPMessage;
	26	+import com.sun.mail.imap.IMAPStore;
	27	+import models.Property;
	28	+import models.User;
	29	+import play.Configuration;
	30	+import play.Logger;
	31	+import play.libs.Akka;
	32	+import scala.concurrent.duration.Duration;
	33	+import utils.Diagnostic;
	34	+import utils.SimpleDiagnostic;
	35	+
	36	+import javax.annotation.Nonnull;
	37	+import javax.annotation.concurrent.NotThreadSafe;
	38	+import javax.mail.Folder;
	39	+import javax.mail.FolderClosedException;
	40	+import javax.mail.MessagingException;
	41	+import javax.mail.Session;
	42	+import javax.mail.event.MessageCountEvent;
	43	+import javax.mail.event.MessageCountListener;
	44	+import java.util.*;
	45	+import java.util.concurrent.TimeUnit;
	46	+
	47	+import static javax.mail.Session.getDefaultInstance;
	48	+
	49	+/**
	50	+ * MailboxService opens a mailbox and process emails if necessary.
	51	+ *
	52	+ * MailboxService connects an IMAP server and opens the mailbox from the
	53	+ * server. Every configuration to be needed to do that is defined by imap.* in
	54	+ * conf/application.conf.
	55	+ *
	56	+ * Then MailboxService fetches and processes emails in the mailbox as follows:
	57	+ *
	58	+ * 1. Only emails whose recipients contain the address of Yobi defined by
	59	+ * imap.address configuration are accepted.
	60	+ * 2. Emails must have one or more recipients which are Yobi projects; If not
	61	+ * Yobi replies with an error.
	62	+ * 3. Emails which reference or reply to a resource assumed to comment the
	63	+ * resource; otherwise assumed to post an issue in the projects.
	64	+ * 4. Yobi does the assumed job only if the sender has proper permission to do
	65	+ * that; else Yobi replies with a permission denied error.
	66	+ *
	67	+ * Note: It is possible to create multiple resources if the recipients contain
	68	+ * multiple projects.
	69	+ */
	70	+@NotThreadSafe
	71	+public class MailboxService {
	72	+ private IMAPStore store;
	73	+ private static IMAPFolder folder;
	74	+ private Thread idleThread;
	75	+ private Cancellable pollingSchedule;
	76	+ private boolean isStopping = false;
	77	+
	78	+ /**
	79	+ * Among the given {@code keys}, returns the keys which don't have a matched
	80	+ * value in the given {@code config}.
	81	+ *
	82	+ * @param config
	83	+ * @param keys
	84	+ * @return the keys which don't have a matched value
	85	+ */
	86	+ private static Set<String> getNotConfiguredKeys(Configuration config, String... keys) {
	87	+ Set<String> notConfigured = new HashSet<>();
	88	+ Map<String, Object> configMap = config.asMap();
	89	+ for (String key : keys) {
	90	+ if (!configMap.containsKey(key)) {
	91	+ notConfigured.add(key);
	92	+ }
	93	+ }
	94	+ return notConfigured;
	95	+ }
	96	+
	97	+ /**
	98	+ * Connect to the IMAP server configured by the given {@code imapConfig}.
	99	+ *
	100	+ * @param imapConfig
	101	+ * @return the store to be connected
	102	+ * @throws MessagingException
	103	+ */
	104	+ private IMAPStore connect(Configuration imapConfig) throws MessagingException {
	105	+ Set<String> notConfiguredKeys =
	106	+ getNotConfiguredKeys(imapConfig, "host", "user", "password");
	107	+
	108	+ if (!notConfiguredKeys.isEmpty()) {
	109	+ throw new IllegalStateException(
	110	+ "Cannot connect to the IMAP server because these are" +
	111	+ " not configured: " + notConfiguredKeys);
	112	+ }
	113	+
	114	+ Properties props = new Properties();
	115	+ String s = imapConfig.getBoolean("ssl", false) ? "s" : "";
	116	+ props.setProperty("mail.store.protocol", "imap" + s);
	117	+
	118	+ Session session = getDefaultInstance(props, null);
	119	+ store = (IMAPStore) session.getStore();
	120	+ store.connect(imapConfig.getString("host"),
	121	+ imapConfig.getString("user"),
	122	+ imapConfig.getString("password"));
	123	+ return store;
	124	+
	125	+ }
	126	+
	127	+ /**
	128	+ * Stop MailboxService.
	129	+ */
	130	+ public void stop() {
	131	+ isStopping = true;
	132	+ try {
	133	+ folder.close(true);
	134	+ store.close();
	135	+ if (pollingSchedule != null && !pollingSchedule.isCancelled()) {
	136	+ pollingSchedule.cancel();
	137	+ }
	138	+ } catch (MessagingException e) {
	139	+ play.Logger.error("Error occurred while stop the email receiver", e);
	140	+ }
	141	+ }
	142	+
	143	+ /**
	144	+ * Start Mailbox Service.
	145	+ */
	146	+ public void start() {
	147	+ final Configuration imapConfig = Configuration.root().getConfig("imap");
	148	+
	149	+ if (imapConfig == null) {
	150	+ play.Logger.info("Mailbox Service doesn't start because IMAP server is not configured.");
	151	+ return;
	152	+ }
	153	+
	154	+ List<User> users = User.find.where()
	155	+ .ilike("email", imapConfig.getString("user") + "+%").findList();
	156	+
	157	+ if (users.size() == 1) {
	158	+ Logger.warn("There is a user whose email is danger: " + users);
	159	+ }
	160	+ if (users.size() > 1) {
	161	+ Logger.warn("There are some users whose email is danger: " + users);
	162	+ }
	163	+
	164	+ try {
	165	+ store = connect(imapConfig);
	166	+ folder = (IMAPFolder) store.getFolder(
	167	+ imapConfig.getString("folder", "inbox"));
	168	+ folder.open(Folder.READ_ONLY);
	169	+ } catch (Exception e) {
	170	+ play.Logger.error("Failed to open IMAP folder", e);
	171	+ return;
	172	+ }
	173	+
	174	+ try {
	175	+ EmailHandler.handleNewMessages(folder);
	176	+ } catch (MessagingException e) {
	177	+ play.Logger.error("Failed to handle new messages");
	178	+ }
	179	+
	180	+ try {
	181	+ startEmailListener();
	182	+ } catch (Exception e) {
	183	+ startEmailPolling();
	184	+ }
	185	+
	186	+ Diagnostic.register(new SimpleDiagnostic() {
	187	+ @Override
	188	+ public String checkOne() {
	189	+ if (idleThread == null) {
	190	+ return "The Email Receiver is not initialized";
	191	+ } else if (!idleThread.isAlive()) {
	192	+ return "The Email Receiver is not running";
	193	+ } else {
	194	+ return null;
	195	+ }
	196	+ }
	197	+ });
	198	+ }
	199	+
	200	+ /**
	201	+ * Reopen the IMAP folder which is used by MailboxService.
	202	+ *
	203	+ * @return the open IMAP folder
	204	+ * @throws MessagingException
	205	+ */
	206	+ private IMAPFolder reopenFolder() throws MessagingException {
	207	+ final Configuration imapConfig = Configuration.root().getConfig("imap");
	208	+
	209	+ if (store == null \|\| !store.isConnected()) {
	210	+ store = connect(imapConfig);
	211	+ }
	212	+
	213	+ IMAPFolder folder = (IMAPFolder) store.getFolder(
	214	+ imapConfig.getString("folder", "inbox"));
	215	+ folder.open(Folder.READ_ONLY);
	216	+
	217	+ return folder;
	218	+ }
	219	+
	220	+ /**
	221	+ * Start the polling of emails.
	222	+ *
	223	+ * The polling is fetching new emails from the IMAP folder and processing
	224	+ * them.
	225	+ *
	226	+ * This polling is a fallback of
	227	+ * {@link #startEmailListener()} if the IMAP server does
	228	+ * not support IDLE command.
	229	+ */
	230	+ private void startEmailPolling() {
	231	+ Runnable polling = new Runnable() {
	232	+ @Override
	233	+ public void run() {
	234	+ try {
	235	+ if (folder == null \|\| !folder.isOpen()) {
	236	+ folder = reopenFolder();
	237	+ }
	238	+
	239	+ EmailHandler.handleNewMessages(folder);
	240	+ } catch (MessagingException e) {
	241	+ play.Logger.error("Failed to poll emails", e);
	242	+ return;
	243	+ }
	244	+
	245	+ try {
	246	+ folder.close(true);
	247	+ } catch (MessagingException e) {
	248	+ play.Logger.error("Failed to close the IMAP folder", e);
	249	+ }
	250	+ }
	251	+ };
	252	+
	253	+ pollingSchedule = Akka.system().scheduler().schedule(
	254	+ Duration.create(0, TimeUnit.MINUTES),
	255	+ Duration.create(
	256	+ Configuration.root().getMilliseconds("application.mailbox.polling.interval", 5 * 60 * 1000L),
	257	+ TimeUnit.MILLISECONDS),
	258	+ polling,
	259	+ Akka.system().dispatcher()
	260	+ );
	261	+ }
	262	+
	263	+ /**
	264	+ * Start the email listener by using IDLE command.
	265	+ *
	266	+ * The listener will fetch new emails from the IMAP folder and process them.
	267	+ *
	268	+ * @throws MessagingException
	269	+ * @throws UnsupportedOperationException
	270	+ */
	271	+ private void startEmailListener()
	272	+ throws MessagingException, UnsupportedOperationException {
	273	+ if (!((IMAPStore)folder.getStore()).hasCapability("IDLE")) {
	274	+ throw new UnsupportedOperationException(
	275	+ "The imap server does not support IDLE command");
	276	+ }
	277	+
	278	+ MessageCountListener messageCountListener = new MessageCountListener() {
	279	+ @Override
	280	+ public void messagesAdded(@Nonnull MessageCountEvent e) {
	281	+ try {
	282	+ EmailHandler.handleMessages(folder, e.getMessages());
	283	+ } catch (Exception e1) {
	284	+ play.Logger.error("Unexpected error occurs while handling messages", e1);
	285	+ }
	286	+ }
	287	+
	288	+ @Override
	289	+ public void messagesRemoved(MessageCountEvent e) {
	290	+
	291	+ }
	292	+ };
	293	+
	294	+ // Add the handler for messages to be added in the future.
	295	+ folder.addMessageCountListener(messageCountListener);
	296	+
	297	+ idleThread = new Thread() {
	298	+ @Override
	299	+ public void run() {
	300	+ Logger.info("Start the Email Receiving Thread");
	301	+ while (true) {
	302	+ if (isStopping) break;
	303	+ try {
	304	+ // Notify the message count listener if the value of EXISTS response is
	305	+ // larger than realTotal.
	306	+ folder.idle();
	307	+ } catch (FolderClosedException e) {
	308	+ if (isStopping) break;
	309	+ // reconnect
	310	+ Logger.info("Reopen the imap folder");
	311	+ try {
	312	+ folder = reopenFolder();
	313	+ } catch (MessagingException e1) {
	314	+ Logger.warn("Failed to reopen the imap folder; " +
	315	+ "abort", e1);
	316	+ break;
	317	+ }
	318	+ } catch (Exception e) {
	319	+ Logger.warn("Failed to run IDLE command; abort", e);
	320	+ break;
	321	+ }
	322	+ }
	323	+ Logger.info("Stop the Email Receiving Thread");
	324	+ }
	325	+ };
	326	+ idleThread.start();
	327	+ }
	328	+
	329	+ /**
	330	+ * Update the lastSeenUID.
	331	+ *
	332	+ * lastSeenUID MUST be updated when a new email is processed so that
	333	+ * MailboxService fetches new emails correctly.
	334	+ *
	335	+ * @param msg
	336	+ * @throws MessagingException
	337	+ */
	338	+ synchronized static void updateLastSeenUID(IMAPMessage msg) throws MessagingException {
	339	+ long uid = folder.getUID(msg);
	340	+
	341	+ // Do not update lastSeenUID if it is larger than the current uid.
	342	+ try {
	343	+ long lastSeenUID = Property.getLong(Property.Name.MAILBOX_LAST_SEEN_UID);
	344	+ if (uid <= lastSeenUID) {
	345	+ return;
	346	+ }
	347	+ } catch (Exception ignored) { }
	348	+
	349	+ Property.set(Property.Name.MAILBOX_LAST_SEEN_UID, uid);
	350	+ }
	351	+}

8be4339

app/mailbox/exceptions/IllegalDetailException.java (added)

+++ app/mailbox/exceptions/IllegalDetailException.java

...	...	@@ -0,0 +1,25 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox.exceptions;
	22	+
	23	+public class IllegalDetailException extends Exception {
	24	+ private static final long serialVersionUID = -1678153413236121508L;
	25	+}

8be4339

app/mailbox/exceptions/IssueNotFound.java (added)

+++ app/mailbox/exceptions/IssueNotFound.java

...	...	@@ -0,0 +1,29 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox.exceptions;
	22	+
	23	+public class IssueNotFound extends MailHandlerException {
	24	+ private static final long serialVersionUID = -6222671675057709905L;
	25	+
	26	+ public IssueNotFound(Long number) {
	27	+ super(String.format("Issue %d not found", number));
	28	+ }
	29	+}

8be4339

app/mailbox/exceptions/MailHandlerException.java (added)

+++ app/mailbox/exceptions/MailHandlerException.java

...	...	@@ -0,0 +1,29 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox.exceptions;
	22	+
	23	+public class MailHandlerException extends Exception{
	24	+ private static final long serialVersionUID = 3925450020478998663L;
	25	+
	26	+ MailHandlerException(String s) {
	27	+ super(s);
	28	+ }
	29	+}

8be4339

app/mailbox/exceptions/PermissionDenied.java (added)

+++ app/mailbox/exceptions/PermissionDenied.java

...	...	@@ -0,0 +1,29 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox.exceptions;
	22	+
	23	+public class PermissionDenied extends MailHandlerException {
	24	+ private static final long serialVersionUID = 1408386395224769560L;
	25	+
	26	+ public PermissionDenied(String s) {
	27	+ super(s);
	28	+ }
	29	+}

8be4339

app/mailbox/exceptions/PostingNotFound.java (added)

+++ app/mailbox/exceptions/PostingNotFound.java

...	...	@@ -0,0 +1,29 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package mailbox.exceptions;
	22	+
	23	+public class PostingNotFound extends MailHandlerException {
	24	+ private static final long serialVersionUID = 6604209946955366044L;
	25	+
	26	+ public PostingNotFound(Long number) {
	27	+ super(String.format("Posting %d not found", number));
	28	+ }
	29	+}

27fbc9b

8be4339

app/models/AbstractPosting.java

--- app/models/AbstractPosting.java

+++ app/models/AbstractPosting.java


         this.updatedDate = JodaDateUtil.now();
     }
 
+    public AbstractPosting(Project project, User author, String title, String body) {
+        this();
+        setAuthor(author);
+        this.project = project;
+        this.title = title;
+        this.body = body;
+    }
+
     /**
      * @see models.Issue#increaseNumber()
      * @see models.Posting#increaseNumber()

27fbc9b

8be4339

app/models/Comment.java

--- app/models/Comment.java

+++ app/models/Comment.java


         createdDate = new Date();
     }
 
+    public Comment(User author, String contents) {
+        this();
+        setAuthor(author);
+        this.contents = contents;
+    }
+
     public Duration ago() {
         return JodaDateUtil.ago(this.createdDate);
     }

27fbc9b

8be4339

app/models/CommentThread.java

--- app/models/CommentThread.java

+++ app/models/CommentThread.java


  */
 package models;
 
-import models.support.ReviewSearchCondition;
-import play.data.format.Formats;
-import play.data.validation.Constraints;
 import models.enumeration.ResourceType;
 import models.resource.Resource;
 import models.resource.ResourceConvertible;
+import models.support.ReviewSearchCondition;
+import play.data.format.Formats;
+import play.data.validation.Constraints;
 import play.db.ebean.Model;
+
 import javax.persistence.*;
-import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;

27fbc9b

8be4339

app/models/CommitComment.java

--- app/models/CommitComment.java

+++ app/models/CommitComment.java


 import models.enumeration.ResourceType;
 import models.resource.Resource;
 import org.apache.commons.lang3.StringUtils;
+import playRepository.Commit;
 
 import javax.persistence.Entity;
 import javax.persistence.Transient;

                 return authorId;
             }
 
+            @Override
+            public Resource getContainer() {
+                return Commit.getAsResource(project, commitId);
+            }
+
             public void delete() {
                 CommitComment.this.delete();
             }

27fbc9b

8be4339

app/models/Issue.java

--- app/models/Issue.java

+++ app/models/Issue.java


 import models.resource.Resource;
 import models.support.SearchCondition;
 import org.apache.commons.lang3.time.DateUtils;
+import play.data.Form;
 import play.data.format.Formats;
 import play.i18n.Messages;
 import utils.JodaDateUtil;
 
 import javax.persistence.*;
-
-import play.data.Form;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.Boolean;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 
 @Entity

     @Formula(select = "case when due_date is null then cast('9999-12-31 23:59:59' as timestamp) else due_date end")
     public Date dueDateAsc;
 
+    public Issue(Project project, User author, String title, String body) {
+        super(project, author, title, body);
+        this.state = State.OPEN;
+    }
+
+    public Issue() {
+        super();
+    }
+
     /**
      * @see models.AbstractPosting#computeNumOfComments()
      */

27fbc9b

8be4339

app/models/IssueComment.java

--- app/models/IssueComment.java

+++ app/models/IssueComment.java


     )
     public List<User> voters;
 
+    public IssueComment(Issue issue, User author, String contents) {
+        super(author, contents);
+        this.issue = issue;
+    }
+
     /**
      * @see Comment#getParent()
      */

27fbc9b

8be4339

app/models/NotificationEvent.java

--- app/models/NotificationEvent.java

+++ app/models/NotificationEvent.java


 import playRepository.*;
 import scala.concurrent.duration.Duration;
 import utils.AccessControl;
+import utils.Config;
 import utils.EventConstants;
 import utils.RouteUtil;
 

      */
     public static void afterNewComment(User sender, PullRequest pullRequest,
                                        ReviewComment newComment, String urlToView) {
+        NotificationEvent.add(forNewComment(sender, pullRequest, newComment));
+    }
+
+    public static NotificationEvent forNewComment(User sender, PullRequest pullRequest, ReviewComment newComment) {
         NotificationEvent notiEvent = createFrom(sender, newComment);
         notiEvent.title = formatReplyTitle(pullRequest);
         Set<User> receivers = getMentionedUsers(newComment.getContents());

         notiEvent.eventType = NEW_REVIEW_COMMENT;
         notiEvent.oldValue = null;
         notiEvent.newValue = newComment.getContents();
-
-        NotificationEvent.add(notiEvent);
+        return notiEvent;
     }
 
     public static NotificationEvent afterNewPullRequest(PullRequest pullRequest) {

     }
 
     public static void afterNewComment(Comment comment) {
+        NotificationEvent.add(forNewComment(comment, UserApp.currentUser()));
+    }
+
+    public static NotificationEvent forNewComment(Comment comment, User author) {
         AbstractPosting post = comment.getParent();
 
-        NotificationEvent notiEvent = createFromCurrentUser(comment);
+        NotificationEvent notiEvent = createFrom(author, comment);
         notiEvent.title = formatReplyTitle(post);
         Set<User> receivers = getReceivers(post);
         receivers.addAll(getMentionedUsers(comment.contents));
-        receivers.remove(UserApp.currentUser());
+        receivers.remove(author);
         notiEvent.receivers = receivers;
         notiEvent.eventType = NEW_COMMENT;
         notiEvent.oldValue = null;
         notiEvent.newValue = comment.contents;
         notiEvent.resourceType = comment.asResource().getType();
         notiEvent.resourceId = comment.asResource().getId();
-
-        NotificationEvent.add(notiEvent);
+        return notiEvent;
     }
 
     public static void afterNewCommentWithState(Comment comment, State state) {

         return notiEvent;
     }
 
-
-
     public static NotificationEvent afterAssigneeChanged(User oldAssignee, Issue issue) {
         NotificationEvent notiEvent = createFromCurrentUser(issue);
 

     }
 
     public static void afterNewIssue(Issue issue) {
-        NotificationEvent notiEvent = createFromCurrentUser(issue);
+        NotificationEvent.add(forNewIssue(issue, UserApp.currentUser()));
+    }
+
+    public static NotificationEvent forNewIssue(Issue issue, User author) {
+        NotificationEvent notiEvent = createFrom(author, issue);
         notiEvent.title = formatNewTitle(issue);
         notiEvent.receivers = getReceivers(issue);
         notiEvent.eventType = NEW_ISSUE;
         notiEvent.oldValue = null;
         notiEvent.newValue = issue.body;
-
-        NotificationEvent.add(notiEvent);
+        return notiEvent;
     }
 
     public static NotificationEvent afterIssueBodyChanged(String oldBody, Issue issue) {

     }
 
     public static void afterNewPost(Posting post) {
-        NotificationEvent notiEvent = createFromCurrentUser(post);
+        NotificationEvent.add(forNewPosting(post, UserApp.currentUser()));
+    }
+
+    public static NotificationEvent forNewPosting(Posting post, User author) {
+        NotificationEvent notiEvent = createFrom(author, post);
         notiEvent.title = formatNewTitle(post);
         notiEvent.receivers = getReceivers(post);
         notiEvent.eventType = NEW_POSTING;
         notiEvent.oldValue = null;
         notiEvent.newValue = post.body;
-
-        NotificationEvent.add(notiEvent);
+        return notiEvent;
     }
 
     public static void afterNewCommitComment(Project project, ReviewComment comment,
                                              String commitId) throws
             IOException, SVNException, ServletException {
+        NotificationEvent.add(
+                forNewCommitComment(project, comment, commitId, UserApp.currentUser()));
+    }
+
+    public static NotificationEvent forNewCommitComment(
+            Project project, ReviewComment comment, String commitId, User author)
+            throws IOException, SVNException, ServletException {
         Commit commit = RepositoryService.getRepository(project).getCommit(commitId);
         Set<User> watchers = commit.getWatchers(project);
         watchers.addAll(getMentionedUsers(comment.getContents()));
-        watchers.remove(UserApp.currentUser());
+        watchers.remove(author);
 
-        NotificationEvent notiEvent = createFromCurrentUser(comment);
+        NotificationEvent notiEvent = createFrom(author, comment);
         notiEvent.title = formatReplyTitle(project, commit);
         notiEvent.receivers = watchers;
         notiEvent.eventType = NEW_REVIEW_COMMENT;
         notiEvent.oldValue = null;
         notiEvent.newValue = comment.getContents();
-
-        NotificationEvent.add(notiEvent);
+        return notiEvent;
     }
 
-    public static void afterNewSVNCommitComment(Project project, CommitComment codeComment) throws IOException, SVNException, ServletException {
+    public static void afterNewSVNCommitComment(Project project, CommitComment codeComment)
+            throws IOException, SVNException, ServletException {
+        NotificationEvent.add(forNewSVNCommitComment(project, codeComment, UserApp.currentUser()));
+    }
+
+    private static NotificationEvent forNewSVNCommitComment(
+            Project project, CommitComment codeComment, User author)
+            throws IOException, SVNException, ServletException {
         Commit commit = RepositoryService.getRepository(project).getCommit(codeComment.commitId);
         Set<User> watchers = commit.getWatchers(project);
         watchers.addAll(getMentionedUsers(codeComment.contents));
-        watchers.remove(UserApp.currentUser());
+        watchers.remove(author);
 
         NotificationEvent notiEvent = createFromCurrentUser(codeComment);
         notiEvent.title = formatReplyTitle(project, commit);

         notiEvent.eventType = NEW_COMMENT;
         notiEvent.oldValue = null;
         notiEvent.newValue = codeComment.contents;
-
-        NotificationEvent.add(notiEvent);
+        return notiEvent;
     }
 
     public static void afterMemberRequest(Project project, User user, RequestState state) {

     private static Set<User> getReceivers(AbstractPosting abstractPosting) {
         Set<User> receivers = abstractPosting.getWatchers();
         receivers.addAll(getMentionedUsers(abstractPosting.body));
-        receivers.remove(UserApp.currentUser());
+        receivers.remove(abstractPosting.author);
         return receivers;
     }
 

 
         return find.setRawSql(RawSqlBuilder.parse(sql).create()).findList().size();
     }
+
 }

27fbc9b

8be4339

app/models/NotificationMail.java

--- app/models/NotificationMail.java

+++ app/models/NotificationMail.java


  */
 package models;
 
+import mailbox.EmailAddressWithDetail;
 import info.schleichardt.play2.mailplugin.Mailer;
 import models.enumeration.ResourceType;
 import models.enumeration.UserState;

 import scala.concurrent.duration.Duration;
 import utils.Config;
 import utils.Markdown;
-import utils.RouteUtil;
 import utils.Url;
 
 import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
+import javax.annotation.Nullable;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;

                 email.setFrom(Config.getEmailFromSmtp(), event.getSender().name);
                 email.addTo(Config.getEmailFromSmtp(), utils.Config.getSiteName());
 
+                String replyTo = getReplyTo(event.getResource());
+                boolean acceptsReply = false;
+                if (replyTo != null) {
+                    email.addReplyTo(replyTo);
+                    acceptsReply = true;
+                }
+
                 for (User receiver : usersByLang.get(langCode)) {
                     if (hideAddress) {
                         email.addBcc(receiver.email, receiver.name);

                     continue;
                 }
 
+                // FIXME: gmail은 From과 To에 같은 주소가 있으면 reply-to를 무시한다.
+
                 Lang lang = Lang.apply(langCode);
 
                 String message = event.getMessage(lang);
                 String urlToView = event.getUrlToView();
-                String reference = Url.removeFragment(event.getUrlToView());
 
                 email.setSubject(event.title);
-
                 Resource resource = event.getResource();
                 if (resource.getType() == ResourceType.ISSUE_COMMENT) {
                     IssueComment issueComment = IssueComment.find.byId(Long.valueOf(resource.getId()));
                     resource = issueComment.issue.asResource();
                 }
-                email.setHtmlMsg(getHtmlMessage(lang, message, urlToView, resource));
-                email.setTextMsg(getPlainMessage(lang, message, Url.create(urlToView)));
+                email.setHtmlMsg(getHtmlMessage(lang, message, urlToView, resource, acceptsReply));
+                email.setTextMsg(getPlainMessage(lang, message, Url.create(urlToView), acceptsReply));
                 email.setCharset("utf-8");
                 email.addReferences();
                 email.setSentDate(event.created);

                 recipients.addAll(email.getCcAddresses());
                 recipients.addAll(email.getBccAddresses());
                 String logEntry = String.format("\"%s\" %s", escapedTitle, recipients);
-                play.Logger.of("mail").info(logEntry);
+                play.Logger.of("mail.out").info(logEntry);
             } catch (Exception e) {
                 Logger.warn("Failed to send a notification: "
                         + email + "\n" + ExceptionUtils.getStackTrace(e));

         }
     }
 
-    private static String getHtmlMessage(Lang lang, String message, String urlToView, Resource resource) {
-        String content = getRenderedHTMLWithTemplate(lang, Markdown.render(message), urlToView, resource);
+    @Nullable
+    public static String getReplyTo(Resource resource) {
+        if (resource == null) {
+            return null;
+        }
+
+        String detail = null;
+
+        switch(resource.getType()) {
+            case ISSUE_COMMENT:
+            case NONISSUE_COMMENT:
+            case COMMIT_COMMENT:
+            case REVIEW_COMMENT:
+                detail = resource.getContainer().getDetail();
+                break;
+            case ISSUE_POST:
+            case BOARD_POST:
+            case COMMIT:
+                detail = resource.getDetail();
+                break;
+            default:
+                break;
+        }
+
+        if (detail != null) {
+            EmailAddressWithDetail addr =
+                    new EmailAddressWithDetail(Config.getEmailFromImap());
+            addr.setDetail(detail);
+            return addr.toString();
+        } else {
+            return null;
+        }
+    }
+
+    private static String getHtmlMessage(Lang lang, String message, String urlToView,
+                                         Resource resource, boolean acceptsReply) {
+        String content = views.html.common.notificationMail.render(
+                lang, Markdown.render(message), urlToView, resource, acceptsReply).toString();
 
         Document doc = Jsoup.parse(content);
 

         String html = doc.html();
 
         return html;
-    }
-
-    private static String getRenderedHTMLWithTemplate(Lang lang, String message, String urlToView, Resource resource){
-        return views.html.common.notificationMail.render(lang, message, urlToView, resource).toString();
     }
 
     /**

         }
     }
 
-    private static String getPlainMessage(Lang lang, String message, String urlToView) {
+    private static String getPlainMessage(Lang lang, String message, String urlToView, boolean acceptsReply) {
         String msg = message;
         String url = urlToView;
+        String messageKey = acceptsReply ?
+                "notification.replyOrLinkToView" : "notification.linkToView";
 
         if (url != null) {
-            msg += String.format("\n\n--\n" + Messages.get(lang, "notification.linkToView", url));
+            msg += String.format("\n\n--\n" + Messages.get(lang, messageKey, url));
         }
 
         return msg;

8be4339

app/models/OriginalEmail.java (added)

+++ app/models/OriginalEmail.java

...	...	@@ -0,0 +1,68 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Yi EungJun
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+package models;
	22	+
	23	+import models.enumeration.ResourceType;
	24	+import models.resource.Resource;
	25	+import play.data.validation.Constraints;
	26	+import play.db.ebean.Model;
	27	+
	28	+import javax.persistence.*;
	29	+
	30	+@Entity
	31	+@Table(uniqueConstraints = @UniqueConstraint(columnNames = {"resource_type", "resource_id"}))
	32	+public class OriginalEmail extends Model {
	33	+ public static final Finder<Long, OriginalEmail> finder = new Finder<>(Long.class,
	34	+ OriginalEmail.class);
	35	+
	36	+ private static final long serialVersionUID = 9079975193167733297L;
	37	+
	38	+ @Id
	39	+ public Long id;
	40	+
	41	+ @Constraints.Required
	42	+ @Column(unique=true)
	43	+ public String messageId;
	44	+
	45	+ @Constraints.Required
	46	+ @Enumerated(EnumType.STRING)
	47	+ public ResourceType resourceType;
	48	+
	49	+ @Constraints.Required
	50	+ public String resourceId;
	51	+
	52	+ public static OriginalEmail findBy(Resource resource) {
	53	+ return finder.where()
	54	+ .eq("resourceType", resource.getType())
	55	+ .eq("resourceId", resource.getId())
	56	+ .findUnique();
	57	+ }
	58	+
	59	+ public static boolean exists(Resource resource) {
	60	+ return findBy(resource) != null;
	61	+ }
	62	+
	63	+ public OriginalEmail(String messageId, Resource resource) {
	64	+ this.messageId = messageId;
	65	+ this.resourceType = resource.getType();
	66	+ this.resourceId = resource.getId();
	67	+ }
	68	+}

27fbc9b

8be4339

app/models/Posting.java

--- app/models/Posting.java

+++ app/models/Posting.java


 
 package models;
 
-import javax.persistence.*;
-
 import models.enumeration.ResourceType;
 import models.resource.Resource;
 import utils.JodaDateUtil;
 
-import java.util.*;
+import javax.persistence.*;
+import java.util.Collections;
+import java.util.List;
 
 import static com.avaje.ebean.Expr.eq;
 

 
     @OneToMany(cascade = CascadeType.ALL)
     public List<PostingComment> comments;
+
+    public Posting(Project project, User author, String title, String body) {
+        super(project, author, title, body);
+    }
 
     /**
      * @see models.Project#increaseLastPostingNumber()

                 .add(eq("readme", true))
                 .findUnique();
     }
-
 }

27fbc9b

8be4339

app/models/PostingComment.java

--- app/models/PostingComment.java

+++ app/models/PostingComment.java


     @ManyToOne
     public Posting posting;
 
+    public PostingComment(Posting posting, User author, String contents) {
+        super(author, contents);
+        this.posting = posting;
+    }
+
     /**
      * @see Comment#getParent()
      */

             public Long getAuthorId() {
                 return authorId;
             }
+
+            @Override
+            public Resource getContainer() {
+                return posting.asResource();
+            }
         };
     }
 }

27fbc9b

8be4339

app/models/Property.java

--- app/models/Property.java

+++ app/models/Property.java


     }
 
     public static enum Name {
+        // the uid of the most recent email Mailbox has received
+        MAILBOX_LAST_SEEN_UID,
+        // the uidvalidity of the imap folder Mailbox has used most recently
+        MAILBOX_LAST_UID_VALIDITY
         // Add property you need here.
     }
 

27fbc9b

8be4339

app/models/ReviewComment.java

--- app/models/ReviewComment.java

+++ app/models/ReviewComment.java


  */
 package models;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.*;
-
 import models.enumeration.ResourceType;
 import models.resource.Resource;
 import models.resource.ResourceConvertible;
 import play.data.validation.Constraints;
 import play.db.ebean.Model;
 
+import javax.persistence.*;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author Keesun Baik
  */

27fbc9b

8be4339

app/models/enumeration/ResourceType.java

--- app/models/enumeration/ResourceType.java

+++ app/models/enumeration/ResourceType.java

...	...	@@ -20,6 +20,9 @@
20	20	*/
21	21	package models.enumeration;
22	22
	23	+import play.api.i18n.Lang;
	24	+import play.i18n.Messages;
	25	+
23	26	public enum ResourceType {
24	27	ISSUE_POST("issue_post"),
25	28	ISSUE_ASSIGNEE("issue_assignee"),
...	...	@@ -73,4 +76,23 @@
73	76	}
74	77	throw new IllegalArgumentException("No matching resource type found for [" + value + "]");
75	78	}
	79	+
	80	+ public String asPathSegment() {
	81	+ switch(this) {
	82	+ case ISSUE_POST:
	83	+ return "issue";
	84	+ case BOARD_POST:
	85	+ return "post";
	86	+ case COMMENT_THREAD:
	87	+ return "review";
	88	+ case COMMIT:
	89	+ return "commit";
	90	+ default:
	91	+ return this.resource;
	92	+ }
	93	+ }
	94	+
	95	+ public String getName(Lang lang) {
	96	+ return Messages.get(lang, "resource." + resource);
	97	+ }
76	98	}

27fbc9b

8be4339

app/models/resource/Resource.java

--- app/models/resource/Resource.java

+++ app/models/resource/Resource.java

...	...	@@ -174,6 +174,43 @@
174	174	public boolean isAuthoredBy(User user) { return getAuthorId() != null && getAuthorId().equals(user.id); }
175	175	public void delete() { throw new UnsupportedOperationException(); }
176	176
	177	+ public String getDetail() {
	178	+ Project project = getProject();
	179	+ String type = getType().asPathSegment();
	180	+
	181	+ if (project != null && type != null) {
	182	+ return project + "/" + type;
	183	+ } else {
	184	+ return null;
	185	+ }
	186	+ }
	187	+
	188	+ @Override
	189	+ public boolean equals(Object object) {
	190	+ if (this == object) return true;
	191	+ if (object == null \|\| getClass() != object.getClass()) return false;
	192	+
	193	+ Resource that = (Resource) object;
	194	+
	195	+ if (!getId().equals(that.getId())) return false;
	196	+ if (!getType().equals(that.getType())) return false;
	197	+
	198	+ return true;
	199	+ }
	200	+
	201	+ @Override
	202	+ public int hashCode() {
	203	+ int result = 0;
	204	+ result = 31 * result + (getId() != null ? getId().hashCode() : 0);
	205	+ result = 31 * result + (getType() != null ? getType().hashCode() : 0);
	206	+ return result;
	207	+ }
	208	+
	209	+ @Override
	210	+ public String toString() {
	211	+ return getType().resource() + "/" + getId();
	212	+ }
	213	+
177	214	/**
178	215	* @see {@link actions.IsAllowedAction}
179	216	*/
...	...	@@ -200,6 +237,34 @@
200	237	}
201	238	}
202	239
	240	+ /**
	241	+ * Finds a resource by the given resource path.
	242	+ *
	243	+ * The format of resource path is as follows:
	244	+ *
	245	+ * resource-type "/" resource-id
	246	+ *
	247	+ * @param path
	248	+ * @return
	249	+ */
	250	+ public static Resource findByPath(String path) {
	251	+ String[] segments = path.split("/");
	252	+
	253	+ if (segments.length < 2) {
	254	+ return null;
	255	+ }
	256	+
	257	+ ResourceType resourceType = null;
	258	+
	259	+ try {
	260	+ resourceType = ResourceType.getValue(segments[0]);
	261	+ } catch (IllegalArgumentException e) {
	262	+ return null;
	263	+ }
	264	+
	265	+ return Resource.get(resourceType, segments[1]);
	266	+ }
	267	+
203	268	public String getMessageId() {
204	269	return String.format("<%s@%s>",
205	270	this, Config.getHostname());

27fbc9b

8be4339

app/playRepository/Commit.java

--- app/playRepository/Commit.java

+++ app/playRepository/Commit.java


         return Project.find.byId(Long.valueOf(pair[0]));
     }
 
+    public static Resource getAsResource(Project project, String commitId) {
+        return getAsResource(project.id + ":" + commitId);
+    }
+
     public static Resource getAsResource(final String resourceId) {
         return new Resource() {
 

27fbc9b

8be4339

app/utils/Config.java

--- app/utils/Config.java

+++ app/utils/Config.java


     }
 
     public static String getEmailFromSmtp() {
-        Configuration config = Configuration.root();
-        String user = config.getString("smtp.user");
-
-        if (user == null) {
-            return null;
-        }
-
-        if (user.contains("@")) {


...	...	@@ -18,22 +18,13 @@
18	18	* See the License for the specific language governing permissions and
19	19	* limitations under the License.
20	20	*/
21		-import java.io.IOException;
22		-import java.lang.reflect.Method;
23		-import java.math.BigInteger;
24		-import java.net.InetAddress;
25		-import java.nio.file.Files;
26		-import java.nio.file.Path;
27		-import java.nio.file.Paths;
28		-import java.security.SecureRandom;
29		-import java.util.Date;
30	21
	22	+import mailbox.MailboxService;
31	23	import com.avaje.ebean.Ebean;
32	24	import controllers.SvnApp;
33		-import models.*;
34		-
35	25	import controllers.UserApp;
36	26	import controllers.routes;
	27	+import models.*;
37	28	import org.apache.commons.lang3.StringUtils;
38	29	import org.apache.http.impl.cookie.DateUtils;
39	30	import play.Application;
...	...	@@ -41,7 +32,8 @@
41	32	import play.Play;
42	33	import play.api.mvc.Handler;
43	34	import play.data.Form;
44		-import play.mvc.*;
	35	+import play.mvc.Action;
	36	+import play.mvc.Http;
45	37	import play.mvc.Http.RequestHeader;
46	38	import play.mvc.Result;
47	39	import play.libs.F.Promise;
...	...	@@ -62,8 +54,6 @@
62	54	import java.security.SecureRandom;
63	55	import java.util.Date;
64	56
65		-import views.html.welcome.secret;
66		-import views.html.welcome.restart;
67	57	import static play.data.Form.form;
68	58	import static play.mvc.Results.badRequest;
69	59
...	...	@@ -74,6 +64,8 @@
74	64
75	65	private boolean isSecretInvalid = false;
76	66	private boolean isRestartRequired = false;
	67	+
	68	+ private MailboxService mailboxService = new MailboxService();
77	69
78	70	@Override
79	71	public void onStart(Application app) {
...	...	@@ -88,6 +80,7 @@
88	80	Attachment.onStart();
89	81	YobiUpdate.onStart();
90	82	AccessControl.onStart();
	83	+ mailboxService.start();
91	84	}
92	85
93	86	private boolean equalsDefaultSecret() {
...	...	@@ -221,6 +214,7 @@
221	214	}
222	215
223	216	public void onStop(Application app) {
	217	+ mailboxService.stop();
224	218	}
225	219
226	220	@Override

...	...	@@ -85,6 +85,14 @@
85	85	this.updatedDate = JodaDateUtil.now();
86	86	}
87	87
	88	+ public AbstractPosting(Project project, User author, String title, String body) {
	89	+ this();
	90	+ setAuthor(author);
	91	+ this.project = project;
	92	+ this.title = title;
	93	+ this.body = body;
	94	+ }
	95	+
88	96	/**
89	97	* @see models.Issue#increaseNumber()
90	98	* @see models.Posting#increaseNumber()

...	...	@@ -58,6 +58,12 @@
58	58	createdDate = new Date();
59	59	}
60	60
	61	+ public Comment(User author, String contents) {
	62	+ this();
	63	+ setAuthor(author);
	64	+ this.contents = contents;
	65	+ }
	66	+
61	67	public Duration ago() {
62	68	return JodaDateUtil.ago(this.createdDate);
63	69	}

...	...	@@ -20,15 +20,15 @@
20	20	*/
21	21	package models;
22	22
23		-import models.support.ReviewSearchCondition;
24		-import play.data.format.Formats;
25		-import play.data.validation.Constraints;
26	23	import models.enumeration.ResourceType;
27	24	import models.resource.Resource;
28	25	import models.resource.ResourceConvertible;
	26	+import models.support.ReviewSearchCondition;
	27	+import play.data.format.Formats;
	28	+import play.data.validation.Constraints;
29	29	import play.db.ebean.Model;
	30	+
30	31	import javax.persistence.*;
31		-import java.lang.reflect.ParameterizedType;
32	32	import java.util.ArrayList;
33	33	import java.util.Date;
34	34	import java.util.List;

...	...	@@ -23,6 +23,7 @@
23	23	import models.enumeration.ResourceType;
24	24	import models.resource.Resource;
25	25	import org.apache.commons.lang3.StringUtils;
	26	+import playRepository.Commit;
26	27
27	28	import javax.persistence.Entity;
28	29	import javax.persistence.Transient;
...	...	@@ -66,6 +67,11 @@
66	67	return authorId;
67	68	}
68	69
	70	+ @Override
	71	+ public Resource getContainer() {
	72	+ return Commit.getAsResource(project, commitId);
	73	+ }
	74	+
69	75	public void delete() {
70	76	CommitComment.this.delete();
71	77	}

...	...	@@ -35,19 +35,18 @@
35	35	import models.resource.Resource;
36	36	import models.support.SearchCondition;
37	37	import org.apache.commons.lang3.time.DateUtils;
	38	+import play.data.Form;
38	39	import play.data.format.Formats;
39	40	import play.i18n.Messages;
40	41	import utils.JodaDateUtil;
41	42
42	43	import javax.persistence.*;
43		-
44		-import play.data.Form;
45		-
46	44	import java.io.ByteArrayOutputStream;
47	45	import java.io.IOException;
48	46	import java.lang.Boolean;
49	47	import java.text.SimpleDateFormat;
50	48	import java.util.*;
	49	+import java.util.regex.Pattern;
51	50	import java.util.regex.Pattern;
52	51
53	52	@Entity
...	...	@@ -106,6 +105,15 @@
106	105	@Formula(select = "case when due_date is null then cast('9999-12-31 23:59:59' as timestamp) else due_date end")
107	106	public Date dueDateAsc;
108	107
	108	+ public Issue(Project project, User author, String title, String body) {
	109	+ super(project, author, title, body);
	110	+ this.state = State.OPEN;
	111	+ }
	112	+
	113	+ public Issue() {
	114	+ super();
	115	+ }
	116	+
109	117	/**
110	118	* @see models.AbstractPosting#computeNumOfComments()
111	119	*/

...	...	@@ -42,6 +42,11 @@
42	42	)
43	43	public List<User> voters;
44	44
	45	+ public IssueComment(Issue issue, User author, String contents) {
	46	+ super(author, contents);
	47	+ this.issue = issue;
	48	+ }
	49	+
45	50	/**
46	51	* @see Comment#getParent()
47	52	*/

...	...	@@ -42,6 +42,7 @@
42	42	import playRepository.*;
43	43	import scala.concurrent.duration.Duration;
44	44	import utils.AccessControl;
	45	+import utils.Config;
45	46	import utils.EventConstants;
46	47	import utils.RouteUtil;
47	48
...	...	@@ -480,6 +481,10 @@
480	481	*/
481	482	public static void afterNewComment(User sender, PullRequest pullRequest,
482	483	ReviewComment newComment, String urlToView) {
	484	+ NotificationEvent.add(forNewComment(sender, pullRequest, newComment));
	485	+ }
	486	+
	487	+ public static NotificationEvent forNewComment(User sender, PullRequest pullRequest, ReviewComment newComment) {
483	488	NotificationEvent notiEvent = createFrom(sender, newComment);
484	489	notiEvent.title = formatReplyTitle(pullRequest);
485	490	Set<User> receivers = getMentionedUsers(newComment.getContents());
...	...	@@ -489,8 +494,7 @@
489	494	notiEvent.eventType = NEW_REVIEW_COMMENT;
490	495	notiEvent.oldValue = null;
491	496	notiEvent.newValue = newComment.getContents();
492		-
493		- NotificationEvent.add(notiEvent);
	497	+ return notiEvent;
494	498	}
495	499
496	500	public static NotificationEvent afterNewPullRequest(PullRequest pullRequest) {
...	...	@@ -502,21 +506,24 @@
502	506	}
503	507
504	508	public static void afterNewComment(Comment comment) {
	509	+ NotificationEvent.add(forNewComment(comment, UserApp.currentUser()));
	510	+ }
	511	+
	512	+ public static NotificationEvent forNewComment(Comment comment, User author) {
505	513	AbstractPosting post = comment.getParent();
506	514
507		- NotificationEvent notiEvent = createFromCurrentUser(comment);
	515	+ NotificationEvent notiEvent = createFrom(author, comment);
508	516	notiEvent.title = formatReplyTitle(post);
509	517	Set<User> receivers = getReceivers(post);
510	518	receivers.addAll(getMentionedUsers(comment.contents));
511		- receivers.remove(UserApp.currentUser());
	519	+ receivers.remove(author);
512	520	notiEvent.receivers = receivers;
513	521	notiEvent.eventType = NEW_COMMENT;
514	522	notiEvent.oldValue = null;
515	523	notiEvent.newValue = comment.contents;
516	524	notiEvent.resourceType = comment.asResource().getType();
517	525	notiEvent.resourceId = comment.asResource().getId();
518		-
519		- NotificationEvent.add(notiEvent);
	526	+ return notiEvent;
520	527	}
521	528
522	529	public static void afterNewCommentWithState(Comment comment, State state) {
...	...	@@ -585,8 +592,6 @@
585	592	return notiEvent;
586	593	}
587	594
588		-
589		-
590	595	public static NotificationEvent afterAssigneeChanged(User oldAssignee, Issue issue) {
591	596	NotificationEvent notiEvent = createFromCurrentUser(issue);
592	597
...	...	@@ -611,14 +616,17 @@
611	616	}
612	617
613	618	public static void afterNewIssue(Issue issue) {
614		- NotificationEvent notiEvent = createFromCurrentUser(issue);
	619	+ NotificationEvent.add(forNewIssue(issue, UserApp.currentUser()));
	620	+ }
	621	+
	622	+ public static NotificationEvent forNewIssue(Issue issue, User author) {
	623	+ NotificationEvent notiEvent = createFrom(author, issue);
615	624	notiEvent.title = formatNewTitle(issue);
616	625	notiEvent.receivers = getReceivers(issue);
617	626	notiEvent.eventType = NEW_ISSUE;
618	627	notiEvent.oldValue = null;
619	628	notiEvent.newValue = issue.body;
620		-
621		- NotificationEvent.add(notiEvent);
	629	+ return notiEvent;
622	630	}
623	631
624	632	public static NotificationEvent afterIssueBodyChanged(String oldBody, Issue issue) {
...	...	@@ -635,39 +643,55 @@
635	643	}
636	644
637	645	public static void afterNewPost(Posting post) {
638		- NotificationEvent notiEvent = createFromCurrentUser(post);
	646	+ NotificationEvent.add(forNewPosting(post, UserApp.currentUser()));
	647	+ }
	648	+
	649	+ public static NotificationEvent forNewPosting(Posting post, User author) {
	650	+ NotificationEvent notiEvent = createFrom(author, post);
639	651	notiEvent.title = formatNewTitle(post);
640	652	notiEvent.receivers = getReceivers(post);
641	653	notiEvent.eventType = NEW_POSTING;
642	654	notiEvent.oldValue = null;
643	655	notiEvent.newValue = post.body;
644		-
645		- NotificationEvent.add(notiEvent);
	656	+ return notiEvent;
646	657	}
647	658
648	659	public static void afterNewCommitComment(Project project, ReviewComment comment,
649	660	String commitId) throws
650	661	IOException, SVNException, ServletException {
	662	+ NotificationEvent.add(
	663	+ forNewCommitComment(project, comment, commitId, UserApp.currentUser()));
	664	+ }
	665	+
	666	+ public static NotificationEvent forNewCommitComment(
	667	+ Project project, ReviewComment comment, String commitId, User author)
	668	+ throws IOException, SVNException, ServletException {
651	669	Commit commit = RepositoryService.getRepository(project).getCommit(commitId);
652	670	Set<User> watchers = commit.getWatchers(project);
653	671	watchers.addAll(getMentionedUsers(comment.getContents()));
654		- watchers.remove(UserApp.currentUser());
	672	+ watchers.remove(author);
655	673
656		- NotificationEvent notiEvent = createFromCurrentUser(comment);
	674	+ NotificationEvent notiEvent = createFrom(author, comment);
657	675	notiEvent.title = formatReplyTitle(project, commit);
658	676	notiEvent.receivers = watchers;
659	677	notiEvent.eventType = NEW_REVIEW_COMMENT;
660	678	notiEvent.oldValue = null;
661	679	notiEvent.newValue = comment.getContents();
662		-
663		- NotificationEvent.add(notiEvent);
	680	+ return notiEvent;
664	681	}
665	682
666		- public static void afterNewSVNCommitComment(Project project, CommitComment codeComment) throws IOException, SVNException, ServletException {
	683	+ public static void afterNewSVNCommitComment(Project project, CommitComment codeComment)
	684	+ throws IOException, SVNException, ServletException {
	685	+ NotificationEvent.add(forNewSVNCommitComment(project, codeComment, UserApp.currentUser()));
	686	+ }
	687	+
	688	+ private static NotificationEvent forNewSVNCommitComment(
	689	+ Project project, CommitComment codeComment, User author)
	690	+ throws IOException, SVNException, ServletException {
667	691	Commit commit = RepositoryService.getRepository(project).getCommit(codeComment.commitId);
668	692	Set<User> watchers = commit.getWatchers(project);
669	693	watchers.addAll(getMentionedUsers(codeComment.contents));
670		- watchers.remove(UserApp.currentUser());
	694	+ watchers.remove(author);
671	695
672	696	NotificationEvent notiEvent = createFromCurrentUser(codeComment);
673	697	notiEvent.title = formatReplyTitle(project, commit);
...	...	@@ -675,8 +699,7 @@
675	699	notiEvent.eventType = NEW_COMMENT;
676	700	notiEvent.oldValue = null;
677	701	notiEvent.newValue = codeComment.contents;
678		-
679		- NotificationEvent.add(notiEvent);
	702	+ return notiEvent;
680	703	}
681	704
682	705	public static void afterMemberRequest(Project project, User user, RequestState state) {
...	...	@@ -827,7 +850,7 @@
827	850	private static Set<User> getReceivers(AbstractPosting abstractPosting) {
828	851	Set<User> receivers = abstractPosting.getWatchers();
829	852	receivers.addAll(getMentionedUsers(abstractPosting.body));
830		- receivers.remove(UserApp.currentUser());
	853	+ receivers.remove(abstractPosting.author);
831	854	return receivers;
832	855	}
833	856
...	...	@@ -1047,4 +1070,5 @@
1047	1070
1048	1071	return find.setRawSql(RawSqlBuilder.parse(sql).create()).findList().size();
1049	1072	}
	1073	+
1050	1074	}

...	...	@@ -20,6 +20,7 @@
20	20	*/
21	21	package models;
22	22
	23	+import mailbox.EmailAddressWithDetail;
23	24	import info.schleichardt.play2.mailplugin.Mailer;
24	25	import models.enumeration.ResourceType;
25	26	import models.enumeration.UserState;
...	...	@@ -40,13 +41,13 @@
40	41	import scala.concurrent.duration.Duration;
41	42	import utils.Config;
42	43	import utils.Markdown;
43		-import utils.RouteUtil;
44	44	import utils.Url;
45	45
46	46	import javax.mail.MessagingException;
47	47	import javax.mail.Session;
48	48	import javax.mail.internet.InternetAddress;
49	49	import javax.mail.internet.MimeMessage;
	50	+import javax.annotation.Nullable;
50	51	import javax.persistence.Entity;
51	52	import javax.persistence.Id;
52	53	import javax.persistence.OneToOne;
...	...	@@ -246,6 +247,13 @@
246	247	email.setFrom(Config.getEmailFromSmtp(), event.getSender().name);
247	248	email.addTo(Config.getEmailFromSmtp(), utils.Config.getSiteName());
248	249
	250	+ String replyTo = getReplyTo(event.getResource());
	251	+ boolean acceptsReply = false;
	252	+ if (replyTo != null) {
	253	+ email.addReplyTo(replyTo);
	254	+ acceptsReply = true;
	255	+ }
	256	+
249	257	for (User receiver : usersByLang.get(langCode)) {
250	258	if (hideAddress) {
251	259	email.addBcc(receiver.email, receiver.name);
...	...	@@ -258,21 +266,21 @@
258	266	continue;
259	267	}
260	268
	269	+ // FIXME: gmail은 From과 To에 같은 주소가 있으면 reply-to를 무시한다.
	270	+
261	271	Lang lang = Lang.apply(langCode);
262	272
263	273	String message = event.getMessage(lang);
264	274	String urlToView = event.getUrlToView();
265		- String reference = Url.removeFragment(event.getUrlToView());
266	275
267	276	email.setSubject(event.title);
268		-
269	277	Resource resource = event.getResource();
270	278	if (resource.getType() == ResourceType.ISSUE_COMMENT) {
271	279	IssueComment issueComment = IssueComment.find.byId(Long.valueOf(resource.getId()));
272	280	resource = issueComment.issue.asResource();
273	281	}
274		- email.setHtmlMsg(getHtmlMessage(lang, message, urlToView, resource));
275		- email.setTextMsg(getPlainMessage(lang, message, Url.create(urlToView)));
	282	+ email.setHtmlMsg(getHtmlMessage(lang, message, urlToView, resource, acceptsReply));
	283	+ email.setTextMsg(getPlainMessage(lang, message, Url.create(urlToView), acceptsReply));
276	284	email.setCharset("utf-8");
277	285	email.addReferences();
278	286	email.setSentDate(event.created);
...	...	@@ -283,7 +291,7 @@
283	291	recipients.addAll(email.getCcAddresses());
284	292	recipients.addAll(email.getBccAddresses());
285	293	String logEntry = String.format("\"%s\" %s", escapedTitle, recipients);
286		- play.Logger.of("mail").info(logEntry);
	294	+ play.Logger.of("mail.out").info(logEntry);
287	295	} catch (Exception e) {
288	296	Logger.warn("Failed to send a notification: "
289	297	+ email + "\n" + ExceptionUtils.getStackTrace(e));
...	...	@@ -291,8 +299,44 @@
291	299	}
292	300	}
293	301
294		- private static String getHtmlMessage(Lang lang, String message, String urlToView, Resource resource) {
295		- String content = getRenderedHTMLWithTemplate(lang, Markdown.render(message), urlToView, resource);
	302	+ @Nullable
	303	+ public static String getReplyTo(Resource resource) {
	304	+ if (resource == null) {
	305	+ return null;
	306	+ }
	307	+
	308	+ String detail = null;
	309	+
	310	+ switch(resource.getType()) {
	311	+ case ISSUE_COMMENT:
	312	+ case NONISSUE_COMMENT:
	313	+ case COMMIT_COMMENT:
	314	+ case REVIEW_COMMENT:
	315	+ detail = resource.getContainer().getDetail();
	316	+ break;
	317	+ case ISSUE_POST:
	318	+ case BOARD_POST:
	319	+ case COMMIT:
	320	+ detail = resource.getDetail();
	321	+ break;
	322	+ default:
	323	+ break;
	324	+ }
	325	+
	326	+ if (detail != null) {
	327	+ EmailAddressWithDetail addr =
	328	+ new EmailAddressWithDetail(Config.getEmailFromImap());
	329	+ addr.setDetail(detail);
	330	+ return addr.toString();
	331	+ } else {
	332	+ return null;
	333	+ }
	334	+ }
	335	+
	336	+ private static String getHtmlMessage(Lang lang, String message, String urlToView,
	337	+ Resource resource, boolean acceptsReply) {
	338	+ String content = views.html.common.notificationMail.render(
	339	+ lang, Markdown.render(message), urlToView, resource, acceptsReply).toString();
296	340
297	341	Document doc = Jsoup.parse(content);
298	342
...	...	@@ -309,10 +353,6 @@
309	353	String html = doc.html();
310	354
311	355	return html;
312		- }
313		-
314		- private static String getRenderedHTMLWithTemplate(Lang lang, String message, String urlToView, Resource resource){
315		- return views.html.common.notificationMail.render(lang, message, urlToView, resource).toString();
316	356	}
317	357
318	358	/**
...	...	@@ -364,12 +404,14 @@
364	404	}
365	405	}
366	406
367		- private static String getPlainMessage(Lang lang, String message, String urlToView) {
	407	+ private static String getPlainMessage(Lang lang, String message, String urlToView, boolean acceptsReply) {
368	408	String msg = message;
369	409	String url = urlToView;
	410	+ String messageKey = acceptsReply ?
	411	+ "notification.replyOrLinkToView" : "notification.linkToView";
370	412
371	413	if (url != null) {
372		- msg += String.format("\n\n--\n" + Messages.get(lang, "notification.linkToView", url));
	414	+ msg += String.format("\n\n--\n" + Messages.get(lang, messageKey, url));
373	415	}
374	416
375	417	return msg;

...	...	@@ -4,13 +4,13 @@
4	4
5	5	package models;
6	6
7		-import javax.persistence.*;
8		-
9	7	import models.enumeration.ResourceType;
10	8	import models.resource.Resource;
11	9	import utils.JodaDateUtil;
12	10
13		-import java.util.*;
	11	+import javax.persistence.*;
	12	+import java.util.Collections;
	13	+import java.util.List;
14	14
15	15	import static com.avaje.ebean.Expr.eq;
16	16
...	...	@@ -26,6 +26,10 @@
26	26
27	27	@OneToMany(cascade = CascadeType.ALL)
28	28	public List<PostingComment> comments;
	29	+
	30	+ public Posting(Project project, User author, String title, String body) {
	31	+ super(project, author, title, body);
	32	+ }
29	33
30	34	/**
31	35	* @see models.Project#increaseLastPostingNumber()
...	...	@@ -113,5 +117,4 @@
113	117	.add(eq("readme", true))
114	118	.findUnique();
115	119	}
116		-
117	120	}

...	...	@@ -33,6 +33,11 @@
33	33	@ManyToOne
34	34	public Posting posting;
35	35
	36	+ public PostingComment(Posting posting, User author, String contents) {
	37	+ super(author, contents);
	38	+ this.posting = posting;
	39	+ }
	40	+
36	41	/**
37	42	* @see Comment#getParent()
38	43	*/
...	...	@@ -65,6 +70,11 @@
65	70	public Long getAuthorId() {
66	71	return authorId;
67	72	}
	73	+
	74	+ @Override
	75	+ public Resource getContainer() {
	76	+ return posting.asResource();
	77	+ }
68	78	};
69	79	}
70	80	}

...	...	@@ -81,6 +81,10 @@
81	81	}
82	82
83	83	public static enum Name {
	84	+ // the uid of the most recent email Mailbox has received
	85	+ MAILBOX_LAST_SEEN_UID,
	86	+ // the uidvalidity of the imap folder Mailbox has used most recently
	87	+ MAILBOX_LAST_UID_VALIDITY
84	88	// Add property you need here.
85	89	}
86	90

...	...	@@ -20,17 +20,16 @@
20	20	*/
21	21	package models;
22	22
23		-import java.util.Date;
24		-import java.util.List;
25		-
26		-import javax.persistence.*;
27		-
28	23	import models.enumeration.ResourceType;
29	24	import models.resource.Resource;
30	25	import models.resource.ResourceConvertible;
31	26	import play.data.validation.Constraints;
32	27	import play.db.ebean.Model;
33	28
	29	+import javax.persistence.*;
	30	+import java.util.Date;
	31	+import java.util.List;
	32	+
34	33	/**
35	34	* @author Keesun Baik
36	35	*/

...	...	@@ -84,6 +84,10 @@
84	84	return Project.find.byId(Long.valueOf(pair[0]));
85	85	}
86	86
	87	+ public static Resource getAsResource(Project project, String commitId) {
	88	+ return getAsResource(project.id + ":" + commitId);
	89	+ }
	90	+
87	91	public static Resource getAsResource(final String resourceId) {
88	92	return new Resource() {
89	93

...	...	@@ -196,18 +196,7 @@
196	196	}
197	197
198	198	public static String getEmailFromSmtp() {
199		- Configuration config = Configuration.root();
200		- String user = config.getString("smtp.user");
201		-
202		- if (user == null) {
203		- return null;
204		- }
205		-
206		- if (user.contains("@")) {
207