Skip to content

The Unified and Autonomous Development Platform

Fix issue #343 - Creating issues, adding comments via email

Robin Shen3976f66783ed
diff --git a/pom.xml b/pom.xml
index 891516a99b..4249022ac5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -553,8 +553,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.0.10</commons.version>
- <k8shelper.version>2.1.4</k8shelper.version>
+ <commons.version>2.0.11</commons.version>
+ <k8shelper.version>2.1.5</k8shelper.version>
<slf4j.version>1.7.5</slf4j.version>
<logback.version>1.2.0</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java
index bdb16fec77..9963c421d2 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
-import java.util.UUID;
import javax.validation.Valid;
import javax.validation.ValidationException;
@@ -91,7 +90,6 @@ public class CreateIssueAction extends PostBuildAction {
@Override
public void run() {
Issue issue = new Issue();
- issue.setUUID(UUID.randomUUID().toString());
issue.setProject(build.getProject());
issue.setTitle(getIssueTitle());
issue.setSubmitter(SecurityUtils.getUser());
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueCommentManager.java
index 8017a3af94..df277fe8d5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueCommentManager.java
@@ -1,8 +1,12 @@
package io.onedev.server.entitymanager;
+import java.util.Collection;
+
import io.onedev.server.model.IssueComment;
import io.onedev.server.persistence.dao.EntityManager;
public interface IssueCommentManager extends EntityManager<IssueComment> {
+
+ void save(IssueComment comment, Collection<String> notifiedEmailAddresses);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java
index 51bcb34809..c8f8c4a907 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java
@@ -25,10 +25,13 @@ public interface IssueManager extends EntityManager<Issue> {
Issue find(Project project, long number);
@Nullable
- Issue find(ProjectScopedNumber issueFQN);
+ Issue find(ProjectScopedNumber fqn);
@Nullable
- Issue find(String issueFQN);
+ Issue findByFQN(String fqn);
+
+ @Nullable
+ Issue findByUUID(String uuid);
void open(Issue issue);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java
index ef8ba89397..a8a919ee54 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java
@@ -1,8 +1,12 @@
package io.onedev.server.entitymanager;
+import java.util.Collection;
+
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.persistence.dao.EntityManager;
public interface PullRequestCommentManager extends EntityManager<PullRequestComment> {
+ void save(PullRequestComment comment, Collection<String> notifiedEmailAddresses);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index 38268d3406..5bcd6a7bad 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -33,10 +33,13 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
PullRequest find(Project targetProject, long number);
@Nullable
- PullRequest find(String pullRequestFQN);
+ PullRequest findByFQN(String fqn);
@Nullable
- PullRequest find(ProjectScopedNumber pullRequestFQN);
+ PullRequest findByUUID(String uuid);
+
+ @Nullable
+ PullRequest find(ProjectScopedNumber fqn);
@Nullable
PullRequest findLatest(Project targetProject);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
index e5eb34e10c..f1611b2063 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java
@@ -100,4 +100,5 @@ public interface UserManager extends EntityManager<User> {
void onRenameSsoConnector(String oldName, String newName);
void onDeleteSsoConnector(String name);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
index 4d38242600..8004b16395 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
@@ -1,8 +1,12 @@
package io.onedev.server.entitymanager.impl;
+import java.util.Collection;
+
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.event.issue.IssueCommented;
@@ -26,13 +30,7 @@ public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>
@Transactional
@Override
public void save(IssueComment comment) {
- boolean isNew = comment.isNew();
- dao.persist(comment);
- if (isNew) {
- IssueCommented event = new IssueCommented(comment);
- listenerRegistry.post(event);
- comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+1);
- }
+ save(comment, Lists.newArrayList());
}
@Transactional
@@ -42,4 +40,15 @@ public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>
comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()-1);
}
+ @Override
+ public void save(IssueComment comment, Collection<String> notifiedEmailAddresses) {
+ boolean isNew = comment.isNew();
+ dao.persist(comment);
+ if (isNew) {
+ IssueCommented event = new IssueCommented(comment, notifiedEmailAddresses);
+ listenerRegistry.post(event);
+ comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+1);
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 2695592784..a5b5c9dfaf 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -147,16 +147,24 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
return find(criteria);
}
+ @Override
+ public Issue findByUUID(String uuid) {
+ EntityCriteria<Issue> criteria = newCriteria();
+ criteria.add(Restrictions.eq(Issue.PROP_UUID, uuid));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
@Sessional
@Override
- public Issue find(String issueFQN) {
- return find(ProjectScopedNumber.from(issueFQN));
+ public Issue findByFQN(String fqn) {
+ return find(ProjectScopedNumber.from(fqn));
}
@Sessional
@Override
- public Issue find(ProjectScopedNumber issueFQN) {
- return find(issueFQN.getProject(), issueFQN.getNumber());
+ public Issue find(ProjectScopedNumber fqn) {
+ return find(fqn.getProject(), fqn.getNumber());
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 698e20b47c..1f543b10ee 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -193,6 +193,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
for (GroovyScript groovyScript: settingManager.getGroovyScripts())
groovyScript.onRenameProject(oldName, project.getName());
jobManager.schedule(project);
+ if (settingManager.getMailSetting() != null)
+ settingManager.getMailSetting().onRenameProject(oldName, project.getName());
}
}
@@ -218,10 +220,15 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
usage.add(jobExecutor.onDeleteProject(project.getName(), index).prefix("administration"));
index++;
}
+ index = 0;
for (GroovyScript groovyScript: settingManager.getGroovyScripts()) {
usage.add(groovyScript.onDeleteProject(project.getName(), index).prefix("administration"));
index++;
}
+ if (settingManager.getMailSetting() != null) {
+ usage.add(settingManager.getMailSetting().onDeleteProject(project.getName()))
+ .prefix("mail setting").prefix("administration");
+ }
usage.checkInUse("Project '" + project.getName() + "'");
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
index 22180ab6a8..d9f2388352 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
@@ -1,11 +1,15 @@
package io.onedev.server.entitymanager.impl;
+import java.util.Collection;
+
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.entitymanager.PullRequestCommentManager;
-import io.onedev.server.event.pullrequest.PullRequestCommentCreated;
+import io.onedev.server.event.pullrequest.PullRequestCommented;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.persistence.annotation.Transactional;
@@ -27,15 +31,7 @@ public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequ
@Transactional
@Override
public void save(PullRequestComment comment) {
- boolean isNew = comment.isNew();
- dao.persist(comment);
- if (isNew) {
- PullRequestCommentCreated event = new PullRequestCommentCreated(comment);
- listenerRegistry.post(event);
-
- PullRequest request = comment.getRequest();
- request.setCommentCount(request.getCommentCount()+1);
- }
+ save(comment, Lists.newArrayList());
}
@Transactional
@@ -46,4 +42,17 @@ public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequ
request.setCommentCount(request.getCommentCount()-1);
}
+ @Override
+ public void save(PullRequestComment comment, Collection<String> notifiedEmailAddresses) {
+ boolean isNew = comment.isNew();
+ dao.persist(comment);
+ if (isNew) {
+ PullRequestCommented event = new PullRequestCommented(comment, notifiedEmailAddresses);
+ listenerRegistry.post(event);
+
+ PullRequest request = comment.getRequest();
+ request.setCommentCount(request.getCommentCount()+1);
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 602d4ddaee..73114f5f3a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -977,9 +977,17 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
return find(criteria);
}
+ @Sessional
+ public PullRequest findByUUID(String uuid) {
+ EntityCriteria<PullRequest> criteria = newCriteria();
+ criteria.add(Restrictions.eq(PullRequest.PROP_UUID, uuid));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
@Sessional
@Override
- public PullRequest find(String pullRequestFQN) {
+ public PullRequest findByFQN(String pullRequestFQN) {
return find(ProjectScopedNumber.from(pullRequestFQN));
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
index 2b12e69d9a..6b116544ba 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
@@ -57,8 +57,11 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
@Transactional
@Override
public void save(Role role, String oldName) {
- if (oldName != null && !oldName.equals(role.getName()))
+ if (oldName != null && !oldName.equals(role.getName())) {
settingManager.getIssueSetting().onRenameRole(oldName, role.getName());
+ if (settingManager.getMailSetting() != null)
+ settingManager.getMailSetting().onRenameRole(oldName, role.getName());
+ }
dao.persist(role);
}
@@ -68,6 +71,10 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
Usage usage = new Usage();
usage.add(settingManager.getIssueSetting().onDeleteRole(role.getName()).prefix("administration"));
+ if (settingManager.getMailSetting() != null) {
+ usage.add(settingManager.getMailSetting().onDeleteRole(role.getName())
+ .prefix("mail setting").prefix("administration"));
+ }
usage.checkInUse("Role '" + role.getName() + "'");
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
index 16fd515b5a..f938cc15e7 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
@@ -1,5 +1,7 @@
package io.onedev.server.event.issue;
+import java.util.Collection;
+
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.IssueComment;
@@ -7,9 +9,12 @@ public class IssueCommented extends IssueEvent implements MarkdownAware {
private final IssueComment comment;
- public IssueCommented(IssueComment comment) {
+ private final Collection<String> notifiedEmailAddresses;
+
+ public IssueCommented(IssueComment comment, Collection<String> notifiedEmailAddresses) {
super(comment.getUser(), comment.getDate(), comment.getIssue());
this.comment = comment;
+ this.notifiedEmailAddresses = notifiedEmailAddresses;
}
public IssueComment getComment() {
@@ -26,6 +31,10 @@ public class IssueCommented extends IssueEvent implements MarkdownAware {
return false;
}
+ public Collection<String> getNotifiedEmailAddresses() {
+ return notifiedEmailAddresses;
+ }
+
@Override
public String getActivity(boolean withEntity) {
String activity = "commented";
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java
similarity index 59%
rename from server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java
rename to server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java
index e20a7376f0..1e6cb9fa46 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java
@@ -1,21 +1,30 @@
package io.onedev.server.event.pullrequest;
+import java.util.Collection;
+
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequestComment;
-public class PullRequestCommentCreated extends PullRequestEvent implements MarkdownAware {
+public class PullRequestCommented extends PullRequestEvent implements MarkdownAware {
private final PullRequestComment comment;
- public PullRequestCommentCreated(PullRequestComment comment) {
+ private final Collection<String> notifiedEmailAddresses;
+
+ public PullRequestCommented(PullRequestComment comment, Collection<String> notifiedEmailAddresses) {
super(comment.getUser(), comment.getDate(), comment.getRequest());
this.comment = comment;
+ this.notifiedEmailAddresses = notifiedEmailAddresses;
}
public PullRequestComment getComment() {
return comment;
}
+ public Collection<String> getNotifiedEmailAddresses() {
+ return notifiedEmailAddresses;
+ }
+
@Override
public String getMarkdown() {
return getComment().getContent();
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 66670285c3..78afdc7656 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -325,8 +325,9 @@ public class DefaultDataManager implements DataManager, Serializable {
+ "Error detail:\n"
+ "%s",
url, Throwables.getStackTraceAsString(e));
- mailManager.sendMail(Lists.newArrayList(root.getEmail()),
- "OneDev database auto-backup failed", htmlBody, textBody);
+ mailManager.sendMail(Lists.newArrayList(root.getEmail()), Lists.newArrayList(),
+ "OneDev database auto-backup failed", htmlBody, textBody,
+ null, null);
}
public Object writeReplace() throws ObjectStreamException {
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 06d9b37a90..d8d0e5a7bc 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -3,6 +3,8 @@ package io.onedev.server.migration;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -2550,4 +2552,33 @@ public class DataMigrator {
}
}
+ private void migrate59(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.elementTextTrim("key").equals("MAIL")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ valueElement.element("sendAsHtml").detach();
+ Element senderAddressElement = valueElement.element("senderAddress");
+ if (senderAddressElement != null) {
+ senderAddressElement.setName("emailAddress");
+ } else {
+ String hostName;
+ try {
+ hostName = InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException e) {
+ hostName = "localhost";
+ }
+ valueElement.addElement("emailAddress").setText("onedev@" + hostName);
+ }
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
index 9665e972d1..68aa75edcb 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -249,15 +249,10 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
}
@Override
- public String getAttachmentGroup() {
+ public String getGroup() {
return uuid;
}
- @Override
- public Project getAttachmentProject() {
- return getProject();
- }
-
public Collection<User> getParticipants() {
if (participants == null) {
participants = new LinkedHashSet<>();
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 30b784d3e1..f1cdaea48d 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -4,6 +4,7 @@ import static io.onedev.server.model.Issue.PROP_COMMENT_COUNT;
import static io.onedev.server.model.Issue.PROP_NO_SPACE_TITLE;
import static io.onedev.server.model.Issue.PROP_NUMBER;
import static io.onedev.server.model.Issue.PROP_STATE;
+import static io.onedev.server.model.Issue.PROP_UUID;
import static io.onedev.server.model.Issue.PROP_SUBMIT_DATE;
import static io.onedev.server.model.Issue.PROP_TITLE;
import static io.onedev.server.model.Issue.PROP_VOTE_COUNT;
@@ -75,6 +76,7 @@ import io.onedev.server.web.editable.annotation.Editable;
@Table(
indexes={
@Index(columnList="o_project_id"), @Index(columnList=PROP_STATE),
+ @Index(columnList=PROP_UUID),
@Index(columnList=PROP_TITLE), @Index(columnList=PROP_NO_SPACE_TITLE),
@Index(columnList=PROP_NUMBER), @Index(columnList=PROP_SUBMIT_DATE),
@Index(columnList="o_submitter_id"), @Index(columnList=PROP_VOTE_COUNT),
@@ -144,6 +146,8 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
public static final String PROP_FIELDS = "fields";
+ public static final String PROP_UUID = "uuid";
+
public static final String PROP_ID = "id";
public static final String PROP_NO_SPACE_TITLE = "noSpaceTitle";
@@ -203,6 +207,8 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
private long number;
+ private String threadingReference;
+
@Embedded
private LastUpdate lastUpdate;
@@ -284,6 +290,15 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
this.uuid = uuid;
}
+ @Nullable
+ public String getThreadingReference() {
+ return threadingReference;
+ }
+
+ public void setThreadingReference(String threadingReference) {
+ this.threadingReference = threadingReference;
+ }
+
@Override
public long getNumber() {
return number;
@@ -680,15 +695,10 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
}
@Override
- public String getAttachmentGroup() {
+ public String getGroup() {
return uuid;
}
- @Override
- public Project getAttachmentProject() {
- return getProject();
- }
-
public ProjectScopedNumber getFQN() {
return new ProjectScopedNumber(getProject(), getNumber());
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 0a16743e59..e77507a65d 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -1507,7 +1507,7 @@ public class Project extends AbstractEntity implements NameAware {
public String saveAttachment(String attachmentGroup, String suggestedAttachmentName, InputStream attachmentStream) {
String attachmentName = suggestedAttachmentName;
- File attachmentDir = OneDev.getInstance(AttachmentStorageManager.class).getAttachmentGroupDir(this, attachmentGroup);
+ File attachmentDir = OneDev.getInstance(AttachmentStorageManager.class).getGroupDir(this, attachmentGroup);
FileUtils.createDir(attachmentDir);
int index = 2;
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index c0c7aed294..86564db1e7 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -966,7 +966,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
@Override
- public String getAttachmentGroup() {
+ public String getGroup() {
return uuid;
}
@@ -1041,11 +1041,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
return comparisonBase;
}
- @Override
- public Project getAttachmentProject() {
- return getTargetProject();
- }
-
@Override
public Project getProject() {
return getTargetProject();
diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.java
index 33c887be75..b69ec0fbcf 100644
--- a/server-core/src/main/java/io/onedev/server/model/Role.java
+++ b/server-core/src/main/java/io/onedev/server/model/Role.java
@@ -96,9 +96,7 @@ public class Role extends AbstractEntity implements Permission, NameAware {
@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)
private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();
- @Editable(order=100, description="Specify name of the role. <b class='text-danger'>NOTE: </b> "
- + "Permission to view issues will be granted implicitly even if no other permissions "
- + "are specified here")
+ @Editable(order=100)
@NotEmpty
@Override
public String getName() {
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index 96b4bbfcde..e6c65ce4c2 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -36,6 +36,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.MoreObjects;
+import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -520,6 +521,14 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
public void setMemberships(Collection<Membership> memberships) {
this.memberships = memberships;
}
+
+ public Collection<String> getEmails() {
+ Collection<String> emails = Sets.newHashSet(email);
+ if (gitEmail != null)
+ emails.add(gitEmail);
+ emails.addAll(alternateEmails);
+ return emails;
+ }
@Override
public String toString() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java
index 7d3861313f..be9d3f9839 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java
@@ -4,6 +4,8 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Password;
@@ -16,21 +18,19 @@ public class MailSetting implements Serializable {
private int smtpPort = 587;
- private boolean enableStartTLS = true;
-
- private boolean sendAsHtml = true;
-
private String smtpUser;
private String smtpPassword;
- private String senderAddress;
+ private String emailAddress;
+
+ private ReceiveMailSetting receiveMailSetting;
+
+ private boolean enableStartTLS = true;
private int timeout = 60;
- @Editable(order=100, name="SMTP Host", description=
- "Specify the SMTP mail host used by OneDev to send email."
- )
+ @Editable(order=100, name="SMTP Host")
@NotEmpty
public String getSmtpHost() {
return smtpHost;
@@ -49,25 +49,6 @@ public class MailSetting implements Serializable {
this.smtpPort = smtpPort;
}
- @Editable(order=250, name="Enable STARTTLS", description="Whether or not to enable STARTTLS on above port")
- public boolean isEnableStartTLS() {
- return enableStartTLS;
- }
-
- public void setEnableStartTLS(boolean enableStartTLS) {
- this.enableStartTLS = enableStartTLS;
- }
-
- @Editable(order=260, name="Send as Html", description=
- "If checked, mail will be sent in html format. Otherwise in plain text format")
- public boolean isSendAsHtml() {
- return sendAsHtml;
- }
-
- public void setSendAsHtml(boolean sendAsHtml) {
- this.sendAsHtml = sendAsHtml;
- }
-
@Editable(order=300, name="SMTP User", description=
"Optionally specify user name here if the SMTP host needs authentication"
)
@@ -91,21 +72,41 @@ public class MailSetting implements Serializable {
this.smtpPassword = smtpPassword;
}
- @Editable(order=500, description=
- "This property is optional. If specified, OneDev will use this email " +
- "as the sender address when sending out emails. Otherwise, the sender " +
- "address will be <b>onedev@&lt;hostname&gt;</b>, where &lt;hostname&gt; " +
- "is the host name of OneDev server."
- )
- public String getSenderAddress() {
- return senderAddress;
+ @Editable(order=410, name="System Email Address", description="This email address will be used as sender "
+ + "address for various notifications")
+ @NotEmpty
+ public String getEmailAddress() {
+ return emailAddress;
}
- public void setSenderAddress(String senderAddress) {
- this.senderAddress = senderAddress;
+ public void setEmailAddress(String emailAddress) {
+ this.emailAddress = emailAddress;
}
- @Editable(order=600, description="Specify timeout in seconds when communicating with the SMTP server. " +
+ @Editable(order=450, name="Check Incoming Email", description="Enable this to check inbox of "
+ + "system email address to take various actions, such as creating issue, "
+ + "post issue/pull request comments etc.<br>"
+ + "<b class='text-danger'>NOTE:</b> <a href='https://en.wikipedia.org/wiki/Email_address#Subaddressing' target='_blank'>Sub addressing</a> "
+ + "needs to be enabled for your mail server, as OneDev needs to use this to track context of sent email and received email")
+ public ReceiveMailSetting getReceiveMailSetting() {
+ return receiveMailSetting;
+ }
+
+ public void setReceiveMailSetting(ReceiveMailSetting receiveMailSetting) {
+ this.receiveMailSetting = receiveMailSetting;
+ }
+
+ @Editable(order=550, name="Enable STARTTLS", description="Whether or not to enable STARTTLS "
+ + "when interacting with mail server")
+ public boolean isEnableStartTLS() {
+ return enableStartTLS;
+ }
+
+ public void setEnableStartTLS(boolean enableStartTLS) {
+ this.enableStartTLS = enableStartTLS;
+ }
+
+ @Editable(order=600, description="Specify timeout in seconds when communicating with mail server. " +
"Use 0 to set an infinite timeout.")
public int getTimeout() {
return timeout;
@@ -114,5 +115,66 @@ public class MailSetting implements Serializable {
public void setTimeout(int timeout) {
this.timeout = timeout;
}
-
+
+ public void onRenameRole(String oldName, String newName) {
+ if (receiveMailSetting != null) {
+ for (SenderAuthorization authorization: receiveMailSetting.getSenderAuthorizations()) {
+ if (authorization.getAuthorizedRoleName().equals(oldName))
+ authorization.setAuthorizedRoleName(newName);
+ }
+ }
+ }
+
+ public Usage onDeleteRole(String roleName) {
+ Usage usage = new Usage();
+ if (getReceiveMailSetting() != null) {
+ int index = 0;
+ for (SenderAuthorization authorization: getReceiveMailSetting().getSenderAuthorizations()) {
+ if (authorization.getAuthorizedRoleName().equals(roleName))
+ usage.add("authorized role");
+ usage.prefix("sender authorization #" + index);
+ index++;
+ }
+ usage.prefix("check incoming email");
+ }
+ return usage;
+ }
+
+ public void onRenameProject(String oldName, String newName) {
+ if (receiveMailSetting != null) {
+ for (SenderAuthorization authorization: receiveMailSetting.getSenderAuthorizations()) {
+ if (authorization.getDefaultProject().equals(oldName))
+ authorization.setDefaultProject(newName);
+ PatternSet patternSet = PatternSet.parse(authorization.getAuthorizedProjects());
+ if (patternSet.getIncludes().remove(oldName))
+ patternSet.getIncludes().add(newName);
+ if (patternSet.getExcludes().remove(oldName))
+ patternSet.getExcludes().add(newName);
+ authorization.setAuthorizedProjects(patternSet.toString());
+ if (authorization.getAuthorizedProjects().length() == 0)
+ authorization.setAuthorizedProjects(null);
+ }
+ }
+ }
+
+ public Usage onDeleteProject(String projectName) {
+ Usage usage = new Usage();
+ if (getReceiveMailSetting() != null) {
+ int index = 0;
+ for (SenderAuthorization authorization: getReceiveMailSetting().getSenderAuthorizations()) {
+ if (authorization.getDefaultProject().equals(projectName))
+ usage.add("default project");
+ if (authorization.getAuthorizedProjects() != null) {
+ PatternSet patternSet = PatternSet.parse(authorization.getAuthorizedProjects());
+ if (patternSet.getIncludes().contains(projectName) || patternSet.getExcludes().contains(projectName))
+ usage.add("authorized projects");
+ }
+ usage.prefix("sender authorization #" + index);
+ index++;
+ }
+ usage.prefix("check incoming email");
+ }
+ return usage;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ReceiveMailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ReceiveMailSetting.java
new file mode 100644
index 0000000000..2d638a8468
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ReceiveMailSetting.java
@@ -0,0 +1,96 @@
+package io.onedev.server.model.support.administration;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.util.match.Matcher;
+import io.onedev.server.util.match.StringMatcher;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Password;
+
+@Editable
+public class ReceiveMailSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String imapHost;
+
+ private int imapPort = 993;
+
+ private String imapUser;
+
+ private String imapPassword;
+
+ private List<SenderAuthorization> senderAuthorizations = new ArrayList<>();
+
+ @Editable(order=100, name="IMAP Host")
+ @NotEmpty
+ public String getImapHost() {
+ return imapHost;
+ }
+
+ public void setImapHost(String imapHost) {
+ this.imapHost = imapHost;
+ }
+
+ @Editable(order=200, name="IMAP Port")
+ public int getImapPort() {
+ return imapPort;
+ }
+
+ public void setImapPort(int imapPort) {
+ this.imapPort = imapPort;
+ }
+
+ @Editable(order=500, name="IMAP User", description="Specify user name here if the IMAP host needs authentication.<br>"
+ + "<b class='text-danger'>NOTE: </b> Inbox of this account should be able to receive replies to system email address specified above")
+ @NotEmpty
+ public String getImapUser() {
+ return imapUser;
+ }
+
+ public void setImapUser(String imapUser) {
+ this.imapUser = imapUser;
+ }
+
+ @Editable(order=600, name="IMAP Password", description="Specify password here if the IMAP host needs authentication")
+ @Password(autoComplete="new-password")
+ @NotEmpty
+ public String getImapPassword() {
+ return imapPassword;
+ }
+
+ public void setImapPassword(String imapPassword) {
+ this.imapPassword = imapPassword;
+ }
+
+ @Editable(order=700, description="Only emails from authorized senders will be processed")
+ public List<SenderAuthorization> getSenderAuthorizations() {
+ return senderAuthorizations;
+ }
+
+ public void setSenderAuthorizations(List<SenderAuthorization> senderAuthorizations) {
+ this.senderAuthorizations = senderAuthorizations;
+ }
+
+ @Nullable
+ public SenderAuthorization getSenderAuthorization(String senderAddress) {
+ for (SenderAuthorization authorization: senderAuthorizations) {
+ String patterns = authorization.getSenderEmails();
+ if (patterns == null)
+ patterns = "*";
+ Matcher matcher = new StringMatcher();
+ PatternSet patternSet = PatternSet.parse(patterns);
+ if (patternSet.matches(matcher, senderAddress))
+ return authorization;
+ }
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java
new file mode 100644
index 0000000000..c53e48dc4d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java
@@ -0,0 +1,145 @@
+package io.onedev.server.model.support.administration;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.validation.Valid;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.RoleManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.Role;
+import io.onedev.server.model.support.issue.field.supply.FieldSupply;
+import io.onedev.server.util.match.Matcher;
+import io.onedev.server.util.match.StringMatcher;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.ChoiceProvider;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.FieldNamesProvider;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.editable.annotation.RoleChoice;
+import io.onedev.server.web.util.SuggestionUtils;
+
+@Editable
+public class SenderAuthorization implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String senderEmails;
+
+ private String authorizedProjects;
+
+ private String authorizedRoleName;
+
+ private String defaultProject;
+
+ private List<FieldSupply> issueFields = new ArrayList<>();
+
+ @Editable(order=100, name="Applicable Senders", description="Specify space-separated sender "
+ + "email addresses applicable for this entry. Use '*' or '?' for wildcard match. "
+ + "Prefix with '-' to exclude. Leave empty to match all senders")
+ @Patterns
+ @NameOfEmptyValue("Any sender")
+ public String getSenderEmails() {
+ return senderEmails;
+ }
+
+ public void setSenderEmails(String senderEmails) {
+ this.senderEmails = senderEmails;
+ }
+
+ @Editable(order=150, description="Specify space-separated projects authorized to senders above. "
+ + "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. Leave empty to "
+ + "authorize all projects")
+ @Patterns(suggester="suggestProjects")
+ @NameOfEmptyValue("Any project")
+ public String getAuthorizedProjects() {
+ return authorizedProjects;
+ }
+
+ public void setAuthorizedProjects(String authorizedProjects) {
+ this.authorizedProjects = authorizedProjects;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestProjects(String matchWith) {
+ return SuggestionUtils.suggestProjects(matchWith);
+ }
+
+ @Editable(order=175, name="Authorized Role", description="Specify authorized role for above projects")
+ @RoleChoice
+ @NotEmpty
+ public String getAuthorizedRoleName() {
+ return authorizedRoleName;
+ }
+
+ public void setAuthorizedRoleName(String authorizedRoleName) {
+ this.authorizedRoleName = authorizedRoleName;
+ }
+
+ public Role getAuthorizedRole() {
+ Role role = OneDev.getInstance(RoleManager.class).find(authorizedRoleName);
+ if (role == null)
+ throw new ExplicitException("Undefined role: " + authorizedRoleName);
+ return role;
+ }
+
+ @Editable(order=200, description="Upon receiving new email (aka, not replying to notification emails), OneDev "
+ + "will check subaddress of the email to determine which project to create issue in. If subadddress "
+ + "is not specified, this property will be used to determine project based on sender address")
+ @ChoiceProvider("getProjectChoices")
+ @NotEmpty
+ public String getDefaultProject() {
+ return defaultProject;
+ }
+
+ public void setDefaultProject(String defaultProject) {
+ this.defaultProject = defaultProject;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getProjectChoices() {
+ List<String> projectNames = OneDev.getInstance(ProjectManager.class)
+ .query().stream().map(it->it.getName()).collect(Collectors.toList());
+ Collections.sort(projectNames);
+ return projectNames;
+ }
+
+ @Editable(order=300)
+ @FieldNamesProvider("getFieldNames")
+ @OmitName
+ @Valid
+ public List<FieldSupply> getIssueFields() {
+ return issueFields;
+ }
+
+ public void setIssueFields(List<FieldSupply> issueFields) {
+ this.issueFields = issueFields;
+ }
+
+ @SuppressWarnings("unused")
+ private static Collection<String> getFieldNames() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getPromptFieldsUponIssueOpen();
+ }
+
+ public boolean isProjectAuthorized(Project project) {
+ String authorizedProjects = this.authorizedProjects;
+ if (authorizedProjects == null)
+ authorizedProjects = "*";
+ Matcher matcher = new StringMatcher();
+ return PatternSet.parse(authorizedProjects).matches(matcher, project.getName());
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java
index b4ef596d69..f7bfbcd1d4 100644
--- a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java
@@ -4,19 +4,34 @@ import javax.annotation.Nullable;
import io.onedev.server.event.Event;
import io.onedev.server.event.MarkdownAware;
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.markdown.MarkdownManager;
public abstract class AbstractNotificationManager {
+ protected final MarkdownManager markdownManager;
+
+ public AbstractNotificationManager(MarkdownManager markdownManager) {
+ this.markdownManager = markdownManager;
+ }
+
protected String getHtmlBody(@Nullable Event event, String url) {
String htmlBody = null;
if (event instanceof MarkdownAware) {
String markdown = ((MarkdownAware) event).getMarkdown();
if (markdown != null) {
+ Project project = null;
+ if (event instanceof ProjectEvent)
+ project = ((ProjectEvent) event).getProject();
+ String html = markdownManager.process(markdownManager.render(markdown), project, null, true);
+
htmlBody = String.format(""
- + "<pre>%s</pre>"
- + "<p>"
- + "Visit <a href='%s'>%s</a> for details",
- markdown, url, url);
+ + "%s"
+ + "<br>"
+ + "<br>"
+ + "<div style='color:#888;font-size:0.9rem;'>Visit <a href='%s'>%s</a> for details</div>",
+ html, url, url);
}
}
if (htmlBody == null)
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
index af1e43f553..fe9ba8cbf1 100644
--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
@@ -12,6 +12,8 @@ import javax.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
@@ -24,6 +26,7 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.search.entity.build.BuildQuery;
+import io.onedev.server.util.markdown.MarkdownManager;
@Singleton
public class BuildNotificationManager extends AbstractNotificationManager {
@@ -40,7 +43,9 @@ public class BuildNotificationManager extends AbstractNotificationManager {
@Inject
public BuildNotificationManager(MailManager mailManager, UrlManager urlManager,
- UserManager userManager, SettingManager settingManager) {
+ UserManager userManager, SettingManager settingManager,
+ MarkdownManager markdownManager) {
+ super(markdownManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
this.userManager = userManager;
@@ -69,7 +74,9 @@ public class BuildNotificationManager extends AbstractNotificationManager {
build.getNumber(), build.getStatus().getDisplayName().toLowerCase());
}
String url = urlManager.urlFor(build);
- mailManager.sendMailAsync(emails, subject, getHtmlBody(null, url), getTextBody(null, url));
+ String threadingReferences = build.getProject().getName() + "-build" + build.getNumber() + "@onedev";
+ mailManager.sendMailAsync(Lists.newArrayList(), emails, subject, getHtmlBody(null, url),
+ getTextBody(null, url), null, threadingReferences);
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
index ca06b88306..81997f2c02 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
@@ -3,6 +3,7 @@ package io.onedev.server.notification;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.Listen;
@@ -22,8 +23,6 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
private final MailManager mailManager;
- private final MarkdownManager markdownManager;
-
private final UrlManager urlManager;
private final UserManager userManager;
@@ -31,8 +30,8 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
@Inject
public CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager,
UrlManager urlManager, UserManager userManager) {
+ super(markdownManager);
this.mailManager = mailManager;
- this.markdownManager = markdownManager;
this.urlManager = urlManager;
this.userManager = userManager;
}
@@ -59,8 +58,10 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
if (url != null) {
String subject = String.format("You are mentioned in a code comment on file '%s'",
event.getComment().getMark().getPath());
- mailManager.sendMailAsync(Sets.newHashSet(user.getEmail()), subject,
- getHtmlBody(event, url), getTextBody(event, url));
+ String threadingReferences = event.getComment().getProject().getName()
+ + "-codecomment" + event.getComment().getId() + "@onedev";
+ mailManager.sendMailAsync(Sets.newHashSet(user.getEmail()), Lists.newArrayList(), subject,
+ getHtmlBody(event, url), getTextBody(event, url), null, threadingReferences);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
index 88ea43e509..540ce0be1b 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
@@ -14,9 +14,12 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.event.RefUpdated;
+import io.onedev.server.git.GitUtils;
import io.onedev.server.model.CommitQuerySetting;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -24,6 +27,7 @@ import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.search.commit.CommitQuery;
+import io.onedev.server.util.markdown.MarkdownManager;
@Singleton
public class CommitNotificationManager extends AbstractNotificationManager {
@@ -35,7 +39,8 @@ public class CommitNotificationManager extends AbstractNotificationManager {
private final UrlManager urlManager;
@Inject
- public CommitNotificationManager(MailManager mailManager, UrlManager urlManager) {
+ public CommitNotificationManager(MarkdownManager markdownManager, MailManager mailManager, UrlManager urlManager) {
+ super(markdownManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
}
@@ -92,11 +97,26 @@ public class CommitNotificationManager extends AbstractNotificationManager {
RevCommit commit = project.getRevCommit(event.getNewCommitId(), false);
if (commit != null) {
- String subject = String.format("Subscribed commit at ref '%s': %s",
- event.getRefName(), commit.getShortMessage());
+ String subject;
+
+ String branchName = GitUtils.ref2branch(event.getRefName());
+ if (branchName != null) {
+ subject = String.format("[Branch %s] Commit %s: %s",
+ branchName, GitUtils.abbreviateSHA(commit.name()), commit.getShortMessage());
+ } else {
+ String tagName = GitUtils.ref2tag(event.getRefName());
+ if (tagName != null) {
+ subject = String.format("[Tag %s] Commit %s: %s",
+ tagName, GitUtils.abbreviateSHA(commit.name()), commit.getShortMessage());
+ } else {
+ subject = String.format("[Ref %s] Commit %s: %s",
+ event.getRefName(), GitUtils.abbreviateSHA(commit.name()), commit.getShortMessage());
+ }
+ }
+
String url = urlManager.urlFor(project, commit);
- mailManager.sendMailAsync(notifyEmails, subject,
- getHtmlBody(event, url), getTextBody(event, url));
+ mailManager.sendMailAsync(Lists.newArrayList(), notifyEmails, subject,
+ getHtmlBody(event, url), getTextBody(event, url), null, null);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
index 8b170920c2..cf15a7395a 100644
--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
@@ -1,26 +1,88 @@
package io.onedev.server.notification;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.Part;
+import javax.mail.Session;
+import javax.mail.Store;
+import javax.mail.event.MessageCountEvent;
+import javax.mail.event.MessageCountListener;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.ContentType;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeUtility;
import org.apache.commons.codec.CharEncoding;
-import org.apache.commons.mail.Email;
import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.HtmlEmail;
-import org.apache.commons.mail.SimpleEmail;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.sun.mail.imap.IMAPFolder;
+
+import edu.emory.mathcs.backport.java.util.Arrays;
import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.entitymanager.IssueCommentManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.IssueWatchManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserAuthorizationManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.IssueWatch;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.PullRequestWatch;
+import io.onedev.server.model.Role;
+import io.onedev.server.model.Setting;
+import io.onedev.server.model.User;
+import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.administration.MailSetting;
+import io.onedev.server.model.support.administration.ReceiveMailSetting;
+import io.onedev.server.model.support.administration.SenderAuthorization;
+import io.onedev.server.model.support.issue.field.supply.FieldSupply;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.util.EmailAddress;
+import io.onedev.server.util.validation.UserNameValidator;
@Singleton
public class DefaultMailManager implements MailManager {
@@ -31,19 +93,55 @@ public class DefaultMailManager implements MailManager {
private final TransactionManager transactionManager;
+ private final ProjectManager projectManager;
+
+ private final UserAuthorizationManager authorizationManager;
+
+ private final IssueManager issueManager;
+
+ private final IssueCommentManager issueCommentManager;
+
+ private final IssueWatchManager issueWatchManager;
+
+ private final PullRequestManager pullRequestManager;
+
+ private final PullRequestCommentManager pullRequestCommentManager;
+
+ private final PullRequestWatchManager pullRequestWatchManager;
+
private final ExecutorService executorService;
+ private final UserManager userManager;
+
+ private volatile boolean stopping;
+
+ private volatile Thread thread;
+
@Inject
public DefaultMailManager(TransactionManager transactionManager, SettingManager setingManager,
- ExecutorService executorService) {
+ UserManager userManager, ProjectManager projectManager,
+ UserAuthorizationManager authorizationManager, IssueManager issueManager,
+ IssueCommentManager issueCommentManager, IssueWatchManager issueWatchManager,
+ PullRequestManager pullRequestManager, PullRequestCommentManager pullRequestCommentManager,
+ PullRequestWatchManager pullRequestWatchManager, ExecutorService executorService) {
this.transactionManager = transactionManager;
this.settingManager = setingManager;
+ this.userManager = userManager;
+ this.projectManager = projectManager;
+ this.authorizationManager = authorizationManager;
+ this.issueManager = issueManager;
+ this.issueCommentManager = issueCommentManager;
+ this.issueWatchManager = issueWatchManager;
+ this.pullRequestManager = pullRequestManager;
+ this.pullRequestCommentManager = pullRequestCommentManager;
+ this.pullRequestWatchManager = pullRequestWatchManager;
this.executorService = executorService;
}
@Sessional
@Override
- public void sendMailAsync(Collection<String> toList, String subject, String htmlBody, String textBody) {
+ public void sendMailAsync(Collection<String> toList, Collection<String> ccList, String subject,
+ String htmlBody, String textBody, String replyAddress, String references) {
transactionManager.runAfterCommit(new Runnable() {
@Override
@@ -53,7 +151,7 @@ public class DefaultMailManager implements MailManager {
@Override
public void run() {
try {
- sendMail(toList, subject, htmlBody, textBody);
+ sendMail(toList, ccList, subject, htmlBody, textBody, replyAddress, references);
} catch (Exception e) {
logger.error("Error sending email (to: " + toList + ", subject: " + subject + ")", e);
}
@@ -66,22 +164,19 @@ public class DefaultMailManager implements MailManager {
}
@Override
- public void sendMail(MailSetting mailSetting, Collection<String> toList, String subject,
- String htmlBody, String textBody) {
- if (toList.isEmpty())
+ public void sendMail(MailSetting mailSetting, Collection<String> toList, Collection<String> ccList,
+ String subject, String htmlBody, String textBody, String replyAddress, String references) {
+ if (toList.isEmpty() && ccList.isEmpty())
return;
if (mailSetting == null)
mailSetting = settingManager.getMailSetting();
if (mailSetting != null) {
- Email email;
-
+ HtmlEmail email = new HtmlEmail();
try {
- if (mailSetting.isSendAsHtml())
- email = new HtmlEmail().setHtmlMsg(htmlBody);
- else
- email = new SimpleEmail().setMsg(textBody);
+ email.setHtmlMsg(htmlBody);
+ email.setTextMsg(textBody);
} catch (EmailException e) {
throw new RuntimeException(e);
}
@@ -94,21 +189,17 @@ public class DefaultMailManager implements MailManager {
email.setStartTLSEnabled(mailSetting.isEnableStartTLS());
email.setSSLOnConnect(false);
email.setSSLCheckServerIdentity(false);
+ if (references != null)
+ email.addHeader("References", references);
- String senderEmail = mailSetting.getSenderAddress();
- if (senderEmail == null) {
- String hostName;
- try {
- hostName = InetAddress.getLocalHost().getHostName();
- } catch (UnknownHostException e) {
- hostName = "localhost";
- }
- senderEmail = "onedev@" + hostName;
- }
try {
- email.setFrom(senderEmail);
+ if (replyAddress != null)
+ email.setReplyTo(Lists.newArrayList(InternetAddress.parse(replyAddress)));
+ email.setFrom(mailSetting.getEmailAddress());
for (String address: toList)
email.addTo(address);
+ for (String address: ccList)
+ email.addCc(address);
email.setHostName(mailSetting.getSmtpHost());
email.setSmtpPort(mailSetting.getSmtpPort());
@@ -122,7 +213,7 @@ public class DefaultMailManager implements MailManager {
logger.debug("Sending email (to: {}, subject: {})... ", toList, subject);
email.send();
- } catch (EmailException e) {
+ } catch (EmailException | AddressException e) {
throw new RuntimeException(e);
}
} else {
@@ -131,8 +222,627 @@ public class DefaultMailManager implements MailManager {
}
@Override
- public void sendMail(Collection<String> toList, String subject, String htmlBody, String textBody) {
- sendMail(settingManager.getMailSetting(), toList, subject, htmlBody, textBody);
+ public void sendMail(Collection<String> toList, Collection<String> ccList, String subject,
+ String htmlBody, String textBody, String replyAddress, String references) {
+ sendMail(settingManager.getMailSetting(), toList, ccList, subject, htmlBody,
+ textBody, replyAddress, references);
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.getEntity() instanceof Setting) {
+ Setting setting = (Setting) event.getEntity();
+ if (setting.getKey() == Setting.Key.MAIL) {
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ Thread thread = DefaultMailManager.this.thread;
+ if (thread != null)
+ thread.interrupt();
+ }
+
+ });
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Transactional
+ protected void onMessage(MailSetting mailSetting, Message message) {
+ try {
+ String[] toHeader = message.getHeader("To");
+ String[] fromHeader = message.getHeader("From");
+ String[] ccHeader = message.getHeader("Cc");
+ if (toHeader != null && toHeader.length != 0) {
+ if (fromHeader == null || fromHeader.length == 0)
+ throw new ExplicitException("Invalid email message: no from address found");
+
+ InternetAddress from = InternetAddress.parse(fromHeader[0], true)[0];
+
+ SenderAuthorization authorization = mailSetting.getReceiveMailSetting()
+ .getSenderAuthorization(from.getAddress());
+ if (authorization == null)
+ throw new ExplicitException("Unauthorized sender: " + from.getAddress());
+
+ EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());
+
+ Collection<Issue> issues = new ArrayList<>();
+ Collection<PullRequest> pullRequests = new ArrayList<>();
+ Collection<InternetAddress> involved = new ArrayList<>();
+
+ List<InternetAddress> receivers = new ArrayList<>();
+ receivers.addAll(Arrays.asList(InternetAddress.parse(toHeader[0], true)));
+
+ if (ccHeader != null && ccHeader.length != 0)
+ receivers.addAll(Arrays.asList(InternetAddress.parse(ccHeader[0], true)));
+
+ List<String> receiverEmailAddresses =
+ receivers.stream().map(it->it.getAddress()).collect(Collectors.toList());
+ for (InternetAddress receiver: receivers) {
+ EmailAddress receiverAddress = EmailAddress.parse(receiver.getAddress());
+ if (receiverAddress.toString().equals(systemAddress.toString())) {
+ String projectName = authorization.getDefaultProject();
+ Project project = projectManager.find(projectName);
+ if (project == null) {
+ String errorMessage = String.format(
+ "Default project not found (sender: %s, project: %s)",
+ from.getAddress(), projectName);
+ throw new ExplicitException(errorMessage);
+ }
+ issues.add(openIssue(message, project, from, authorization));
+ } else if (receiverAddress.getDomain().equals(systemAddress.getDomain())
+ && receiverAddress.getPrefix().startsWith(systemAddress.getPrefix() + "+")) {
+ String subAddress = receiverAddress.getPrefix().substring(systemAddress.getPrefix().length()+1);
+ String projectName = StringUtils.substringBefore(subAddress, "~");
+ if (projectName.equals(MailManager.TEST_SUB_ADDRESSING))
+ continue;
+ Project project = projectManager.find(projectName);
+ if (project == null)
+ throw new ExplicitException("Non-existent project in to address: " + receiverAddress);
+ if (!authorization.isProjectAuthorized(project))
+ throw new ExplicitException("Unauthorized project in to address: " + receiverAddress);
+ String remaining = StringUtils.substringAfterLast(subAddress, "~");
+ if (remaining.length() == 0) {
+ openIssue(message, project, from, authorization);
+ } else if (remaining.startsWith("issue")) {
+ remaining = remaining.substring("issue".length());
+ Long issueNumber;
+ try {
+ issueNumber = Long.valueOf(remaining);
+ } catch (NumberFormatException e) {
+ throw new ExplicitException("Invalid issue number in to address: " + receiverAddress);
+ }
+ Issue issue = issueManager.find(project, issueNumber);
+ if (issue == null)
+ throw new ExplicitException("Non-existent issue in to address: " + receiverAddress);
+ addComment(issue, message, from, receiverEmailAddresses, authorization.getAuthorizedRole());
+ issues.add(issue);
+ } else if (remaining.startsWith("pullrequest")) {
+ remaining = remaining.substring("pullrequest".length());
+ Long pullRequestNumber;
+ try {
+ pullRequestNumber = Long.valueOf(remaining);
+ } catch (NumberFormatException e) {
+ throw new ExplicitException("Invalid pull request number in to address: " + receiverAddress);
+ }
+ PullRequest pullRequest = pullRequestManager.find(project, pullRequestNumber);
+ if (pullRequest == null)
+ throw new ExplicitException("Non-existent issue in to address: " + receiverAddress);
+ addComment(pullRequest, message, from, receiverEmailAddresses, authorization.getAuthorizedRole());
+ pullRequests.add(pullRequest);
+ } else {
+ throw new ExplicitException("Unknown sub addressing: " + receiverAddress);
+ }
+ } else {
+ involved.add(receiver);
+ }
+ }
+
+ for (Issue issue: issues) {
+ for (InternetAddress each: involved)
+ createUserIfNotExist(each, issue, authorization.getAuthorizedRole());
+ }
+ for (PullRequest pullRequest: pullRequests) {
+ for (InternetAddress each: involved)
+ createUserIfNotExist(each, pullRequest, authorization.getAuthorizedRole());
+ }
+ }
+ } catch (Exception e) {
+ logger.error("Error processing incoming email", e);
+ }
+ }
+
+ private void addComment(Issue issue, Message message, InternetAddress author,
+ Collection<String> receiverEmailAddresses, Role role) throws IOException, MessagingException {
+ IssueComment comment = new IssueComment();
+ comment.setIssue(issue);
+ User user = createUserIfNotExist(author, issue.getProject(), role);
+ comment.setUser(user);
+ String content = readText(issue.getProject(), issue.getUUID(), message);
+ if (StringUtils.isNotBlank(content)) {
+ comment.setContent(content);
+ issueCommentManager.save(comment, receiverEmailAddresses);
+ }
+ }
+
+ private void addComment(PullRequest pullRequest, Message message, InternetAddress author,
+ Collection<String> receiverEmailAddresses, Role role) throws IOException, MessagingException {
+ PullRequestComment comment = new PullRequestComment();
+ comment.setRequest(pullRequest);
+ User user = createUserIfNotExist(author, pullRequest.getProject(), role);
+ comment.setUser(user);
+ String content = readText(pullRequest.getProject(), pullRequest.getUUID(), message);
+ if (StringUtils.isNotBlank(content)) {
+ comment.setContent(content);
+ pullRequestCommentManager.save(comment, receiverEmailAddresses);
+ }
+ }
+
+ private Issue openIssue(Message message, Project project, InternetAddress submitter,
+ SenderAuthorization authorization) throws MessagingException, IOException {
+ Issue issue = new Issue();
+ issue.setProject(project);
+ if (StringUtils.isNotBlank(message.getSubject()))
+ issue.setTitle(message.getSubject());
+ else
+ issue.setTitle("No title");
+
+ String[] messageId = message.getHeader("Message-ID");
+ if (messageId != null && messageId.length != 0)
+ issue.setThreadingReference(messageId[0]);
+
+ String description = readText(project, issue.getUUID(), message);
+ if (StringUtils.isNotBlank(description))
+ issue.setDescription(description);
+
+ User user = createUserIfNotExist(submitter, project, authorization.getAuthorizedRole());
+ issue.setSubmitter(user);
+
+ GlobalIssueSetting issueSetting = settingManager.getIssueSetting();
+ issue.setState(issueSetting.getInitialStateSpec().getName());
+ for (FieldSupply supply: authorization.getIssueFields()) {
+ Object fieldValue = issueSetting.getFieldSpec(supply.getName())
+ .convertToObject(supply.getValueProvider().getValue());
+ issue.setFieldValue(supply.getName(), fieldValue);
+ }
+ issueManager.open(issue);
+ return issue;
+ }
+
+ private User createUserIfNotExist(InternetAddress address, Project project, Role role) {
+ User user = userManager.findByEmail(address.getAddress());
+ if (user == null) {
+ user = new User();
+ user.setName(UserNameValidator.suggestUserName(EmailAddress.parse(address.getAddress()).getPrefix()));
+ user.setEmail(address.getAddress());
+ user.setFullName(address.getPersonal());
+ user.setPassword("12345");
+ userManager.save(user);
+ }
+
+ boolean found = false;
+ for (UserAuthorization authorization: user.getAuthorizations()) {
+ if (authorization.getProject().equals(project)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ UserAuthorization authorization = new UserAuthorization();
+ authorization.setUser(user);
+ authorization.setProject(project);
+ authorization.setRole(role);
+ authorizationManager.save(authorization);
+ }
+ return user;
+ }
+
+ @Transactional
+ private User createUserIfNotExist(InternetAddress address, Issue issue, Role role) {
+ User user = createUserIfNotExist(address, issue.getProject(), role);
+ boolean found = false;
+ for (IssueWatch watch: user.getIssueWatches()) {
+ if (watch.getIssue().equals(issue)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ IssueWatch watch = new IssueWatch();
+ watch.setIssue(issue);
+ watch.setUser(user);
+ watch.setWatching(true);
+ issueWatchManager.save(watch);
+ }
+ return user;
+ }
+
+ private User createUserIfNotExist(InternetAddress address, PullRequest pullRequest, Role role) {
+ User user = createUserIfNotExist(address, pullRequest.getProject(), role);
+ boolean found = false;
+ for (PullRequestWatch watch: user.getPullRequestWatches()) {
+ if (watch.getRequest().equals(pullRequest)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ PullRequestWatch watch = new PullRequestWatch();
+ watch.setRequest(pullRequest);
+ watch.setUser(user);
+ watch.setWatching(true);
+ pullRequestWatchManager.save(watch);
+ }
+ return user;
+ }
+
+ @Listen
+ public void on(SystemStarted event) {
+ thread = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ while (!stopping) {
+ try {
+ MailSetting mailSetting = settingManager.getMailSetting();
+ monitorInbox(mailSetting, new MessageListener() {
+
+ @Override
+ public void onReceived(Message message) {
+ onMessage(mailSetting, message);
+ }
+
+ }).waitForFinish();
+ } catch (Exception e) {
+ if (ExceptionUtils.find(e, InterruptedException.class) == null)
+ logger.error("Error monitoring inbox", e);
+ } finally {
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+ thread = null;
+ }
+ });
+ thread.start();
+ }
+
+ @Listen
+ public void on(SystemStopping event) {
+ stopping = true;
+ while (true) {
+ Thread thread = this.thread;
+ if (thread != null) {
+ thread.interrupt();
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ }
+ } else {
+ break;
+ }
+ }
+ }
+
+ private void close(AtomicReference<Store> storeRef, AtomicReference<IMAPFolder> inboxRef) {
+ if (inboxRef.get() != null) {
+ if (inboxRef.get().isOpen()) {
+ try {
+ inboxRef.get().close(false);
+ } catch (Exception e) {
+ }
+ }
+ inboxRef.set(null);
+ }
+ if (storeRef.get() != null) {
+ try {
+ storeRef.get().close();
+ } catch (Exception e) {
+ }
+ storeRef.set(null);
+ }
+ }
+
+ @Override
+ public InboxMonitor monitorInbox(MailSetting mailSetting, MessageListener listener) {
+ if (mailSetting != null && mailSetting.getReceiveMailSetting() != null) {
+ ReceiveMailSetting receiveMailSetting = mailSetting.getReceiveMailSetting();
+
+ Properties properties = new Properties();
+
+ properties.setProperty("mail.imap.host", receiveMailSetting.getImapHost());
+ properties.setProperty("mail.imap.port", String.valueOf(receiveMailSetting.getImapPort()));
+ properties.setProperty("mail.imap.starttls.enable", String.valueOf(mailSetting.isEnableStartTLS()));
+
+ properties.setProperty("mail.imap.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+ properties.setProperty("mail.imap.socketFactory.fallback", "false");
+ properties.setProperty("mail.imap.socketFactory.port", String.valueOf(receiveMailSetting.getImapPort()));
+
+ properties.setProperty("mail.imap.connectiontimeout", String.valueOf(Bootstrap.SOCKET_CONNECT_TIMEOUT));
+ if (mailSetting.getTimeout() != 0)
+ properties.setProperty("mail.imap.timeout", String.valueOf(mailSetting.getTimeout()*1000));
+
+ AtomicReference<IMAPFolder> inboxRef = new AtomicReference<>(null);
+ AtomicReference<Store> store = new AtomicReference<>(null);
+ try {
+ Session session = Session.getInstance(properties);
+ store.set(session.getStore("imap"));
+
+ store.get().connect(receiveMailSetting.getImapUser(), receiveMailSetting.getImapPassword());
+
+ inboxRef.set((IMAPFolder) store.get().getFolder("INBOX"));
+ inboxRef.get().open(Folder.READ_ONLY);
+ inboxRef.get().addMessageCountListener(new MessageCountListener() {
+
+ @Override
+ public void messagesAdded(MessageCountEvent event) {
+ for (Message message: event.getMessages())
+ listener.onReceived(message);
+ }
+
+ @Override
+ public void messagesRemoved(MessageCountEvent e) {
+ }
+
+ });
+
+ AtomicReference<RuntimeException> exception = new AtomicReference<>(null);
+ AtomicReference<Boolean> stopping = new AtomicReference<>(false);
+ executorService.execute(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ while (!stopping.get())
+ inboxRef.get().idle();
+ } catch (Exception e) {
+ exception.set(ExceptionUtils.unchecked(e));
+ } finally {
+ close(store, inboxRef);
+ }
+ }
+
+ });
+ return new InboxMonitor() {
+
+ @Override
+ public void stop() {
+ IMAPFolder inbox = inboxRef.get();
+ if (inbox != null) {
+ stopping.set(true);
+ try {
+ inbox.close(false);
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ @Override
+ public void waitForFinish() throws InterruptedException {
+ InterruptedException interruptedException = null;
+ while (inboxRef.get() != null) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ interruptedException = e;
+ stop();
+ }
+ }
+ if (interruptedException != null)
+ throw interruptedException;
+
+ if (exception.get() != null)
+ throw exception.get();
+ }
+
+ };
+ } catch (Exception e) {
+ close(store, inboxRef);
+ throw ExceptionUtils.unchecked(e);
+ }
+ } else {
+ Future<?> future = executorService.submit(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(60000);
+ } catch (InterruptedException e) {
+ }
+ }
+
+ });
+ return new InboxMonitor() {
+
+ @Override
+ public void stop() {
+ future.cancel(true);
+ }
+
+ @Override
+ public void waitForFinish() throws InterruptedException {
+ try {
+ future.get();
+ } catch (InterruptedException e) {
+ stop();
+ throw e;
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ };
+ }
+ }
+
+ @Override
+ public String getReplyAddressForIssue(Issue issue) {
+ MailSetting mailSetting = settingManager.getMailSetting();
+ if (mailSetting != null) {
+ EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());
+ return systemAddress.getPrefix() + "+" + issue.getProject().getName() + "~issue" + issue.getNumber()
+ + "@" + systemAddress.getDomain();
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String getReplyAddressForPullRequest(PullRequest request) {
+ MailSetting mailSetting = settingManager.getMailSetting();
+ if (mailSetting != null) {
+ EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());
+ return systemAddress.getPrefix() + "+" + request.getProject().getName() + "~pullrequest" + request.getNumber()
+ + "@" + systemAddress.getDomain();
+ } else {
+ return null;
+ }
+ }
+
+ private String readText(Project project, String attachmentGroup, Message message)
+ throws IOException, MessagingException {
+ Attachments attachments = new Attachments();
+ fillAttachments(project, attachmentGroup, message, attachments);
+ String text = readText(project, attachmentGroup, message, attachments);
+
+ attachments.identifiable.keySet().removeAll(attachments.referenced);
+ attachments.nonIdentifiable.addAll(attachments.identifiable.values());
+ if (!attachments.nonIdentifiable.isEmpty()) {
+ text += "\n\n---";
+ List<String> markdowns = new ArrayList<>();
+ for (Attachment attachment: attachments.nonIdentifiable)
+ markdowns.add(attachment.getMarkdown());
+ text += "\n" + Joiner.on(" &nbsp;&nbsp;&nbsp;&bull;&nbsp;&nbsp;&nbsp; ").join(markdowns);
+ }
+ return text;
+ }
+
+ private String readText(Project project, String attachmentGroup, Part part, Attachments attachments)
+ throws IOException, MessagingException {
+ if (part.getDisposition() == null) {
+ if (part.isMimeType("text/plain")) {
+ return part.getContent().toString();
+ } else if (part.isMimeType("text/html")) {
+ Document doc = Jsoup.parse(part.getContent().toString());
+ for (Element element: doc.getElementsByTag("img")) {
+ String src = element.attr("src");
+ if (src != null && src.startsWith("cid:")) {
+ String contentId = "<" + src.substring("cid:".length()) + ">";
+ attachments.referenced.add(contentId);
+ Attachment attachment = attachments.identifiable.get(contentId);
+ if (attachment != null)
+ element.attr("src", attachment.url);
+ }
+ }
+ return doc.html();
+ } else if (part.isMimeType("multipart/*")) {
+ Multipart multipart = (Multipart) part.getContent();
+ int count = multipart.getCount();
+ if (count != 0) {
+ boolean multipartAlt = new ContentType(multipart.getContentType()).match("multipart/alternative");
+ if (multipartAlt)
+ // alternatives appear in an order of increasing
+ // faithfulness to the original content. Customize as req'd.
+ return readText(project, attachmentGroup, multipart.getBodyPart(count - 1), attachments);
+ String result = "";
+ for (int i=0; i<count; i++)
+ result += readText(project, attachmentGroup, multipart.getBodyPart(i), attachments);
+ return result;
+ } else {
+ return "";
+ }
+ } else {
+ return "";
+ }
+ } else {
+ return "";
+ }
+ }
+
+ private void fillAttachments(Project project, String attachmentGroup, Part part, Attachments attachments)
+ throws IOException, MessagingException {
+ if (part.getDisposition() != null) {
+ String[] contentId = part.getHeader("Content-ID");
+ String fileName = MimeUtility.decodeText(part.getFileName());
+ String attachmentName = project.saveAttachment(attachmentGroup, fileName, part.getInputStream());
+ String attachmentUrl = project.getAttachmentUrlPath(attachmentGroup, attachmentName);
+ Attachment attachment;
+ if (part.isMimeType("image/*"))
+ attachment = new ImageAttachment(attachmentUrl, fileName);
+ else
+ attachment = new FileAttachment(attachmentUrl, fileName);
+ if (contentId != null && contentId.length != 0)
+ attachments.identifiable.put(contentId[0], attachment);
+ else
+ attachments.nonIdentifiable.add(attachment);
+ } else if (part.isMimeType("multipart/*")) {
+ Multipart multipart = (Multipart) part.getContent();
+ int count = multipart.getCount();
+ if (count != 0) {
+ boolean multipartAlt = new ContentType(multipart.getContentType()).match("multipart/alternative");
+ if (multipartAlt)
+ // alternatives appear in an order of increasing
+ // faithfulness to the original content. Customize as req'd.
+ fillAttachments(project, attachmentGroup, multipart.getBodyPart(count - 1), attachments);
+ for (int i=0; i<count; i++)
+ fillAttachments(project, attachmentGroup, multipart.getBodyPart(i), attachments);
+ }
+ }
+ }
+
+ private static class Attachments {
+
+ final Map<String, Attachment> identifiable = new LinkedHashMap<>();
+
+ final Collection<Attachment> nonIdentifiable = new ArrayList<>();
+
+ final Collection<String> referenced = new HashSet<>();
+
+ }
+
+ private static abstract class Attachment {
+
+ final String url;
+
+ final String fileName;
+
+ public Attachment(String url, String fileName) {
+ this.url = url;
+ this.fileName = fileName;
+ }
+
+ public abstract String getMarkdown();
+
+ }
+
+ private static class ImageAttachment extends Attachment {
+
+ public ImageAttachment(String url, String fileName) {
+ super(url, fileName);
+ }
+
+ @Override
+ public String getMarkdown() {
+ return String.format("![%s](%s)", fileName, url);
+ }
+
+ }
+
+ private static class FileAttachment extends Attachment {
+
+ public FileAttachment(String url, String fileName) {
+ super(url, fileName);
+ }
+
+ @Override
+ public String getMarkdown() {
+ return String.format("[%s](%s)", fileName, url);
+ }
+
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/InboxMonitor.java b/server-core/src/main/java/io/onedev/server/notification/InboxMonitor.java
new file mode 100644
index 0000000000..89351be8f2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/notification/InboxMonitor.java
@@ -0,0 +1,9 @@
+package io.onedev.server.notification;
+
+public interface InboxMonitor {
+
+ void stop();
+
+ void waitForFinish() throws InterruptedException;
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index 3ad7e877e1..f4d0136018 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -1,5 +1,6 @@
package io.onedev.server.notification;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
@@ -10,6 +11,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.Listen;
@@ -47,8 +49,6 @@ public class IssueNotificationManager extends AbstractNotificationManager {
private final UrlManager urlManager;
- private final MarkdownManager markdownManager;
-
private final IssueWatchManager issueWatchManager;
private final UserManager userManager;
@@ -61,9 +61,9 @@ public class IssueNotificationManager extends AbstractNotificationManager {
public IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,
UrlManager urlManager, IssueWatchManager issueWatchManager, UserInfoManager userInfoManager,
UserManager userManager, SettingManager settingManager) {
+ super(markdownManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
- this.markdownManager = markdownManager;
this.issueWatchManager = issueWatchManager;
this.userInfoManager = userInfoManager;
this.userManager = userManager;
@@ -146,6 +146,10 @@ public class IssueNotificationManager extends AbstractNotificationManager {
Map<String, Group> newGroups = event.getNewGroups();
Map<String, Collection<User>> newUsers = event.getNewUsers();
+ String replyAddress = mailManager.getReplyAddressForIssue(issue);
+ String threadingReferences = issue.getThreadingReference();
+ if (threadingReferences == null)
+ threadingReferences = issue.getUUID() + "@onedev";
for (Map.Entry<String, Group> entry: newGroups.entrySet()) {
String subject = String.format("You are now \"%s\" of issue %s", entry.getKey(), issue.getNumberAndTitle());
Set<String> emails = entry.getValue().getMembers()
@@ -153,7 +157,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
.filter(it->!it.equals(user))
.map(it->it.getEmail())
.collect(Collectors.toSet());
- mailManager.sendMailAsync(emails, subject, getHtmlBody(event, url), getTextBody(event, url));
+ mailManager.sendMailAsync(emails, Lists.newArrayList(), subject, getHtmlBody(event, url), getTextBody(event, url),
+ replyAddress, threadingReferences);
for (User member: entry.getValue().getMembers())
issueWatchManager.watch(issue, member, true);
@@ -167,13 +172,15 @@ public class IssueNotificationManager extends AbstractNotificationManager {
.filter(it->!it.equals(user))
.map(it->it.getEmail())
.collect(Collectors.toSet());
- mailManager.sendMailAsync(emails, subject, getHtmlBody(event, url), getTextBody(event, url));
+ mailManager.sendMailAsync(emails, Lists.newArrayList(), subject, getHtmlBody(event, url), getTextBody(event, url),
+ replyAddress, threadingReferences);
for (User each: entry.getValue())
issueWatchManager.watch(issue, each, true);
notifiedUsers.addAll(entry.getValue());
}
+ Collection<User> mentionedUsers = new HashSet<>();
if (event instanceof MarkdownAware) {
MarkdownAware markdownAware = (MarkdownAware) event;
String markdown = markdownAware.getMarkdown();
@@ -182,13 +189,9 @@ public class IssueNotificationManager extends AbstractNotificationManager {
for (String userName: new MentionParser().parseMentions(rendered)) {
User mentionedUser = userManager.findByName(userName);
- if (mentionedUser != null) {
- String subject = String.format("You are mentioned in issue %s", issue.getNumberAndTitle());
- mailManager.sendMailAsync(Sets.newHashSet(mentionedUser.getEmail()),
- subject, getHtmlBody(event, url), getTextBody(event, url));
-
+ if (mentionedUser != null && notifiedUsers.add(mentionedUser)) {
issueWatchManager.watch(issue, mentionedUser, true);
- notifiedUsers.add(mentionedUser);
+ mentionedUsers.add(mentionedUser);
}
}
}
@@ -207,27 +210,35 @@ public class IssueNotificationManager extends AbstractNotificationManager {
notifyWatchers = true;
}
- if (notifyWatchers) {
- Collection<User> usersToNotify = new HashSet<>();
+ if (!mentionedUsers.isEmpty() || notifyWatchers) {
+ Collection<User> ccUsers = new HashSet<>();
+ Collection<String> notifiedEmailAddresses;
+ if (event instanceof IssueCommented)
+ notifiedEmailAddresses = ((IssueCommented) event).getNotifiedEmailAddresses();
+ else
+ notifiedEmailAddresses = new ArrayList<>();
for (IssueWatch watch: issue.getWatches()) {
Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
if (watch.isWatching()
&& (visitDate == null || visitDate.before(event.getDate()))
- && !notifiedUsers.contains(watch.getUser())) {
- usersToNotify.add(watch.getUser());
+ && !notifiedUsers.contains(watch.getUser())
+ && !notifiedEmailAddresses.stream().anyMatch(watch.getUser().getEmails()::contains)) {
+ ccUsers.add(watch.getUser());
}
}
- if (!usersToNotify.isEmpty()) {
+ if (!mentionedUsers.isEmpty() || !ccUsers.isEmpty()) {
String subject;
if (user != null)
subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));
else
subject = event.getActivity(true);
- mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()),
- subject, getHtmlBody(event, url), getTextBody(event, url));
+ mailManager.sendMailAsync(
+ mentionedUsers.stream().map(User::getEmail).collect(Collectors.toList()),
+ ccUsers.stream().map(User::getEmail).collect(Collectors.toList()),
+ subject, getHtmlBody(event, url), getTextBody(event, url), replyAddress, threadingReferences);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/MailManager.java b/server-core/src/main/java/io/onedev/server/notification/MailManager.java
index 3dbe070f1b..28476ffb88 100644
--- a/server-core/src/main/java/io/onedev/server/notification/MailManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/MailManager.java
@@ -2,15 +2,32 @@ package io.onedev.server.notification;
import java.util.Collection;
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.administration.MailSetting;
public interface MailManager {
- void sendMail(Collection<String> toList, String subject, String htmlBody, String textBody);
+ public static final String TEST_SUB_ADDRESSING = "test-sub-addressing";
+
+ void sendMail(Collection<String> toList, Collection<String> ccList, String subject,
+ String htmlBody, String textBody, @Nullable String replyAddress, @Nullable String references);
+
+ void sendMail(MailSetting mailSetting, Collection<String> toList, Collection<String> ccList,
+ String subject, String htmlBody, String textBody, @Nullable String replyAddress,
+ @Nullable String references);
+
+ void sendMailAsync(Collection<String> toList, Collection<String> ccList, String subject,
+ String htmlBody, String textBody, @Nullable String replyAddress, @Nullable String references);
+
+ @Nullable
+ String getReplyAddressForIssue(Issue issue);
- void sendMail(MailSetting mailSetting, Collection<String> toList, String subject,
- String htmlBody, String textBody);
+ @Nullable
+ String getReplyAddressForPullRequest(PullRequest request);
- void sendMailAsync(Collection<String> toList, String subject, String htmlBody, String textBody);
+ InboxMonitor monitorInbox(MailSetting mailSetting, MessageListener listener);
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/MessageListener.java b/server-core/src/main/java/io/onedev/server/notification/MessageListener.java
new file mode 100644
index 0000000000..3b7c7a3ab4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/notification/MessageListener.java
@@ -0,0 +1,9 @@
+package io.onedev.server.notification;
+
+import javax.mail.Message;
+
+public interface MessageListener {
+
+ void onReceived(Message message);
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index 00521757dc..3a4956065b 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -1,5 +1,6 @@
package io.onedev.server.notification;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
@@ -19,15 +20,15 @@ import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;
-import io.onedev.server.event.pullrequest.PullRequestCommentCreated;
+import io.onedev.server.event.pullrequest.PullRequestCommented;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.event.pullrequest.PullRequestUpdated;
-import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestAssignment;
@@ -57,8 +58,6 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
private final UrlManager urlManager;
- private final MarkdownManager markdownManager;
-
private final PullRequestWatchManager pullRequestWatchManager;
private final UserInfoManager userInfoManager;
@@ -71,9 +70,9 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
public PullRequestNotificationManager(MailManager mailManager, UrlManager urlManager,
MarkdownManager markdownManager, PullRequestWatchManager pullRequestWatchManager,
UserInfoManager userInfoManager, UserManager userManager, SettingManager settingManager) {
+ super(markdownManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
- this.markdownManager = markdownManager;
this.pullRequestWatchManager = pullRequestWatchManager;
this.userInfoManager = userInfoManager;
this.userManager = userManager;
@@ -87,8 +86,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
User user = event.getUser();
String url;
- if (event instanceof PullRequestCommentCreated)
- url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());
+ if (event instanceof PullRequestCommented)
+ url = urlManager.urlFor(((PullRequestCommented)event).getComment());
else if (event instanceof PullRequestChangeEvent)
url = urlManager.urlFor(((PullRequestChangeEvent)event).getChange());
else if (event instanceof PullRequestCodeCommentCreated)
@@ -180,6 +179,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
}
+ String replyAddress = mailManager.getReplyAddressForPullRequest(request);
+ String threadingReferences = getThreadingReferences(request);
if (event instanceof PullRequestChangeEvent
&& request.getSubmitter() != null
&& !notifiedUsers.contains(request.getSubmitter())) {
@@ -194,11 +195,13 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
subject = String.format(user.getDisplayName() + " discarded pull request %s", request.getNumberAndTitle());
if (subject != null) {
mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()),
- subject, getHtmlBody(event, url), getTextBody(event, url));
+ Lists.newArrayList(), subject, getHtmlBody(event, url), getTextBody(event, url),
+ replyAddress, threadingReferences);
notifiedUsers.add(request.getSubmitter());
}
}
+ Collection<User> mentionedUsers = new HashSet<>();
if (event instanceof MarkdownAware) {
MarkdownAware markdownAware = (MarkdownAware) event;
String markdown = markdownAware.getMarkdown();
@@ -207,14 +210,9 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
for (String userName: new MentionParser().parseMentions(rendered)) {
User mentionedUser = userManager.findByName(userName);
- if (mentionedUser != null) {
+ if (mentionedUser != null && notifiedUsers.add(mentionedUser)) {
pullRequestWatchManager.watch(request, mentionedUser, true);
-
- String subject = String.format("You are mentioned in pull request %s", request.getNumberAndTitle());
- mailManager.sendMailAsync(Sets.newHashSet(mentionedUser.getEmail()),
- subject, getHtmlBody(event, url), getTextBody(event, url));
-
- notifiedUsers.add(mentionedUser);
+ mentionedUsers.add(mentionedUser);
}
}
}
@@ -234,20 +232,26 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
notifyWatchers = true;
}
- if (notifyWatchers) {
- Collection<User> usersToNotify = new HashSet<>();
+ if (!mentionedUsers.isEmpty() || notifyWatchers) {
+ Collection<User> ccUsers = new HashSet<>();
+ Collection<String> notifiedEmailAddresses;
+ if (event instanceof PullRequestCommented)
+ notifiedEmailAddresses = ((PullRequestCommented) event).getNotifiedEmailAddresses();
+ else
+ notifiedEmailAddresses = new ArrayList<>();
for (PullRequestWatch watch: request.getWatches()) {
Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);
if (watch.isWatching()
&& (visitDate == null || visitDate.before(event.getDate()))
&& (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))
- && !notifiedUsers.contains(watch.getUser())) {
- usersToNotify.add(watch.getUser());
+ && !notifiedUsers.contains(watch.getUser())
+ && !notifiedEmailAddresses.stream().anyMatch(watch.getUser().getEmails()::contains)) {
+ ccUsers.add(watch.getUser());
}
}
- if (!usersToNotify.isEmpty()) {
+ if (!mentionedUsers.isEmpty() || !ccUsers.isEmpty()) {
String subject;
if (user != null)
subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));
@@ -256,12 +260,18 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
else
subject = event.getActivity(true);
- mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()),
- subject, getHtmlBody(event, url), getTextBody(event, url));
+ mailManager.sendMailAsync(
+ mentionedUsers.stream().map(User::getEmail).collect(Collectors.toList()),
+ ccUsers.stream().map(User::getEmail).collect(Collectors.toList()),
+ subject, getHtmlBody(event, url), getTextBody(event, url), replyAddress, threadingReferences);
}
}
}
-
+
+ private String getThreadingReferences(PullRequest request) {
+ return request.getUUID() + "@onedev";
+ }
+
@Transactional
@Listen
public void on(EntityPersisted event) {
@@ -273,8 +283,10 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
pullRequestWatchManager.watch(request, review.getUser(), true);
String url = urlManager.urlFor(request);
String subject = String.format("You are invited to review pull request %s", request.getNumberAndTitle());
- mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()),
- subject, getHtmlBody(event, url), getTextBody(event, url));
+ String replyAddress = mailManager.getReplyAddressForPullRequest(request);
+ mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()), Lists.newArrayList(),
+ subject, getHtmlBody(event, url), getTextBody(event, url), replyAddress,
+ getThreadingReferences(request));
}
} else if (event.getEntity() instanceof PullRequestAssignment) {
PullRequestAssignment assignment = (PullRequestAssignment) event.getEntity();
@@ -284,8 +296,10 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
String url = urlManager.urlFor(request);
String subject = String.format("You are assigned and expected to merge pull request %s",
request.getNumberAndTitle());
- mailManager.sendMailAsync(Lists.newArrayList(assignment.getUser().getEmail()),
- subject, getHtmlBody(event, url), getTextBody(event, url));
+ String replyAddress = mailManager.getReplyAddressForPullRequest(request);
+ mailManager.sendMailAsync(Lists.newArrayList(assignment.getUser().getEmail()), Lists.newArrayList(),
+ subject, getHtmlBody(event, url), getTextBody(event, url), replyAddress,
+ getThreadingReferences(request));
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 69dfb88d82..c9d9892db7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -120,7 +120,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
else if (!value.contains("#"))
value = project.getName() + "#" + value;
}
- Issue issue = OneDev.getInstance(IssueManager.class).find(value);
+ Issue issue = OneDev.getInstance(IssueManager.class).findByFQN(value);
if (issue != null)
return issue;
else
@@ -134,7 +134,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
else if (!value.contains("#"))
value = project.getName() + "#" + value;
}
- PullRequest pullRequest = OneDev.getInstance(PullRequestManager.class).find(value);
+ PullRequest pullRequest = OneDev.getInstance(PullRequestManager.class).findByFQN(value);
if (pullRequest != null)
return pullRequest;
else
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
index 470b028023..f748739728 100644
--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java
@@ -108,6 +108,8 @@ public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {
try {
String userName = (String) token.getPrincipal();
User user = userManager.findByName(userName);
+ if (user == null)
+ user = userManager.findByEmail(userName);
if (user == null) {
Authenticator authenticator = settingManager.getAuthenticator();
if (authenticator != null) {
diff --git a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java
index 4afdf53cf5..45bad65caa 100644
--- a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java
+++ b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java
@@ -13,6 +13,6 @@ public interface AttachmentStorageManager {
* directory to store attachment of specified project and group. The directory may not exist
* if there is no any attachment saved
*/
- File getAttachmentGroupDir(Project project, String attachmentGroup);
+ File getGroupDir(Project project, String group);
}
diff --git a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java
index e973ded868..f107da165f 100644
--- a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java
+++ b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java
@@ -4,8 +4,8 @@ import io.onedev.server.model.Project;
public interface AttachmentStorageSupport {
- Project getAttachmentProject();
+ Project getProject();
- String getAttachmentGroup();
+ String getGroup();
}
diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java
index ae02202be5..2c7ed2ce23 100644
--- a/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java
+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java
@@ -57,32 +57,32 @@ public class DefaultAttachmentStorageManager implements AttachmentStorageManager
}
@Override
- public File getAttachmentGroupDir(Project project, String attachmentGroup) {
- File attachmentBaseDir = storageManager.getProjectAttachmentDir(project.getId());
- File attachmentGroupDir = getPermanentAttachmentGroupDir(attachmentBaseDir, attachmentGroup);
- if (attachmentGroupDir.exists())
- return attachmentGroupDir;
+ public File getGroupDir(Project project, String group) {
+ File baseDir = storageManager.getProjectAttachmentDir(project.getId());
+ File groupDir = getPermanentGroupDir(baseDir, group);
+ if (groupDir.exists())
+ return groupDir;
else
- return new File(attachmentBaseDir, TEMP + "/" + attachmentGroup);
+ return new File(baseDir, TEMP + "/" + group);
}
- private File getPermanentAttachmentGroupDir(File attachmentBase, String attachmentGroup) {
- String prefix = attachmentGroup.substring(0, 2);
- return new File(attachmentBase, PERMANENT + "/" + prefix + "/" + attachmentGroup);
+ private File getPermanentGroupDir(File base, String group) {
+ String prefix = group.substring(0, 2);
+ return new File(base, PERMANENT + "/" + prefix + "/" + group);
}
- private void permanentizeAttachmentGroup(File attachmentBase, String attachmentGroup) {
- File permanentAttachmentStorage = getPermanentAttachmentGroupDir(attachmentBase, attachmentGroup);
- if (!permanentAttachmentStorage.exists()) {
- File tempAttachmentStorage = new File(attachmentBase, TEMP + "/" + attachmentGroup);
- if (tempAttachmentStorage.exists()) {
+ private void permanentizeGroup(File base, String group) {
+ File permanentStorage = getPermanentGroupDir(base, group);
+ if (!permanentStorage.exists()) {
+ File tempStorage = new File(base, TEMP + "/" + group);
+ if (tempStorage.exists()) {
try {
- FileUtils.moveDirectory(tempAttachmentStorage, permanentAttachmentStorage);
+ FileUtils.moveDirectory(tempStorage, permanentStorage);
} catch (IOException e) {
throw new RuntimeException(e);
}
} else {
- FileUtils.createDir(permanentAttachmentStorage);
+ FileUtils.createDir(permanentStorage);
}
}
}
@@ -128,13 +128,13 @@ public class DefaultAttachmentStorageManager implements AttachmentStorageManager
public void on(EntityPersisted event) {
if (event.isNew() && event.getEntity() instanceof AttachmentStorageSupport) {
AttachmentStorageSupport storageSupport = (AttachmentStorageSupport) event.getEntity();
- File attachmentBase = storageManager.getProjectAttachmentDir(storageSupport.getAttachmentProject().getId());
- String attachmentGroup = storageSupport.getAttachmentGroup();
+ File base = storageManager.getProjectAttachmentDir(storageSupport.getProject().getId());
+ String group = storageSupport.getGroup();
transactionManager.runAfterCommit(new Runnable() {
@Override
public void run() {
- permanentizeAttachmentGroup(attachmentBase, attachmentGroup);
+ permanentizeGroup(base, group);
}
});
@@ -146,8 +146,8 @@ public class DefaultAttachmentStorageManager implements AttachmentStorageManager
public void on(EntityRemoved event) {
if (event.getEntity() instanceof AttachmentStorageSupport) {
AttachmentStorageSupport storageSupport = (AttachmentStorageSupport) event.getEntity();
- File attachmentStorage = getPermanentAttachmentGroupDir(
- storageManager.getProjectAttachmentDir(storageSupport.getAttachmentProject().getId()), storageSupport.getAttachmentGroup());
+ File attachmentStorage = getPermanentGroupDir(
+ storageManager.getProjectAttachmentDir(storageSupport.getProject().getId()), storageSupport.getGroup());
transactionManager.runAfterCommit(new Runnable() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/util/EmailAddress.java b/server-core/src/main/java/io/onedev/server/util/EmailAddress.java
new file mode 100644
index 0000000000..cf7dc53b21
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/EmailAddress.java
@@ -0,0 +1,39 @@
+package io.onedev.server.util;
+
+import java.io.Serializable;
+
+import io.onedev.commons.utils.StringUtils;
+
+public class EmailAddress implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String prefix;
+
+ private final String domain;
+
+ public EmailAddress(String prefix, String domain) {
+ this.prefix = prefix;
+ this.domain = domain;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public String getDomain() {
+ return domain;
+ }
+
+ public static EmailAddress parse(String emailAddress) {
+ String prefix = StringUtils.substringBefore(emailAddress, "@");
+ String domain = StringUtils.substringAfter(emailAddress, "@");
+ return new EmailAddress(prefix, domain);
+ }
+
+ @Override
+ public String toString() {
+ return prefix + "@" + domain;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
index 6c16fdb47e..db1de36282 100644
--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
@@ -17,7 +17,6 @@ import com.google.common.collect.Lists;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
@@ -45,7 +44,7 @@ public class IssueUtils {
ISSUE_FIX_PATTERN = Pattern.compile(builder.toString());
}
- private static final String FIELD_BEAN_PREFIX = "IssueFieldBean";
+ private static final String FIELD_BEAN_CLASS = "IssueFieldBean";
public static void clearFields(Serializable fieldBean) {
for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(fieldBean.getClass()).getProperties().values()) {
@@ -55,21 +54,18 @@ public class IssueUtils {
}
@SuppressWarnings("unchecked")
- public static Class<? extends Serializable> defineFieldBeanClass(Project project) {
- String className = FIELD_BEAN_PREFIX + project.getId();
+ public static Class<? extends Serializable> defineFieldBeanClass() {
GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
- return (Class<? extends Serializable>) FieldSpec.defineClass(className, "Issue Fields", issueSetting.getFieldSpecs());
+ return (Class<? extends Serializable>) FieldSpec.defineClass(FIELD_BEAN_CLASS,
+ "Issue Fields", issueSetting.getFieldSpecs());
}
@Nullable
public static Class<? extends Serializable> loadFieldBeanClass(String className) {
- if (className.startsWith(FIELD_BEAN_PREFIX)) {
- Long projectId = Long.parseLong(className.substring(FIELD_BEAN_PREFIX.length()));
- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);
- return defineFieldBeanClass(project);
- } else {
+ if (className.equals(FIELD_BEAN_CLASS))
+ return defineFieldBeanClass();
+ else
return null;
- }
}
public static Collection<String> getPropertyNames(Project project, Class<?> fieldBeanClass, Collection<String> fieldNames) {
diff --git a/server-core/src/main/java/io/onedev/server/util/NameAndEmail.java b/server-core/src/main/java/io/onedev/server/util/NameAndEmail.java
index 531d2d7e74..972fb454ab 100644
--- a/server-core/src/main/java/io/onedev/server/util/NameAndEmail.java
+++ b/server-core/src/main/java/io/onedev/server/util/NameAndEmail.java
@@ -2,6 +2,8 @@ package io.onedev.server.util;
import java.io.Serializable;
+import javax.annotation.Nullable;
+
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.eclipse.jgit.lib.PersonIdent;
@@ -14,7 +16,7 @@ public class NameAndEmail implements Comparable<NameAndEmail>, Serializable {
private final String emailAddress;
- public NameAndEmail(String name, String emailAddress) {
+ public NameAndEmail(@Nullable String name, String emailAddress) {
this.name = name;
this.emailAddress = emailAddress;
}
@@ -27,10 +29,12 @@ public class NameAndEmail implements Comparable<NameAndEmail>, Serializable {
return new PersonIdent(name, emailAddress);
}
+ @Nullable
public String getName() {
return name;
}
+ @Nullable
public String getEmailAddress() {
return emailAddress;
}
@@ -55,7 +59,10 @@ public class NameAndEmail implements Comparable<NameAndEmail>, Serializable {
@Override
public int compareTo(NameAndEmail nameAndEmail) {
- return name.compareTo(nameAndEmail.name);
+ if (name != null && nameAndEmail.name != null)
+ return name.compareTo(nameAndEmail.name);
+ else
+ return emailAddress.compareTo(nameAndEmail.emailAddress);
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
index f6442d60f5..58c53350c9 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
@@ -26,13 +26,17 @@ public class BuildProcessor extends ReferenceParser implements MarkdownProcessor
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
- CharSequence url = RequestCycle.get().urlFor(
- BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable));
- Build build = OneDev.getInstance(BuildManager.class).find(referenceable);
- if (build != null && build.getVersion() != null)
- referenceText += " (" + HtmlEscape.escapeHtml5(build.getVersion()) + ")";
- return String.format("<a href='%s' class='build reference' data-reference='%s'>%s</a>",
- url, referenceable.toString(), referenceText);
+ if (RequestCycle.get() != null) {
+ CharSequence url = RequestCycle.get().urlFor(
+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable));
+ Build build = OneDev.getInstance(BuildManager.class).find(referenceable);
+ if (build != null && build.getVersion() != null)
+ referenceText += " (" + HtmlEscape.escapeHtml5(build.getVersion()) + ")";
+ return String.format("<a href='%s' class='build reference' data-reference='%s'>%s</a>",
+ url, referenceable.toString(), referenceText);
+ } else {
+ return super.toHtml(referenceable, referenceText);
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java
index bfa71fea0e..d853f4d771 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java
@@ -26,40 +26,38 @@ public class CommitProcessor implements MarkdownProcessor {
private static final Pattern PATTERN_COMMIT = Pattern.compile("(^|\\s)([a-z0-9]{40})($|\\s)");
- protected String toHtml(Project project, ObjectId commitId) {
- CharSequence url = RequestCycle.get().urlFor(
- CommitDetailPage.class, CommitDetailPage.paramsOf(project, commitId.name()));
- return String.format("<a href='%s' class='commit reference' data-reference='%s'>%s</a>", url, commitId.name(),
- GitUtils.abbreviateSHA(commitId.name()));
- }
-
@Override
public void process(Document rendered, @Nullable Project project, Object context) {
- TextNodeVisitor visitor = new TextNodeVisitor() {
+ if (RequestCycle.get() != null) {
+ TextNodeVisitor visitor = new TextNodeVisitor() {
+
+ @Override
+ protected boolean isApplicable(TextNode node) {
+ return !HtmlUtils.hasAncestor(node, IGNORED_TAGS);
+ }
+ };
- @Override
- protected boolean isApplicable(TextNode node) {
- return !HtmlUtils.hasAncestor(node, IGNORED_TAGS);
- }
- };
-
- NodeTraversor tranversor = new NodeTraversor(visitor);
- tranversor.traverse(rendered);
-
- for (TextNode node : visitor.getMatchedNodes()) {
- Matcher matcher = PATTERN_COMMIT.matcher(node.getWholeText());
- while (matcher.find()) {
- String commitHash = matcher.group(2);
- String commitTag;
- ObjectId commitId = ObjectId.fromString(commitHash);
- if (project.getRevCommit(commitId, false) != null) {
- commitTag = toHtml(project, commitId);
- } else {
- commitTag = commitId.name();
+ NodeTraversor tranversor = new NodeTraversor(visitor);
+ tranversor.traverse(rendered);
+
+ for (TextNode node : visitor.getMatchedNodes()) {
+ Matcher matcher = PATTERN_COMMIT.matcher(node.getWholeText());
+ while (matcher.find()) {
+ String commitHash = matcher.group(2);
+ String commitTag;
+ ObjectId commitId = ObjectId.fromString(commitHash);
+ if (project.getRevCommit(commitId, false) != null) {
+ CharSequence url = RequestCycle.get().urlFor(
+ CommitDetailPage.class, CommitDetailPage.paramsOf(project, commitId.name()));
+ commitTag = String.format("<a href='%s' class='commit reference' data-reference='%s'>%s</a>", url, commitId.name(),
+ GitUtils.abbreviateSHA(commitId.name()));
+ } else {
+ commitTag = commitId.name();
+ }
+ HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + commitTag + matcher.group(3));
}
- HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + commitTag + matcher.group(3));
+ HtmlUtils.appendTail(matcher, node);
}
- HtmlUtils.appendTail(matcher, node);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java b/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java
index 379208446b..56bda2f655 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java
@@ -11,6 +11,7 @@ import javax.inject.Singleton;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
import com.vladsch.flexmark.Extension;
import com.vladsch.flexmark.ast.Node;
@@ -27,17 +28,23 @@ import com.vladsch.flexmark.util.options.MutableDataHolder;
import com.vladsch.flexmark.util.options.MutableDataSet;
import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
+import io.onedev.server.web.resource.AttachmentResource;
@Singleton
public class DefaultMarkdownManager implements MarkdownManager {
+ private final SettingManager settingManager;
+
private final Set<Extension> contributedExtensions;
private final Set<MarkdownProcessor> htmlTransformers;
@Inject
- public DefaultMarkdownManager(Set<Extension> contributedExtensions, Set<MarkdownProcessor> htmlTransformers) {
+ public DefaultMarkdownManager(SettingManager settingManager, Set<Extension> contributedExtensions,
+ Set<MarkdownProcessor> htmlTransformers) {
+ this.settingManager = settingManager;
this.contributedExtensions = contributedExtensions;
this.htmlTransformers = htmlTransformers;
}
@@ -70,7 +77,7 @@ public class DefaultMarkdownManager implements MarkdownManager {
public String render(String markdown) {
MutableDataHolder options = setupOptions();
Node node = parse(markdown);
- return HtmlRenderer.builder(options).build().render(node);
+ return HtmlRenderer.builder(options).softBreak("<br>").build().render(node);
}
@Override
@@ -81,16 +88,35 @@ public class DefaultMarkdownManager implements MarkdownManager {
}
@Override
- public Document process(Document document, @Nullable Project project, @Nullable Object context) {
+ public Document process(Document document, @Nullable Project project, @Nullable Object context, boolean forExternal) {
document = HtmlUtils.sanitize(document);
for (MarkdownProcessor htmlTransformer: htmlTransformers)
htmlTransformer.process(document, project, context);
+
+ if (forExternal) {
+ for (Element element: document.body().getElementsByTag("img")) {
+ String src = element.attr("src");
+ if (src.startsWith("/")) {
+ src = settingManager.getSystemSetting().getServerUrl() + src;
+ element.attr("src", AttachmentResource.authorizeGroup(src));
+ }
+ element.attr("width", "100%");
+ }
+ for (Element element: document.body().getElementsByTag("a")) {
+ String href = element.attr("href");
+ if (href.startsWith("/")) {
+ href = settingManager.getSystemSetting().getServerUrl() + href;
+ element.attr("href", AttachmentResource.authorizeGroup(href));
+ }
+ }
+ }
+
return document;
}
-
+
@Override
- public String process(String html, Project project, Object context) {
- return process(HtmlUtils.parse(html), project, context).body().html();
+ public String process(String html, Project project, Object context, boolean forExternal) {
+ return process(HtmlUtils.parse(html), project, context, forExternal).body().html();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
index f6d7fce6ed..7f77de7918 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
@@ -23,10 +23,14 @@ public class IssueProcessor extends ReferenceParser implements MarkdownProcessor
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
- CharSequence url = RequestCycle.get().urlFor(
- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(referenceable));
- return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",
- url, referenceable.toString(), referenceText);
+ if (RequestCycle.get() != null) {
+ CharSequence url = RequestCycle.get().urlFor(
+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(referenceable));
+ return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",
+ url, referenceable.toString(), referenceText);
+ } else {
+ return super.toHtml(referenceable, referenceText);
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.java b/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.java
index 7566e2a17f..1d0b209bc2 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.java
@@ -23,9 +23,9 @@ public interface MarkdownManager {
Node parse(String markdown);
- Document process(Document document, @Nullable Project project, @Nullable Object context);
+ Document process(Document document, @Nullable Project project, @Nullable Object context, boolean forExternal);
- String process(String html, @Nullable Project project, @Nullable Object context);
+ String process(String html, @Nullable Project project, @Nullable Object context, boolean forExternal);
/**
* Escape html characters in specified markdown so that the markdown plain text
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
index 7c9e9ff1eb..ecdceefc1e 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
@@ -23,10 +23,14 @@ public class PullRequestProcessor extends ReferenceParser implements MarkdownPro
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
- CharSequence url = RequestCycle.get().urlFor(
- PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(referenceable));
- return String.format("<a href='%s' class='pull-request reference' data-reference='%s'>%s</a>",
- url, referenceable.toString(), referenceText);
+ if (RequestCycle.get() != null) {
+ CharSequence url = RequestCycle.get().urlFor(
+ PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(referenceable));
+ return String.format("<a href='%s' class='pull-request reference' data-reference='%s'>%s</a>",
+ url, referenceable.toString(), referenceText);
+ } else {
+ return super.toHtml(referenceable, referenceText);
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java
index 1adc0908dc..3bc90319cf 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java
@@ -30,7 +30,7 @@ public class UrlProcessor implements MarkdownProcessor {
@Override
public void process(Document rendered, Project project, Object context) {
- if (context instanceof BlobRenderContext && project != null) {
+ if (RequestCycle.get() != null && context instanceof BlobRenderContext && project != null) {
BlobRenderContext blobRenderContext = (BlobRenderContext) context;
Repository repository = project.getRepository();
RevCommit commit;
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
index ac855e59cd..f68281d020 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
@@ -5,6 +5,7 @@ import java.util.regex.Pattern;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
+import io.onedev.server.notification.MailManager;
import io.onedev.server.util.validation.annotation.ProjectName;
public class ProjectNameValidator implements ConstraintValidator<ProjectName, String> {
@@ -32,7 +33,7 @@ public class ProjectNameValidator implements ConstraintValidator<ProjectName, St
}
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
- } else if (value.equals("new") || value.equals("import")) {
+ } else if (value.equals("new") || value.equals("import") || value.equals(MailManager.TEST_SUB_ADDRESSING)) {
constraintContext.disableDefaultConstraintViolation();
String message = this.message;
if (message.length() == 0)
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
index d250012e8b..ada0f4ca8c 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
@@ -1,16 +1,19 @@
package io.onedev.server.util.validation;
+import java.util.concurrent.Callable;
import java.util.regex.Pattern;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.persistence.SessionManager;
import io.onedev.server.util.validation.annotation.UserName;
public class UserNameValidator implements ConstraintValidator<UserName, String> {
- public static final Pattern PATTERN = Pattern.compile("\\w([\\w-\\.]*\\w)?");
+ private static final Pattern PATTERN = Pattern.compile("\\w([\\w-\\.]*\\w)?");
private String message;
@@ -45,4 +48,28 @@ public class UserNameValidator implements ConstraintValidator<UserName, String>
}
}
+ public static String suggestUserName(String preferredUserName) {
+ return OneDev.getInstance(SessionManager.class).call(new Callable<String>() {
+
+ @Override
+ public String call() throws Exception {
+ String normalizedUserName = preferredUserName.replaceAll("[^\\w-\\.]", "-");
+ int suffix = 1;
+ UserManager userManager = OneDev.getInstance(UserManager.class);
+ while (true) {
+ String suggestedUserName = normalizedUserName;
+ if (suffix > 1)
+ suggestedUserName += suffix;
+ if (!suggestedUserName.equals("new")
+ && !suggestedUserName.equals(OneDev.NAME)
+ && userManager.findByName(suggestedUserName) == null) {
+ return suggestedUserName;
+ }
+ suffix++;
+ }
+ }
+
+ });
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index cf0e7766f8..b9374128ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -161,13 +161,21 @@ public class OneUrlMapper extends CompoundRequestMapper {
private void addResources() {
add(new BaseResourceMapper("downloads/server-log", new ServerLogResourceReference()));
- add(new BaseResourceMapper("downloads/projects/${project}/builds/${build}/log", new BuildLogResourceReference()));
- add(new BaseResourceMapper("projects/${project}/archive/${revision}", new ArchiveResourceReference()));
- add(new DynamicPathResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobResourceReference()));
- add(new BaseResourceMapper("projects/${project}/attachment/${uuid}/${attachment}", new AttachmentResourceReference()));
+ add(new BaseResourceMapper("downloads/projects/${project}/builds/${build}/log",
+ new BuildLogResourceReference()));
+ add(new BaseResourceMapper("projects/${project}/archive/${revision}",
+ new ArchiveResourceReference()));
+ add(new DynamicPathResourceMapper("projects/${project}/raw/${revision}/${path}",
+ new RawBlobResourceReference()));
+
+ // Change AttachmentResource.authorizeGroup accordingly if change attachment url here
+ add(new BaseResourceMapper("projects/${project}/attachment/${group}/${attachment}",
+ new AttachmentResourceReference()));
+
add(new DynamicPathResourceMapper("downloads/projects/${project}/builds/${build}/artifacts/${path}",
new ArtifactResourceReference()));
- add(new BaseResourceMapper(SvgSpriteResourceReference.DEFAULT_MOUNT_PATH, new SvgSpriteResourceReference(IconScope.class)));
+ add(new BaseResourceMapper(SvgSpriteResourceReference.DEFAULT_MOUNT_PATH,
+ new SvgSpriteResourceReference(IconScope.class)));
}
private void addErrorPages() {
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/joblogentry/JobLogEntryResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/joblogentry/JobLogEntryResourceReference.java
new file mode 100644
index 0000000000..915dca3b22
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/joblogentry/JobLogEntryResourceReference.java
@@ -0,0 +1,30 @@
+package io.onedev.server.web.asset.joblogentry;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import io.onedev.server.web.asset.moment.MomentResourceReference;
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+
+public class JobLogEntryResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public JobLogEntryResourceReference() {
+ super(JobLogEntryResourceReference.class, "job-log-entry.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new MomentResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ JobLogEntryResourceReference.class, "job-log-entry.css")));
+ return dependencies;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/joblogentry/job-log-entry.css b/server-core/src/main/java/io/onedev/server/web/asset/joblogentry/job-log-entry.css
new file mode 100644
index 0000000000..b802104b18
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/joblogentry/job-log-entry.css
@@ -0,0 +1,114 @@
+.log-entry>.font-weight-bold {
+ font-weight: 600 !important;
+}
+
+.log-entry>.fg-fg-default {
+ color: var(--dark);
+}
+.log-entry>.fg-bg-default {
+ color: white;
+}
+.log-entry>.fg-30 {
+ color: black;
+}
+.log-entry>.fg-31 {
+ color: red;
+}
+.log-entry>.fg-32 {
+ color: green;
+}
+.log-entry>.fg-33 {
+ color: orange;
+}
+.log-entry>.fg-34 {
+ color: blue;
+}
+.log-entry>.fg-35 {
+ color: darkmagenta;
+}
+.log-entry>.fg-36 {
+ color: darkturquoise;
+}
+.log-entry>.fg-37 {
+ color: white;
+}
+.log-entry>.fg-90 {
+ color: black;
+}
+.log-entry>.fg-91 {
+ color: red;
+}
+.log-entry>.fg-92 {
+ color: green;
+}
+.log-entry>.fg-93 {
+ color: orange;
+}
+.log-entry>.fg-94 {
+ color: blue;
+}
+.log-entry>.fg-95 {
+ color: darkmagenta;
+}
+.log-entry>.fg-96 {
+ color: darkturquoise;
+}
+.log-entry>.fg-97 {
+ color: white;
+}
+
+.log-entry>.bg-fg-default {
+ background-color: var(--dark);
+}
+.log-entry>.bg-bg-default {
+ background-color: white;
+}
+.log-entry>.bg-40 {
+ background-color: black;
+}
+.log-entry>.bg-41 {
+ background-color: red;
+}
+.log-entry>.bg-42 {
+ background-color: green;
+}
+.log-entry>.bg-43 {
+ background-color: orange;
+}
+.log-entry>.bg-44 {
+ background-color: blue;
+}
+.log-entry>.bg-45 {
+ background-color: darkmagenta;
+}
+.log-entry>.bg-46 {
+ background-color: darkturquoise;
+}
+.log-entry>.bg-47 {
+ background-color: white;
+}
+.log-entry>.bg-100 {
+ background-color: black;
+}
+.log-entry>.bg-101 {
+ background-color: red;
+}
+.log-entry>.bg-102 {
+ background-color: green;
+}
+.log-entry>.bg-103 {
+ background-color: orange;
+}
+.log-entry>.bg-104 {
+ background-color: blue;
+}
+.log-entry>.bg-105 {
+ background-color: darkmagenta;
+}
+.log-entry>.bg-106 {
+ background-color: darkturquoise;
+}
+.log-entry>.bg-107 {
+ background-color: white;
+}
+
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/joblogentry/job-log-entry.js b/server-core/src/main/java/io/onedev/server/web/asset/joblogentry/job-log-entry.js
new file mode 100644
index 0000000000..56cf1d12c3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/joblogentry/job-log-entry.js
@@ -0,0 +1,25 @@
+onedev.server.jobLogEntry = {
+
+ render(logEntry, withDate) {
+ var $logEntry = $("<div class='log-entry'></div>");
+ if (withDate)
+ $logEntry.append("<span class='date mr-3'>" + moment(logEntry.date).format("HH:mm:ss") + "</span>");
+ for (var i=0; i<logEntry.messages.length; i++) {
+ var message = logEntry.messages[i];
+ var $message = $("<span class='message'></span>")
+ if (message.style.bold)
+ $message.addClass("font-weight-bold");
+ if ((message.style.color == "37" || message.style.color == "97")
+ && message.style.backgroundColor == "bg-default") {
+ $message.addClass("text-black");
+ } else {
+ $message.addClass("fg-" + message.style.color);
+ $message.addClass("bg-" + message.style.backgroundColor);
+ }
+ $message.text(message.text);
+ $logEntry.append($message);
+ }
+ return $logEntry;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java
index 6aecd04106..e97e249f44 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogResourceReference.java
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import io.onedev.server.web.asset.moment.MomentResourceReference;
+import io.onedev.server.web.asset.joblogentry.JobLogEntryResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -21,7 +21,7 @@ public class BuildLogResourceReference extends BaseDependentResourceReference {
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new MomentResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new JobLogEntryResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
BuildLogResourceReference.class, "build-log.css")));
return dependencies;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
index 0e16969eb0..8cc82740c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
@@ -6,117 +6,3 @@
bottom: 0;
}
-.log-entry>.font-weight-bold {
- font-weight: 600 !important;
-}
-
-.log-entry>.fg-fg-default {
- color: var(--dark);
-}
-.log-entry>.fg-bg-default {
- color: white;
-}
-.log-entry>.fg-30 {
- color: black;
-}
-.log-entry>.fg-31 {
- color: red;
-}
-.log-entry>.fg-32 {
- color: green;
-}
-.log-entry>.fg-33 {
- color: orange;
-}
-.log-entry>.fg-34 {
- color: blue;
-}
-.log-entry>.fg-35 {
- color: darkmagenta;
-}
-.log-entry>.fg-36 {
- color: darkturquoise;
-}
-.log-entry>.fg-37 {
- color: white;
-}
-.log-entry>.fg-90 {
- color: black;
-}
-.log-entry>.fg-91 {
- color: red;
-}
-.log-entry>.fg-92 {
- color: green;
-}
-.log-entry>.fg-93 {
- color: orange;
-}
-.log-entry>.fg-94 {
- color: blue;
-}
-.log-entry>.fg-95 {
- color: darkmagenta;
-}
-.log-entry>.fg-96 {
- color: darkturquoise;
-}
-.log-entry>.fg-97 {
- color: white;
-}
-
-.log-entry>.bg-fg-default {
- background-color: var(--dark);
-}
-.log-entry>.bg-bg-default {
- background-color: white;
-}
-.log-entry>.bg-40 {
- background-color: black;
-}
-.log-entry>.bg-41 {
- background-color: red;
-}
-.log-entry>.bg-42 {
- background-color: green;
-}
-.log-entry>.bg-43 {
- background-color: orange;
-}
-.log-entry>.bg-44 {
- background-color: blue;
-}
-.log-entry>.bg-45 {
- background-color: darkmagenta;
-}
-.log-entry>.bg-46 {
- background-color: darkturquoise;
-}
-.log-entry>.bg-47 {
- background-color: white;
-}
-.log-entry>.bg-100 {
- background-color: black;
-}
-.log-entry>.bg-101 {
- background-color: red;
-}
-.log-entry>.bg-102 {
- background-color: green;
-}
-.log-entry>.bg-103 {
- background-color: orange;
-}
-.log-entry>.bg-104 {
- background-color: blue;
-}
-.log-entry>.bg-105 {
- background-color: darkmagenta;
-}
-.log-entry>.bg-106 {
- background-color: darkturquoise;
-}
-.log-entry>.bg-107 {
- background-color: white;
-}
-
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js
index 5fa9520362..ec4bba924f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/build-log.js
@@ -2,28 +2,8 @@ onedev.server.buildLog = {
appendLogEntries: function(containerId, logEntries, maxNumOfEntries) {
var $buildLog = $("#" + containerId + ">.build-log");
- for (var i=0; i<logEntries.length; i++) {
- var logEntry = logEntries[i];
- var $logEntry = $("<div class='log-entry'></div>");
- $buildLog.append($logEntry);
- $logEntry.append("<span class='date mr-3'>" + moment(logEntry.date).format("HH:mm:ss") + "</span>");
- for (var j=0; j<logEntries[i].messages.length; j++) {
- var message = logEntries[i].messages[j];
- var $message = $("<span class='message'></span>")
- if (message.style.bold)
- $message.addClass("font-weight-bold");
- if ((message.style.color == "37" || message.style.color == "97")
- && message.style.backgroundColor == "bg-default") {
- $message.addClass("text-black");
- } else {
- $message.addClass("fg-" + message.style.color);
- $message.addClass("bg-" + message.style.backgroundColor);
- }
- $message.text(message.text);
- $logEntry.append($message);
- }
- $buildLog.append($logEntry);
- }
+ for (var i=0; i<logEntries.length; i++)
+ $buildLog.append(onedev.server.jobLogEntry.render(logEntries[i], true));
var $entries = $buildLog.children(".log-entry");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
index d3260674f0..655092585f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.commit.status;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import javax.annotation.Nullable;
@@ -145,8 +146,11 @@ public abstract class CommitStatusPanel extends Panel {
add(statusLink);
}
- private Collection<String> getWebSocketObservables() {
- return Sets.newHashSet("commit-status:" + getProject().getId() + ":" + commitId.name());
+ protected Collection<String> getWebSocketObservables() {
+ if (!jobsModel.getObject().isEmpty())
+ return Sets.newHashSet("commit-status:" + getProject().getId() + ":" + commitId.name());
+ else
+ return new HashSet<>();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 62a53105fd..f8b049e98e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -79,7 +79,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
super.onInitialize();
Issue issue = newIssue();
- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass(getProject());
+ Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();
Serializable fieldBean = issue.getFieldBean(fieldBeanClass, true);
Collection<String> fieldNames = getIssueSetting().getPromptFieldsUponIssueOpen();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index 68c225821f..218d188c8f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -178,7 +178,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {
});
builtInFieldsBean = new BuiltInFieldsBean();
- Class<? extends Serializable> fieldBeanClass = IssueUtils.defineFieldBeanClass(getProject());
+ Class<? extends Serializable> fieldBeanClass = IssueUtils.defineFieldBeanClass();
Issue issue = new Issue();
issue.setProject(getProject());
if (getIssueQuery() != null && getIssueQuery().getCriteria() != null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index af2dda0184..0d60fd60a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -117,7 +117,7 @@ public abstract class IssueOperationsPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
activeTransitionLinkRef.set(this);
Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueOperationsPanel.this);
- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass(getIssue().getProject());
+ Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();
Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);
Form<?> form = new Form<Void>("form") {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 60fe3bc496..9940cd53ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -230,7 +230,7 @@ public abstract class IssueSidePanel extends Panel {
Fragment fragment = new Fragment("fields", "fieldsEditFrag", IssueSidePanel.this);
Form<?> form = new Form<Void>("form");
- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass(getProject());
+ Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();
Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);
Collection<String> propertyNames = IssueUtils.getPropertyNames(getIssue().getProject(),
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
index 49bf158e1a..7a13f87e98 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
@@ -237,7 +237,7 @@ abstract class InsertUrlPanel extends Panel {
String referenceUrl = urlFor(ProjectBlobPage.class,
ProjectBlobPage.paramsOf(context.getProject(), blobIdent)).toString();
String relativized = PathUtils.relativize(baseUrl, referenceUrl);
- markdownEditor.insertUrl(target, isImage, relativized, UrlUtils.describe(blobIdent.getName()), null);
+ markdownEditor.insertUrl(target, isImage, relativized, blobIdent.getName(), null);
onClose(target);
}
@@ -292,8 +292,7 @@ abstract class InsertUrlPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- String displayName = UrlUtils.describe(attachmentName);
- markdownEditor.insertUrl(target, true, attachmentUrl, displayName, null);
+ markdownEditor.insertUrl(target, true, attachmentUrl, attachmentName, null);
onClose(target);
}
@@ -346,8 +345,7 @@ abstract class InsertUrlPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- String displayName = UrlUtils.describe(attachmentName);
- markdownEditor.insertUrl(target, false, attachmentUrl, displayName, null);
+ markdownEditor.insertUrl(target, false, attachmentUrl, attachmentName, null);
onClose(target);
}
@@ -409,7 +407,7 @@ abstract class InsertUrlPanel extends Panel {
throw new RuntimeException(e);
}
markdownEditor.insertUrl(target, isImage,
- attachmentSupport.getAttachmentUrlPath(attachmentName), UrlUtils.describe(attachmentName), null);
+ attachmentSupport.getAttachmentUrlPath(attachmentName), attachmentName, null);
onClose(target);
}
@@ -554,7 +552,7 @@ abstract class InsertUrlPanel extends Panel {
url = directory + "/" + UrlUtils.encodePath(fileName);
else
url = UrlUtils.encodePath(fileName);
- markdownEditor.insertUrl(target, isImage, url, UrlUtils.describe(fileName), null);
+ markdownEditor.insertUrl(target, isImage, url, fileName, null);
onClose(target);
} catch (GitException e) {
form.error(e.getMessage());
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index a0d3c015e5..0a8a737f73 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -149,7 +149,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
project = null;
MarkdownManager manager = OneDev.getInstance(MarkdownManager.class);
- return manager.process(manager.render(markdown), project, blobRenderContext);
+ return manager.process(manager.render(markdown), project, blobRenderContext, false);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index e83fbbc600..f58ff3f6df 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -83,7 +83,7 @@ public class MarkdownViewer extends GenericPanel<String> {
if (getPage() instanceof ProjectPage)
project = ((ProjectPage) getPage()).getProject();
MarkdownManager manager = AppLoader.getInstance(MarkdownManager.class);
- return manager.process(manager.render(markdown), project, getRenderContext());
+ return manager.process(manager.render(markdown), project, getRenderContext(), false);
} else {
return null;
}
@@ -165,7 +165,7 @@ public class MarkdownViewer extends GenericPanel<String> {
String referenceId = params.getParameterValue(REFERENCE_ID).toString();
switch (referenceType) {
case "issue":
- Issue issue = OneDev.getInstance(IssueManager.class).find(referenceId);
+ Issue issue = OneDev.getInstance(IssueManager.class).findByFQN(referenceId);
// check permission here as issue project may not be the same as current project
if (issue != null && SecurityUtils.canAccess(issue.getProject())) {
String color = OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpec(issue.getState()).getColor();
@@ -176,7 +176,7 @@ public class MarkdownViewer extends GenericPanel<String> {
}
break;
case "pull request":
- PullRequest request = OneDev.getInstance(PullRequestManager.class).find(referenceId);
+ PullRequest request = OneDev.getInstance(PullRequestManager.class).findByFQN(referenceId);
// check permission here as target project may not be the same as current project
if (request != null && SecurityUtils.canReadCode(request.getTargetProject())) {
String statusCss;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java
index 5770b79bff..c6553c364c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/confirm/ContentPanel.java
@@ -14,7 +14,6 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.unbescape.javascript.JavaScriptEscape;
-import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.web.component.link.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
@@ -53,12 +52,7 @@ abstract class ContentPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- try {
- onConfirm(target);
- } catch (ExplicitException e) {
- error(e.getMessage());
- target.add(ContentPanel.this);
- }
+ onConfirm(target);
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
index 863c947a41..b0a0bb6171 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
@@ -33,6 +33,8 @@ import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.job.log.JobLogEntry;
+import io.onedev.server.buildspec.job.log.JobLogEntryEx;
import io.onedev.server.buildspec.job.log.StyleBuilder;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
@@ -80,8 +82,8 @@ public abstract class TaskButton extends AjaxButton {
String title = getTitle().toLowerCase();
ExecutorService executorService = OneDev.getInstance(ExecutorService.class);
- List<String> messages = new ArrayList<>();
- messages.add("Please wait...");
+ List<JobLogEntryEx> messages = new ArrayList<>();
+ messages.add(new JobLogEntryEx(new JobLogEntry(new Date(), "Please wait...")));
TaskFuture future = getTaskFutures().put(path, new TaskFuture(executorService.submit(new Callable<String>() {
@Override
@@ -95,7 +97,7 @@ public abstract class TaskButton extends AjaxButton {
@Override
public void log(String message, StyleBuilder styleBuilder) {
synchronized (messages) {
- messages.add(message);
+ messages.add(JobLogEntryEx.parse(message, styleBuilder));
}
}
@@ -153,10 +155,10 @@ public abstract class TaskButton extends AjaxButton {
}
@Override
- protected List<String> getMessages() {
+ protected List<JobLogEntryEx> getLogEntries() {
TaskFuture future = getTaskFutures().get(path);
if (future != null)
- return future.getMessages();
+ return future.getLogEntries();
else
return new ArrayList<>();
}
@@ -242,13 +244,13 @@ public abstract class TaskButton extends AjaxButton {
private final Future<String> wrapped;
- private final List<String> messages;
+ private final List<JobLogEntryEx> logEntries;
private volatile Date lastActive = new Date();
- public TaskFuture(Future<String> wrapped, List<String> messages) {
+ public TaskFuture(Future<String> wrapped, List<JobLogEntryEx> logEntries) {
this.wrapped = wrapped;
- this.messages = messages;
+ this.logEntries = logEntries;
}
@Override
@@ -281,11 +283,11 @@ public abstract class TaskButton extends AjaxButton {
return get(timeout, unit);
}
- public List<String> getMessages() {
+ public List<JobLogEntryEx> getLogEntries() {
lastActive = new Date();
- synchronized (messages) {
- List<String> copy = new ArrayList<>(messages);
- messages.clear();
+ synchronized (logEntries) {
+ List<JobLogEntryEx> copy = new ArrayList<>(logEntries);
+ logEntries.clear();
return copy;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html
index aed7d26fdf..6596cf1fdc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html
@@ -5,7 +5,7 @@
<button wicket:id="closeIcon" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
</div>
<div class="modal-body">
- <div class="messages"></div>
+ <pre class="task-log text-break"></pre>
<div wicket:id="result" class="result"></div>
</div>
<div class="modal-footer justify-content-center">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java
index 2e2d36722a..235e2df899 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.job.log.JobLogEntryEx;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
@SuppressWarnings("serial")
@@ -115,7 +116,7 @@ abstract class TaskFeedbackPanel extends Panel {
private String getData() {
Map<String, Object> data = new HashMap<>();
- data.put("messages", getMessages());
+ data.put("logEntries", getLogEntries());
data.put("finished", getResult() != null);
try {
@@ -145,7 +146,7 @@ abstract class TaskFeedbackPanel extends Panel {
protected abstract void onClose(AjaxRequestTarget target);
- protected abstract List<String> getMessages();
+ protected abstract List<JobLogEntryEx> getLogEntries();
@Nullable
protected abstract String getResult();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackResourceReference.java
index fa3ac3fb07..01f81a675a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackResourceReference.java
@@ -4,7 +4,9 @@ import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import io.onedev.server.web.asset.joblogentry.JobLogEntryResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -19,6 +21,7 @@ public class TaskFeedbackResourceReference extends BaseDependentResourceReferenc
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new JobLogEntryResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
TaskFeedbackResourceReference.class, "task-feedback.css")));
return dependencies;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css
index 462bdc597a..6f35772e33 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css
@@ -1,10 +1,7 @@
-.task-feedback .messages {
- background: white;
- border: none;
+.task-feedback .task-log {
padding: 0;
max-height: 480px;
overflow: auto;
- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
font-size: 0.9rem;
}
.task-feedback .alert {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.js b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.js
index 8c4b00f73e..7246e7a582 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.js
@@ -1,25 +1,22 @@
onedev.server.taskFeedback = {
processData: function(containerId, callback, data) {
- const maxMessages = 2000;
+ const maxLogEntries = 2000;
- var $messages = $("#" + containerId).find(".messages");
- for (const message of data.messages) {
- var $message = $("<div class='message'></div>");
- $message.text(message);
- $messages.append($message);
- }
+ var $logEntries = $("#" + containerId).find(".task-log");
+ for (const logEntry of data.logEntries)
+ $logEntries.append(onedev.server.jobLogEntry.render(logEntry, false));
- const $children = $messages.children();
- const numOfMessagesToRemove = $children.length - maxMessages;
- if (numOfMessagesToRemove > 0)
- $children.filter(":lt(" + numOfMessagesToRemove + ")").remove();
+ const $children = $logEntries.children();
+ const numOfLogEntriesToRemove = $children.length - maxLogEntries;
+ if (numOfLogEntriesToRemove > 0)
+ $children.filter(":lt(" + numOfLogEntriesToRemove + ")").remove();
- if (data.messages.length != 0)
- $messages.scrollTop($messages[0].scrollHeight);
+ if (data.logEntries.length != 0)
+ $logEntries.scrollTop($logEntries[0].scrollHeight);
if (!data.finished) {
setTimeout(function() {
- callback(data.lastMessageIndex);
+ callback();
}, 1000);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java
index ba14c52934..da1a9d792e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java
@@ -7,10 +7,12 @@ import java.util.Set;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.util.Path;
@@ -76,7 +78,10 @@ public class BeanPropertyEditor extends PropertyEditor<Serializable> {
@Override
protected void onUpdate(AjaxRequestTarget target) {
onPropertyUpdating(target);
- target.add(BeanPropertyEditor.this.get(BEAN_EDITOR_ID));
+ Component beanEditor = BeanPropertyEditor.this.get(BEAN_EDITOR_ID);
+ target.add(beanEditor);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('property-defined');",
+ BeanPropertyEditor.this.getMarkupId()));
}
}));
@@ -88,7 +93,20 @@ public class BeanPropertyEditor extends PropertyEditor<Serializable> {
if (getDescriptor().isPropertyRequired() && propertyValue == null) {
propertyValue = newProperty();
}
+
add(newBeanEditor(propertyValue));
+
+ add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (get(BEAN_EDITOR_ID).isVisible())
+ return "property-bean property-defined";
+ else
+ return "property-bean";
+ }
+
+ }));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
index d76ac9133e..7fc68e45f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -112,3 +112,8 @@
.property-editor .select2-container {
width: 100%;
}
+
+.property-editor.property-bean.property-defined + div + .form-text,
+.property-editor.property-polymorphic.property-defined + div + .form-text {
+ display: none;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java
index fae28a8658..0dd61d9650 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java
@@ -28,7 +28,6 @@ import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.SecretField;
@@ -90,7 +89,7 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {
private Serializable getDefaultFieldBean() {
if (defaultFieldBean == null) {
- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass(Project.get());
+ Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();
try {
defaultFieldBean = (Serializable) fieldBeanClass.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
index 1f0a372868..896d9725c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
@@ -166,7 +166,17 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
protected void onUpdate(AjaxRequestTarget target) {
onPropertyUpdating(target);
target.add(typeSelectorContainer.get("typeDescription"));
- target.add(get(BEAN_EDITOR_ID));
+
+ Component beanEditor = get(BEAN_EDITOR_ID);
+ target.add(beanEditor);
+
+ if (beanEditor instanceof BeanEditor) {
+ target.appendJavaScript(String.format("$('#%s').addClass('property-defined');",
+ PolymorphicPropertyEditor.this.getMarkupId()));
+ } else {
+ target.appendJavaScript(String.format("$('#%s').removeClass('property-defined');",
+ PolymorphicPropertyEditor.this.getMarkupId()));
+ }
}
});
@@ -207,6 +217,18 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
}.setOutputMarkupPlaceholderTag(true).setEscapeModelStrings(false));
add(newBeanEditor(getModelObject()));
+
+ add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (get(BEAN_EDITOR_ID) instanceof BeanEditor)
+ return "property-polymorphic property-defined";
+ else
+ return "property-polymorphic";
+ }
+
+ }));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationEditPanel.html
new file mode 100644
index 0000000000..95e7fc46da
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationEditPanel.html
@@ -0,0 +1,16 @@
+<wicket:panel>
+ <form wicket:id="form" class="sender-authorization-edit leave-confirm">
+ <div class="modal-header">
+ <h5 id="modal-title" class="modal-title">Sender Authorization</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
+ <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationEditPanel.java
new file mode 100644
index 0000000000..5178f44b8e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationEditPanel.java
@@ -0,0 +1,115 @@
+package io.onedev.server.web.editable.senderauthorization;
+
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.server.model.support.administration.SenderAuthorization;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+
+@SuppressWarnings("serial")
+abstract class SenderAuthorizationEditPanel extends Panel {
+
+ private final List<SenderAuthorization> authorizations;
+
+ private final int authorizationIndex;
+
+ public SenderAuthorizationEditPanel(String id, List<SenderAuthorization> authorizations, int authorizationIndex) {
+ super(id);
+
+ this.authorizations = authorizations;
+ this.authorizationIndex = authorizationIndex;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ SenderAuthorization authorization;
+ if (authorizationIndex != -1)
+ authorization = authorizations.get(authorizationIndex);
+ else
+ authorization = new SenderAuthorization();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new FencedFeedbackPanel("feedback", form));
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(SenderAuthorizationEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ BeanEditor editor = BeanContext.edit("editor", authorization);
+ form.add(editor);
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (editor.isValid()) {
+ if (authorizationIndex != -1) {
+ authorizations.set(authorizationIndex, authorization);
+ } else {
+ authorizations.add(authorization);
+ }
+ onSave(target);
+ } else {
+ target.add(form);
+ }
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(SenderAuthorizationEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationListEditPanel.html
new file mode 100644
index 0000000000..d229ece8d1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationListEditPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="sender-authorization-list">
+ <table wicket:id="authorizations" class="table-hover"></table>
+ <div class="foot">
+ <a wicket:id="addNew" title="Add new entry" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationListEditPanel.java
new file mode 100644
index 0000000000..a51acf2860
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationListEditPanel.java
@@ -0,0 +1,243 @@
+package io.onedev.server.web.editable.senderauthorization;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.model.support.administration.SenderAuthorization;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+
+@SuppressWarnings("serial")
+class SenderAuthorizationListEditPanel extends PropertyEditor<List<Serializable>> {
+
+ private final List<SenderAuthorization> authorizations;
+
+ public SenderAuthorizationListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ super(id, propertyDescriptor, model);
+
+ authorizations = new ArrayList<>();
+ for (Serializable each: model.getObject()) {
+ authorizations.add((SenderAuthorization) each);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new SenderAuthorizationEditPanel(id, authorizations, -1) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(SenderAuthorizationListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<SenderAuthorization, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem,
+ String componentId, IModel<SenderAuthorization> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("Sender Emails")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId,
+ IModel<SenderAuthorization> rowModel) {
+ SenderAuthorization authorization = rowModel.getObject();
+ if (authorization.getSenderEmails() != null)
+ cellItem.add(new Label(componentId, authorization.getSenderEmails()));
+ else
+ cellItem.add(new Label(componentId, "<i>Any sender</i>").setEscapeModelStrings(false));
+ }
+ });
+
+ columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("Authorized Projects")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId,
+ IModel<SenderAuthorization> rowModel) {
+ SenderAuthorization authorization = rowModel.getObject();
+ if (authorization.getAuthorizedProjects() != null)
+ cellItem.add(new Label(componentId, authorization.getAuthorizedProjects()));
+ else
+ cellItem.add(new Label(componentId, "<i>Any project</i>").setEscapeModelStrings(false));
+ }
+ });
+
+ columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("Default Project")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId,
+ IModel<SenderAuthorization> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getDefaultProject()));
+ }
+ });
+
+ columns.add(new AbstractColumn<SenderAuthorization, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<SenderAuthorization>> cellItem, String componentId,
+ IModel<SenderAuthorization> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", SenderAuthorizationListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new SenderAuthorizationEditPanel(id, authorizations, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(SenderAuthorizationListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ markFormDirty(target);
+ authorizations.remove(rowModel.getObject());
+ onPropertyUpdating(target);
+ target.add(SenderAuthorizationListEditPanel.this);
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "actions minimum";
+ }
+
+ });
+
+ IDataProvider<SenderAuthorization> dataProvider = new ListDataProvider<SenderAuthorization>() {
+
+ @Override
+ protected List<SenderAuthorization> getData() {
+ return authorizations;
+ }
+
+ };
+
+ DataTable<SenderAuthorization, Void> dataTable;
+ add(dataTable = new DataTable<SenderAuthorization, Void>("authorizations", columns, dataProvider, Integer.MAX_VALUE));
+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
+ dataTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(authorizations, fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(authorizations, fromIndex-i, fromIndex-i-1);
+ }
+ onPropertyUpdating(target);
+ target.add(SenderAuthorizationListEditPanel.this);
+ }
+
+ }.sortable("tbody"));
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PropertyUpdating) {
+ event.stop();
+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());
+ }
+ }
+
+ @Override
+ protected List<Serializable> convertInputToValue() throws ConversionException {
+ List<Serializable> value = new ArrayList<>();
+ for (SenderAuthorization each: authorizations)
+ value.add(each);
+ return value;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationListEditSupport.java
new file mode 100644
index 0000000000..627dd41418
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/senderauthorization/SenderAuthorizationListEditSupport.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.editable.senderauthorization;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.model.support.administration.SenderAuthorization;
+import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyViewer;
+
+@SuppressWarnings("serial")
+public class SenderAuthorizationListEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {
+ Class<?> elementClass = ReflectionUtils.getCollectionElementClass(descriptor.getPropertyGetter().getGenericReturnType());
+ if (elementClass == SenderAuthorization.class) {
+ return new PropertyContext<List<Serializable>>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {
+ return new SenderAuthorizationListEditPanel(componentId, descriptor, model);
+ }
+
+ };
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html
index 6ba932a861..a688fc4453 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html
@@ -4,7 +4,7 @@
<form wicket:id="mailSetting" class="leave-confirm">
<div wicket:id="editor" class="mb-4"></div>
<input wicket:id="save" type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Setting">
- <input wicket:id="sendingTestMail" type="submit" class="btn btn-light-primary" value="Send Test Mail">
+ <input wicket:id="test" type="submit" class="btn btn-light-primary" value="Send Test Mail">
</form>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
index d34f49add7..4677f559d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
@@ -1,7 +1,13 @@
package io.onedev.server.web.page.admin.mailsetting;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.mail.Message;
+
import org.apache.wicket.Component;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
@@ -9,13 +15,19 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
+import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.administration.MailSetting;
+import io.onedev.server.model.support.administration.ReceiveMailSetting;
+import io.onedev.server.notification.InboxMonitor;
import io.onedev.server.notification.MailManager;
+import io.onedev.server.notification.MessageListener;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.EmailAddress;
import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.component.taskbutton.TaskButton;
import io.onedev.server.web.editable.BeanContext;
@@ -50,7 +62,7 @@ public class MailSettingPage extends AdministrationPage {
}
};
- TaskButton testButton = new TaskButton("sendingTestMail") {
+ TaskButton testButton = new TaskButton("test") {
@Override
protected void onConfigure() {
@@ -59,21 +71,82 @@ public class MailSettingPage extends AdministrationPage {
BeanEditor mailSettingEditor = editor.visitChildren(BeanEditor.class, new IVisitor<BeanEditor, BeanEditor>() {
public void component(BeanEditor component, IVisit<BeanEditor> visit) {
- visit.stop(component);
+ if (component.getModelObject() instanceof MailSetting)
+ visit.stop(component);
}
});
setVisible(mailSettingEditor != null && mailSettingEditor.isVisibleInHierarchy());
}
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+
+ BeanEditor receiveMailSettingEditor = editor.visitChildren(BeanEditor.class, new IVisitor<BeanEditor, BeanEditor>() {
+
+ public void component(BeanEditor component, IVisit<BeanEditor> visit) {
+ if (component.getModelObject() instanceof ReceiveMailSetting)
+ visit.stop(component);
+ }
+
+ });
+ if (receiveMailSettingEditor != null && receiveMailSettingEditor.isVisibleInHierarchy())
+ tag.put("value", "Test Sending & Receiving Mail");
+ else
+ tag.put("value", "Test Sending Mail");
+ }
+
@Override
protected String runTask(SimpleLogger logger) {
User user = SecurityUtils.getUser();
- String body = "Great, your mail setting is working!";
- OneDev.getInstance(MailManager.class).sendMail(mailSettingHolder.getMailSetting(),
- Sets.newHashSet(user.getEmail()), "Test email from OneDev", body, body);
- return "Test mail has been sent to " + user.getEmail() + ", please check your mail box";
+ MailManager mailManager = OneDev.getInstance(MailManager.class);
+ MailSetting mailSetting = mailSettingHolder.getMailSetting();
+ if (mailSetting.getReceiveMailSetting() != null) {
+ String uuid = UUID.randomUUID().toString();
+ AtomicReference<InboxMonitor> monitor = new AtomicReference<>(null);
+ MessageListener listener = new MessageListener() {
+
+ @Override
+ public void onReceived(Message message) {
+ try {
+ if (message.getSubject().contains(uuid))
+ monitor.get().stop();
+ } catch (Exception e) {
+ logger.error("Error receiving message", e);
+ }
+ }
+
+ };
+ monitor.set(mailManager.monitorInbox(mailSetting, listener));
+
+ EmailAddress emailAddress = EmailAddress.parse(mailSetting.getEmailAddress());
+ String subAddressed = emailAddress.getPrefix() + "+"
+ + MailManager.TEST_SUB_ADDRESSING + "@" + emailAddress.getDomain();
+ logger.log("Sending test mail to " + subAddressed + "...");
+ mailManager.sendMail(mailSetting,
+ Sets.newHashSet(subAddressed), Lists.newArrayList(), uuid,
+ "A test mail", "A test mail", null, null);
+
+ logger.log("Waiting for test mail to come back...");
+
+ try {
+ monitor.get().waitForFinish();
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+
+ logger.log("Received test mail");
+
+ return "Great, your mail setting is working";
+ } else {
+ String body = "Great, your mail setting is working!";
+ mailManager.sendMail(mailSettingHolder.getMailSetting(),
+ Sets.newHashSet(user.getEmail()), Lists.newArrayList(), "Test email from OneDev",
+ body, body, null, null);
+ return "Test mail has been sent to " + user.getEmail() + ", please check your mail box";
+ }
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html
index 8d54e95cf2..ee21e91e3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html
@@ -13,7 +13,7 @@
<div wicket:id="editor"></div>
<div class="mt-5 d-flex">
<input class="btn btn-primary dirty-aware mr-1" value="Save" type="submit">
- <a wicket:id="delete" class="btn btn-danger ml-auto">Delete</a>
+ <a wicket:id="delete" class="btn btn-light-danger ml-auto">Delete</a>
</div>
</form>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 81c6f7663a..316244e784 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -227,8 +227,7 @@ public abstract class BasePage extends WebPage {
@Override
public void component(Component object, IVisit<Void> visit) {
- if (object.isVisibleInHierarchy())
- observers.addAll(object.getBehaviors(WebSocketObserver.class));
+ observers.addAll(object.getBehaviors(WebSocketObserver.class));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index 5bad70be52..cccc95b5e1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -88,7 +88,7 @@ onedev.server = {
}
onedev.server.form.dirtyChanged($form);
}
- $form.submit(function() {
+ $form.submit(function(e) {
$form.removeClass("dirty");
setTimeout(function() {
$form.removeClass("dirty");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index 6984ca4a8d..a92445d6e0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -67,7 +67,7 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
@Override
protected String renderMarkdown(String markdown) {
MarkdownManager manager = OneDev.getInstance(MarkdownManager.class);
- return manager.process(manager.render(markdown), context.getProject(), context);
+ return manager.process(manager.render(markdown), context.getProject(), context, false);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
index e082637239..898a9236a5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
@@ -34,7 +34,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {
protected void onInitialize() {
super.onInitialize();
- Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass(getIssue().getProject());
+ Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass();
Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);
Form<?> form = new Form<Void>("form");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html
index 1c2a9b2773..1b09f71a3e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html
@@ -2,7 +2,7 @@
<form wicket:id="form" method="post">
<div wicket:id="feedback"></div>
<div class="form-group">
- <input wicket:id="userName" autocomplete="username" type="text" class="form-control" placeholder="Login name">
+ <input wicket:id="userName" autocomplete="username" type="text" class="form-control" placeholder="Login name or email address">
</div>
<div class="form-group">
<input wicket:id="password" autocomplete="current-password" type="password" class="form-control" placeholder="Password">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
index 9165d526f3..630eaeba49 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
@@ -13,6 +13,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
@@ -90,8 +92,8 @@ public class PasswordResetPage extends SimplePage {
+ "%s",
user.getDisplayName(), user.getName(), serverUrl, password);
- mailManager.sendMail(settingManager.getMailSetting(), Arrays.asList(user.getEmail()),
- "Your OneDev password has been reset", htmlBody, textBody);
+ mailManager.sendMail(settingManager.getMailSetting(), Arrays.asList(user.getEmail()),
+ Lists.newArrayList(), "Your OneDev password has been reset", htmlBody, textBody, null, null);
return "Please check your email " + user.getEmail() + " for the reset password";
} else {
throw new ExplicitException("Unable to send password reset email as smtp setting is not defined");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
index ddd2a5538b..0b0ad9f0e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
@@ -14,6 +14,9 @@
.SimplePage.GeneralErrorPage .main {
width: 900px;
}
+.SimplePage.InUseErrorPage .main {
+ width: auto;
+}
.SimplePage .main .logo.icon {
color: var(--primary);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 795b443f3a..b47194918b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,3 +1,2 @@
<wicket:extend>
- <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index c331d117bb..066be5dd6a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.page.test;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -18,14 +17,6 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
-
- add(new Link<Void>("test") {
-
- @Override
- public void onClick() {
- }
-
- });
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java
index a6266e3920..6990226782 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java
@@ -4,11 +4,14 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import javax.persistence.EntityNotFoundException;
+import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.tika.io.IOUtils;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -16,7 +19,10 @@ import org.apache.wicket.request.resource.AbstractResource;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.security.CipherUtils;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.AttachmentStorageManager;
@@ -26,14 +32,16 @@ public class AttachmentResource extends AbstractResource {
private static final String PARAM_PROJECT = "project";
- private static final String PARAM_UUID = "uuid";
+ private static final String PARAM_GROUP = "group";
private static final String PARAM_ATTACHMENT = "attachment";
+ public static final String PARAM_AUTHORIZATION = "authorization";
+
@Override
protected ResourceResponse newResourceResponse(Attributes attributes) {
PageParameters params = attributes.getParameters();
-
+
String projectName = params.get(PARAM_PROJECT).toString();
if (StringUtils.isBlank(projectName))
throw new IllegalArgumentException("project name has to be specified");
@@ -43,18 +51,25 @@ public class AttachmentResource extends AbstractResource {
if (project == null)
throw new EntityNotFoundException("Unable to find project: " + projectName);
- if (!SecurityUtils.canReadCode(project))
- throw new UnauthorizedException();
-
- String uuid = params.get(PARAM_UUID).toString();
- if (StringUtils.isBlank(uuid))
- throw new IllegalArgumentException("uuid parameter has to be specified");
+ String group = params.get(PARAM_GROUP).toString();
+ if (StringUtils.isBlank(group))
+ throw new IllegalArgumentException("group parameter has to be specified");
+
+ String authorization = params.get(PARAM_AUTHORIZATION).toOptionalString();
+ if (authorization == null
+ || !new String(CipherUtils.decrypt(Base64.decodeBase64(authorization)), StandardCharsets.UTF_8).equals(group)) {
+ PullRequest request = OneDev.getInstance(PullRequestManager.class).findByUUID(group);
+ if (request != null && !SecurityUtils.canReadCode(project))
+ throw new UnauthorizedException();
+ else if (!SecurityUtils.canAccess(project))
+ throw new UnauthorizedException();
+ }
String attachment = params.get(PARAM_ATTACHMENT).toString();
if (StringUtils.isBlank(attachment))
throw new IllegalArgumentException("attachment parameter has to be specified");
- File attachmentFile = new File(getAttachmentDir(project, uuid), attachment);
+ File attachmentFile = new File(getGroupDir(project, group), attachment);
if (!attachmentFile.exists())
throw new RuntimeException("Attachment not found: " + attachment);
@@ -82,19 +97,35 @@ public class AttachmentResource extends AbstractResource {
return response;
}
- private static File getAttachmentDir(Project project, String uuid) {
- return OneDev.getInstance(AttachmentStorageManager.class).getAttachmentGroupDir(project, uuid);
+ private static File getGroupDir(Project project, String group) {
+ return OneDev.getInstance(AttachmentStorageManager.class).getGroupDir(project, group);
}
- public static PageParameters paramsOf(Project project, String attachmentStorageUUID, String attachmentName) {
+ public static PageParameters paramsOf(Project project, String group, String attachment) {
PageParameters params = new PageParameters();
params.set(PARAM_PROJECT, project.getName());
- params.set(PARAM_UUID, attachmentStorageUUID);
- params.set(PARAM_ATTACHMENT, attachmentName);
- final File attachmentFile = new File(getAttachmentDir(project, attachmentStorageUUID), attachmentName);
+ params.set(PARAM_GROUP, group);
+ params.set(PARAM_ATTACHMENT, attachment);
+
+ File attachmentFile = new File(getGroupDir(project, group), attachment);
params.set("v", attachmentFile.lastModified());
return params;
}
+
+ public static String authorizeGroup(String attachmentUrl) {
+ try {
+ URIBuilder builder = new URIBuilder(attachmentUrl);
+ if (builder.getPathSegments().size() >= 4) {
+ String group = builder.getPathSegments().get(3);
+ byte[] encrypted = CipherUtils.encrypt(group.getBytes(StandardCharsets.UTF_8));
+ String base64 = Base64.encodeBase64URLSafeString(encrypted);
+ builder.addParameter(PARAM_AUTHORIZATION, base64);
+ }
+ return builder.toString();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java b/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
index cc0a82af37..9db7256e01 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
@@ -60,7 +60,7 @@ public class ProjectAttachmentSupport implements AttachmentSupport {
}
private File getAttachmentDir() {
- return OneDev.getInstance(AttachmentStorageManager.class).getAttachmentGroupDir(getProject(), attachmentGroup);
+ return OneDev.getInstance(AttachmentStorageManager.class).getGroupDir(getProject(), attachmentGroup);
}
@Override
diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.java
index a96bf27a34..c8a93e0c98 100644
--- a/server-product/src/test/java/io/onedev/server/product/Test.java
+++ b/server-product/src/test/java/io/onedev/server/product/Test.java
@@ -1,9 +1,11 @@
package io.onedev.server.product;
+import java.util.concurrent.ExecutionException;
+
public class Test {
@org.junit.Test
- public void test() {
+ public void test() throws InterruptedException, ExecutionException {
}
}
\ No newline at end of file