Skip to content

The Unified and Autonomous Development Platform

Fix issue #366 - Issue and pull request notification email customization

Robin Shen6cb72f2c9329
diff --git a/pom.xml b/pom.xml
index 9737559cb3..fc6e55e7c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,7 +436,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
+ <artifactId>groovy-templates</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
diff --git a/server-core/pom.xml b/server-core/pom.xml
index 1c573d4c97..2893697f6f 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -154,7 +154,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
+ <artifactId>groovy-templates</artifactId>
</dependency>
<dependency>
<groupId>com.github.albfernandez</groupId>
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java
index baab4547dc..e934a8679f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java
@@ -3,6 +3,7 @@ package io.onedev.server.buildspec.job.action;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.OneDev;
+import io.onedev.server.event.build.BuildFinished;
import io.onedev.server.model.Build;
import io.onedev.server.notification.BuildNotificationManager;
import io.onedev.server.web.editable.annotation.Editable;
@@ -30,7 +31,7 @@ public class SendNotificationAction extends PostBuildAction {
public void execute(Build build) {
io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver parsedReceiver =
io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver.parse(getReceivers(), build);
- OneDev.getInstance(BuildNotificationManager.class).notify(build, parsedReceiver.getEmails());
+ OneDev.getInstance(BuildNotificationManager.class).notify(new BuildFinished(build), parsedReceiver.getEmails());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
index a5973717fc..4bedcea8e4 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
@@ -13,7 +13,7 @@ import io.onedev.k8shelper.Executable;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
-import io.onedev.server.web.editable.annotation.Code;
+import io.onedev.server.util.validation.annotation.Code;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
index 77bfb44260..43e009dc3b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
@@ -18,6 +18,7 @@ import io.onedev.server.model.support.administration.SshSetting;
import io.onedev.server.model.support.administration.SystemSetting;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
+import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.web.page.layout.ContributedAdministrationSetting;
@@ -113,6 +114,10 @@ public interface SettingManager extends EntityManager<Setting> {
void saveJobExecutors(List<JobExecutor> jobExecutors);
+ NotificationTemplateSetting getNotificationTemplateSetting();
+
+ void saveNotificationTemplateSetting(NotificationTemplateSetting notificationTemplateSetting);
+
List<GroovyScript> getGroovyScripts();
void saveGroovyScripts(List<GroovyScript> jobScripts);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
index 6ee15a8ed4..39e8e2dd39 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
@@ -38,7 +38,7 @@ public interface UrlManager {
String urlFor(CodeComment comment, @Nullable PullRequest request);
String urlFor(CodeCommentReply reply, @Nullable PullRequest request);
-
+
String cloneUrlFor(Project project, boolean ssh);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 3c5c5e2cb7..60605d629d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -30,6 +30,7 @@ import io.onedev.server.model.support.administration.SshSetting;
import io.onedev.server.model.support.administration.SystemSetting;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
+import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -57,6 +58,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
private volatile Long jobExecutorsId;
+ private volatile Long notificationTemplateSettingId;
+
private volatile Long jobScriptsId;
private volatile Long pullRequestSettingId;
@@ -271,6 +274,32 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
dao.persist(setting);
}
+ @Sessional
+ @Override
+ public NotificationTemplateSetting getNotificationTemplateSetting() {
+ Setting setting;
+ if (notificationTemplateSettingId == null) {
+ setting = getSetting(Key.NOTIFICATION_TEMPLATE_SETTING);
+ Preconditions.checkNotNull(setting);
+ notificationTemplateSettingId = setting.getId();
+ } else {
+ setting = load(notificationTemplateSettingId);
+ }
+ return (NotificationTemplateSetting) setting.getValue();
+ }
+
+ @Transactional
+ @Override
+ public void saveNotificationTemplateSetting(NotificationTemplateSetting notificationTemplateSetting) {
+ Setting setting = getSetting(Key.NOTIFICATION_TEMPLATE_SETTING);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.NOTIFICATION_TEMPLATE_SETTING);
+ }
+ setting.setValue((Serializable) notificationTemplateSetting);
+ dao.persist(setting);
+ }
+
@Sessional
@SuppressWarnings("unchecked")
@Override
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 c1a896e7a7..02e4982080 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
@@ -51,6 +51,7 @@ import io.onedev.server.model.support.administration.SecuritySetting;
import io.onedev.server.model.support.administration.SshSetting;
import io.onedev.server.model.support.administration.SystemSetting;
import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;
+import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
import io.onedev.server.notification.MailManager;
import io.onedev.server.persistence.PersistManager;
import io.onedev.server.persistence.annotation.Sessional;
@@ -222,6 +223,10 @@ public class DefaultDataManager implements DataManager, Serializable {
if (setting == null) {
settingManager.saveProjectSetting(new GlobalProjectSetting());
}
+ setting = settingManager.getSetting(Key.NOTIFICATION_TEMPLATE_SETTING);
+ if (setting == null) {
+ settingManager.saveNotificationTemplateSetting(new NotificationTemplateSetting());
+ }
setting = settingManager.getSetting(Key.CONTRIBUTED_SETTINGS);
if (setting == null)
diff --git a/server-core/src/main/java/io/onedev/server/model/Setting.java b/server-core/src/main/java/io/onedev/server/model/Setting.java
index 257a20113c..f2b225a5cc 100644
--- a/server-core/src/main/java/io/onedev/server/model/Setting.java
+++ b/server-core/src/main/java/io/onedev/server/model/Setting.java
@@ -21,7 +21,8 @@ public class Setting extends AbstractEntity {
private static final long serialVersionUID = 1L;
public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS,
- GROOVY_SCRIPTS, PULL_REQUEST, BUILD, PROJECT, SSH, SSO_CONNECTORS, CONTRIBUTED_SETTINGS};
+ GROOVY_SCRIPTS, PULL_REQUEST, BUILD, PROJECT, SSH, SSO_CONNECTORS,
+ NOTIFICATION_TEMPLATE_SETTING, CONTRIBUTED_SETTINGS};
@Column(nullable=false, unique=true)
private Key key;
diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.java
index 8380cafecf..3276874d80 100644
--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java
+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java
@@ -22,8 +22,8 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.security.CipherUtils;
import io.onedev.server.ssh.SshKeyUtils;
+import io.onedev.server.util.CryptoUtils;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
@@ -104,7 +104,7 @@ public class SshKey extends AbstractEntity implements Validatable {
public void digest() {
try {
PublicKey pubEntry = SshKeyUtils.decodeSshPublicKey(content);
- digest = KeyUtils.getFingerPrint(CipherUtils.DIGEST_FORMAT, pubEntry);
+ digest = KeyUtils.getFingerPrint(CryptoUtils.DIGEST_FORMAT, pubEntry);
} catch (IOException | GeneralSecurityException e) {
throw new RuntimeException(e);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java
index 4932edd544..07402750e6 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java
@@ -16,8 +16,8 @@ import io.onedev.server.util.script.identity.JobIdentity;
import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.util.script.identity.SiteAdministrator;
import io.onedev.server.util.usage.Usage;
+import io.onedev.server.util.validation.annotation.Code;
import io.onedev.server.util.validation.annotation.RegEx;
-import io.onedev.server.web.editable.annotation.Code;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.Patterns;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
new file mode 100644
index 0000000000..f46cfbdc11
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
@@ -0,0 +1,82 @@
+package io.onedev.server.model.support.administration.notificationtemplate;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.constraints.Size;
+
+import com.google.common.io.Resources;
+
+import io.onedev.server.util.validation.annotation.Code;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.OmitName;
+
+@Editable
+public class NotificationTemplateSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final List<String> DEFAULT_TEMPLATE;
+
+ public static final String PROP_ISSUE_NOTIFICATION_TEMPLATE = "issueNotificationTemplate";
+
+ public static final String PROP_PULL_REQUEST_NOTIFICATION_TEMPLATE = "pullRequestNotificationTemplate";
+
+ public static final String COMMON_HELP = "Notification template is a "
+ + "<a href='https://docs.groovy-lang.org/latest/html/api/groovy/text/SimpleTemplateEngine.html' target='_blank'>Groovy simple template</a>. "
+ + "When evaluating this template, below variables will be available:"
+ + "<ul class='mb-0'>"
+ + "<li><code>event:</code> <a href='https://code.onedev.io/projects/onedev-server/blob/main/server-core/src/main/java/io/onedev/server/event/Event.java' target='_blank'>event object</a> triggering the notification"
+ + "<li><code>eventBody:</code> string type representing body of the event, for instance, comment made by user"
+ + "<li><code>eventUrl:</code> string type representing event detail url"
+ + "<li><code>unsubscribable:</code> a non-null value indicates that the notification can be unsuscribed. Check <a href='https://code.onedev.io/projects/onedev-server/blob/main/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java' target='_blank'>document</a> for details";
+
+ static {
+ URL url = Resources.getResource(NotificationTemplateSetting.class, "default-notification-template.html");
+ try {
+ DEFAULT_TEMPLATE = Resources.readLines(url, StandardCharsets.UTF_8);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private List<String> issueNotificationTemplate = DEFAULT_TEMPLATE;
+
+ private List<String> pullRequestNotificationTemplate = DEFAULT_TEMPLATE;
+
+ @Editable(order=200)
+ @Code(language=Code.HTML_TEMPLATE)
+ @OmitName
+ @Size(min=1, message="May not be empty")
+ public List<String> getIssueNotificationTemplate() {
+ return issueNotificationTemplate;
+ }
+
+ public void setIssueNotificationTemplate(List<String> issueNotificationTemplate) {
+ this.issueNotificationTemplate = issueNotificationTemplate;
+ }
+
+ @Editable(order=300)
+ @Code(language=Code.HTML_TEMPLATE)
+ @OmitName
+ @Size(min=1, message="May not be empty")
+ public List<String> getPullRequestNotificationTemplate() {
+ return pullRequestNotificationTemplate;
+ }
+
+ public void setPullRequestNotificationTemplate(List<String> pullRequestNotificationTemplate) {
+ this.pullRequestNotificationTemplate = pullRequestNotificationTemplate;
+ }
+
+ public static String getTemplateHelp(Map<String, String> variableHelp) {
+ StringBuilder builder = new StringBuilder(COMMON_HELP);
+ for (Map.Entry<String, String> entry: variableHelp.entrySet())
+ builder.append("<li><code>" + entry.getKey() + ":</code> " + entry.getValue());
+ return builder.toString();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html
new file mode 100644
index 0000000000..d69866dc85
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html
@@ -0,0 +1,26 @@
+<%
+ if (eventBody != null) {
+ print eventBody
+ print "<br>"
+ }
+%>
+<div>Visit <a href='${eventUrl}'>${eventUrl}</a> for details</div>
+<%
+ if (unsubscribable != null) {
+ print """
+ <div style='border-top:1px solid #EEE; margin-top:1em; padding-top:1em; color:#666; font-size:0.9em;'>You received this as you
+ are participating or participated previously in this topic.
+ """
+ if (unsubscribable.getEmailAddress() != null) {
+ print """
+ Mail to <a href='mailto:${unsubscribable.emailAddress}?subject=Unsubscribe&body=I would like not to get any notifications from this topic'>this address</a> to unsubscribe
+ </div>
+ """
+ } else {
+ print """
+ To stop receiving notifications of this topic, please visit detail link above and unwatch it
+ </div>
+ """
+ }
+ }
+%>
\ 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 f7bfbcd1d4..5364084aef 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
@@ -1,58 +1,112 @@
package io.onedev.server.notification;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.annotation.Nullable;
+import org.codehaus.groovy.control.CompilationFailedException;
+
+import groovy.text.SimpleTemplateEngine;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.event.Event;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.issue.IssueEvent;
+import io.onedev.server.event.pullrequest.PullRequestEvent;
+import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequestAssignment;
+import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
import io.onedev.server.util.markdown.MarkdownManager;
public abstract class AbstractNotificationManager {
protected final MarkdownManager markdownManager;
- public AbstractNotificationManager(MarkdownManager markdownManager) {
+ protected final SettingManager settingManager;
+
+ public AbstractNotificationManager(MarkdownManager markdownManager, SettingManager settingManager) {
this.markdownManager = markdownManager;
+ this.settingManager = settingManager;
}
- protected String getHtmlBody(@Nullable Event event, String url) {
- String htmlBody = null;
+ protected String getHtmlBody(Event event, String url, @Nullable Unsubscribable unsubscribable) {
+ String eventBody = null;
if (event instanceof MarkdownAware) {
- String markdown = ((MarkdownAware) event).getMarkdown();
- if (markdown != null) {
+ eventBody = ((MarkdownAware) event).getMarkdown();
+ if (eventBody != 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(""
- + "%s"
- + "<br>"
- + "<br>"
- + "<div style='color:#888;font-size:0.9rem;'>Visit <a href='%s'>%s</a> for details</div>",
- html, url, url);
+ eventBody = markdownManager.process(markdownManager.render(eventBody), project, null, true);
+ }
+ }
+
+ String template = null;
+
+ Map<String, Object> bindings = new HashMap<>();
+
+ bindings.put("event", event);
+ bindings.put("eventBody", eventBody);
+ bindings.put("unsubscribable", unsubscribable);
+ bindings.put("eventUrl", url);
+
+ if (event instanceof IssueEvent) {
+ template = StringUtils.join(settingManager.getNotificationTemplateSetting().getIssueNotificationTemplate(), "\n");
+ bindings.put("issue", ((IssueEvent) event).getIssue());
+ } else if (event instanceof PullRequestEvent) {
+ template = StringUtils.join(settingManager.getNotificationTemplateSetting().getPullRequestNotificationTemplate(), "\n");
+ bindings.put("pullRequest", ((PullRequestEvent) event).getRequest());
+ } else if (event instanceof EntityPersisted) {
+ AbstractEntity entity = ((EntityPersisted) event).getEntity();
+ if (entity instanceof PullRequestReview) {
+ template = StringUtils.join(settingManager.getNotificationTemplateSetting().getPullRequestNotificationTemplate(), "\n");
+ bindings.put("pullRequest", ((PullRequestReview) entity).getRequest());
+ } else if (entity instanceof PullRequestAssignment) {
+ template = StringUtils.join(settingManager.getNotificationTemplateSetting().getPullRequestNotificationTemplate(), "\n");
+ bindings.put("pullRequest", ((PullRequestAssignment) entity).getRequest());
}
+ }
+ if (template == null)
+ template = StringUtils.join(NotificationTemplateSetting.DEFAULT_TEMPLATE, "\n");
+
+ try {
+ String htmlBody = new SimpleTemplateEngine().createTemplate(template).make(bindings).toString();
+ return htmlBody;
+ } catch (CompilationFailedException | ClassNotFoundException | IOException e) {
+ throw new RuntimeException(e);
}
- if (htmlBody == null)
- htmlBody = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- return htmlBody;
}
- protected String getTextBody(@Nullable Event event, String url) {
+ protected String getTextBody(Event event, String url, @Nullable Unsubscribable unsubscribable) {
String textBody = null;
if (event instanceof MarkdownAware) {
String markdown = ((MarkdownAware) event).getMarkdown();
if (markdown != null) {
textBody = String.format(""
+ "%s"
- + "\n\n"
- + "Visit %s for details",
+ + "\n"
+ + "Visit %s for details",
markdown, url);
}
}
if (textBody == null)
textBody = String.format("Visit %s for details", url);
+ if (unsubscribable != null) {
+ textBody += "\n\n---------------------------------------------\nYou received this as you "
+ + "are participating or participated previously in this topic. ";
+ if (unsubscribable.getEmailAddress() != null) {
+ textBody += String.format("Mail to %s with any content to unsubscribe",
+ unsubscribable.getEmailAddress());
+ } else {
+ textBody += "To stop receiving notifications of this topic, please visit detail link above and unwatch it";
+ }
+ }
return textBody;
}
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 fe9ba8cbf1..1e8783aba6 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
@@ -39,17 +39,14 @@ public class BuildNotificationManager extends AbstractNotificationManager {
private final UserManager userManager;
- private final SettingManager settingManager;
-
@Inject
public BuildNotificationManager(MailManager mailManager, UrlManager urlManager,
UserManager userManager, SettingManager settingManager,
MarkdownManager markdownManager) {
- super(markdownManager);
+ super(markdownManager, settingManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
this.userManager = userManager;
- this.settingManager = settingManager;
}
private void fillSubscribedQueryStrings(Map<User, Collection<String>> subscribedQueryStrings,
@@ -64,8 +61,9 @@ public class BuildNotificationManager extends AbstractNotificationManager {
}
}
- public void notify(Build build, Collection<String> emails) {
+ public void notify(BuildEvent event, Collection<String> emails) {
String subject;
+ Build build = event.getBuild();
if (build.getVersion() != null) {
subject = String.format("Build %s/%s/#%s (%s) is %s", build.getProject().getName(), build.getJobName(),
build.getNumber(), build.getVersion(), build.getStatus().getDisplayName().toLowerCase());
@@ -75,8 +73,10 @@ public class BuildNotificationManager extends AbstractNotificationManager {
}
String url = urlManager.urlFor(build);
String threadingReferences = build.getProject().getName() + "-build" + build.getNumber() + "@onedev";
- mailManager.sendMailAsync(Lists.newArrayList(), emails, subject, getHtmlBody(null, url),
- getTextBody(null, url), null, threadingReferences);
+ String htmlBody = getHtmlBody(event, url, null);
+ String textBody = getTextBody(event, url, null);
+ mailManager.sendMailAsync(Lists.newArrayList(), emails, subject, htmlBody,
+ textBody, null, threadingReferences);
}
@Sessional
@@ -147,7 +147,7 @@ public class BuildNotificationManager extends AbstractNotificationManager {
}
}
- notify(build, notifyEmails);
+ notify(event, notifyEmails);
}
-
+
}
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 81997f2c02..a7674f0344 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
@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.MarkdownAware;
@@ -29,8 +30,8 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
@Inject
public CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager,
- UrlManager urlManager, UserManager userManager) {
- super(markdownManager);
+ UrlManager urlManager, UserManager userManager, SettingManager settingManager) {
+ super(markdownManager, settingManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
this.userManager = userManager;
@@ -61,11 +62,11 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
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);
+ getHtmlBody(event, url, null), getTextBody(event, url, null), 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 540ce0be1b..7bd0ac12f6 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
@@ -17,6 +17,7 @@ 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;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.GitUtils;
@@ -25,7 +26,6 @@ import io.onedev.server.model.Project;
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.commit.CommitQuery;
import io.onedev.server.util.markdown.MarkdownManager;
@@ -39,8 +39,9 @@ public class CommitNotificationManager extends AbstractNotificationManager {
private final UrlManager urlManager;
@Inject
- public CommitNotificationManager(MarkdownManager markdownManager, MailManager mailManager, UrlManager urlManager) {
- super(markdownManager);
+ public CommitNotificationManager(MarkdownManager markdownManager, MailManager mailManager, UrlManager urlManager,
+ SettingManager settingManager) {
+ super(markdownManager, settingManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
}
@@ -101,22 +102,22 @@ public class CommitNotificationManager extends AbstractNotificationManager {
String branchName = GitUtils.ref2branch(event.getRefName());
if (branchName != null) {
- subject = String.format("[Branch %s] Commit %s: %s",
+ 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",
+ subject = String.format("[tag %s] Commit %s: %s",
tagName, GitUtils.abbreviateSHA(commit.name()), commit.getShortMessage());
} else {
- subject = String.format("[Ref %s] Commit %s: %s",
+ subject = String.format("[ref %s] Commit %s: %s",
event.getRefName(), GitUtils.abbreviateSHA(commit.name()), commit.getShortMessage());
}
}
String url = urlManager.urlFor(project, commit);
mailManager.sendMailAsync(Lists.newArrayList(), notifyEmails, subject,
- getHtmlBody(event, url), getTextBody(event, url), null, null);
+ getHtmlBody(event, url, null), getTextBody(event, url, null), 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 cf15a7395a..d7e6857dcc 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
@@ -14,6 +14,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
+import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.mail.Folder;
@@ -303,35 +304,70 @@ public class DefaultMailManager implements MailManager {
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, "~");
+ String remaining = StringUtils.substringAfter(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);
+ issueNumber = Long.valueOf(StringUtils.substringBefore(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);
+ if (remaining.contains("~")) {
+ User user = userManager.findByEmail(from.getAddress());
+ if (user != null) {
+ IssueWatch watch = issueWatchManager.find(issue, user);
+ if (watch != null) {
+ watch.setWatching(false);
+ issueWatchManager.save(watch);
+ String subject = "Unsubscribed successfully from issue " + issue.getFQN();
+ String body = "You will no longer receive notifications of issue " + issue.getFQN() + " unless mentioned. "
+ + "However if you subscribed to certain issue queries, you may still get notifications of newly "
+ + "created issues matching those queries. In this case, you will need to login to your account "
+ + "and unsubscribe those queries.";
+ sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), subject, body, body, null, getMessageId(message));
+ }
+ }
+ } else {
+ 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);
+ pullRequestNumber = Long.valueOf(StringUtils.substringBefore(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);
+
+ if (remaining.contains("~")) {
+ User user = userManager.findByEmail(from.getAddress());
+ if (user != null) {
+ PullRequestWatch watch = pullRequestWatchManager.find(pullRequest, user);
+ if (watch != null) {
+ watch.setWatching(false);
+ pullRequestWatchManager.save(watch);
+ String subject = "Unsubscribed successfully from pull request " + pullRequest.getFQN();
+ String body = "You will no longer receive notifications of pull request " + pullRequest.getFQN()
+ + " unless mentioned. However if you subscribed to certain pull request queries, you may still "
+ + "get notifications of newly submitted pull request matching those queries. In this case, you "
+ + "will need to login to your account and unsubscribe those queries.";
+ sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), subject, body, body, null, getMessageId(message));
+ }
+ }
+ } else {
+ addComment(pullRequest, message, from, receiverEmailAddresses, authorization.getAuthorizedRole());
+ pullRequests.add(pullRequest);
+ }
} else {
throw new ExplicitException("Unknown sub addressing: " + receiverAddress);
}
@@ -380,6 +416,15 @@ public class DefaultMailManager implements MailManager {
}
}
+ @Nullable
+ private String getMessageId(Message message) throws MessagingException {
+ String[] messageId = message.getHeader("Message-ID");
+ if (messageId != null && messageId.length != 0)
+ return messageId[0];
+ else
+ return null;
+ }
+
private Issue openIssue(Message message, Project project, InternetAddress submitter,
SenderAuthorization authorization) throws MessagingException, IOException {
Issue issue = new Issue();
@@ -389,9 +434,9 @@ public class DefaultMailManager implements MailManager {
else
issue.setTitle("No title");
- String[] messageId = message.getHeader("Message-ID");
- if (messageId != null && messageId.length != 0)
- issue.setThreadingReference(messageId[0]);
+ String messageId = getMessageId(message);
+ if (messageId != null)
+ issue.setThreadingReference(messageId);
String description = readText(project, issue.getUUID(), message);
if (StringUtils.isNotBlank(description))
@@ -680,7 +725,7 @@ public class DefaultMailManager implements MailManager {
}
@Override
- public String getReplyAddressForIssue(Issue issue) {
+ public String getReplyAddress(Issue issue) {
MailSetting mailSetting = settingManager.getMailSetting();
if (mailSetting != null) {
EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());
@@ -692,7 +737,7 @@ public class DefaultMailManager implements MailManager {
}
@Override
- public String getReplyAddressForPullRequest(PullRequest request) {
+ public String getReplyAddress(PullRequest request) {
MailSetting mailSetting = settingManager.getMailSetting();
if (mailSetting != null) {
EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());
@@ -703,6 +748,30 @@ public class DefaultMailManager implements MailManager {
}
}
+ @Override
+ public String getUnsubscribeAddress(Issue issue) {
+ MailSetting mailSetting = settingManager.getMailSetting();
+ if (mailSetting != null && mailSetting.getReceiveMailSetting() != null) {
+ EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());
+ return systemAddress.getPrefix() + "+" + issue.getProject().getName() + "~issue" + issue.getNumber() + "~unsubscribe"
+ + "@" + systemAddress.getDomain();
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String getUnsubscribeAddress(PullRequest request) {
+ MailSetting mailSetting = settingManager.getMailSetting();
+ if (mailSetting != null && mailSetting.getReceiveMailSetting() != null) {
+ EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());
+ return systemAddress.getPrefix() + "+" + request.getProject().getName() + "~pullrequest" + request.getNumber() + "~unsubscribe"
+ + "@" + systemAddress.getDomain();
+ } else {
+ return null;
+ }
+ }
+
private String readText(Project project, String attachmentGroup, Message message)
throws IOException, MessagingException {
Attachments attachments = new Attachments();
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 70d6544e06..70ef282303 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
@@ -55,19 +55,16 @@ public class IssueNotificationManager extends AbstractNotificationManager {
private final UserInfoManager userInfoManager;
- private final SettingManager settingManager;
-
@Inject
public IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,
UrlManager urlManager, IssueWatchManager issueWatchManager, UserInfoManager userInfoManager,
UserManager userManager, SettingManager settingManager) {
- super(markdownManager);
+ super(markdownManager, settingManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
this.issueWatchManager = issueWatchManager;
this.userInfoManager = userInfoManager;
this.userManager = userManager;
- this.settingManager = settingManager;
}
@Transactional
@@ -146,7 +143,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
Map<String, Group> newGroups = event.getNewGroups();
Map<String, Collection<User>> newUsers = event.getNewUsers();
- String replyAddress = mailManager.getReplyAddressForIssue(issue);
+ String replyAddress = mailManager.getReplyAddress(issue);
String threadingReferences = issue.getThreadingReference();
if (threadingReferences == null)
threadingReferences = issue.getUUID() + "@onedev";
@@ -158,7 +155,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
.filter(it->!it.equals(user))
.map(it->it.getEmail())
.collect(Collectors.toSet());
- mailManager.sendMailAsync(emails, Lists.newArrayList(), subject, getHtmlBody(event, url), getTextBody(event, url),
+ mailManager.sendMailAsync(emails, Lists.newArrayList(), subject,
+ getHtmlBody(event, url, null), getTextBody(event, url, null),
replyAddress, threadingReferences);
for (User member: entry.getValue().getMembers())
@@ -174,7 +172,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
.filter(it->!it.equals(user))
.map(it->it.getEmail())
.collect(Collectors.toSet());
- mailManager.sendMailAsync(emails, Lists.newArrayList(), subject, getHtmlBody(event, url), getTextBody(event, url),
+ mailManager.sendMailAsync(emails, Lists.newArrayList(), subject,
+ getHtmlBody(event, url, null), getTextBody(event, url, null),
replyAddress, threadingReferences);
for (User each: entry.getValue())
@@ -238,10 +237,13 @@ public class IssueNotificationManager extends AbstractNotificationManager {
subject = event.getActivity(true);
subject = "[" + issue.getState() + "] " + subject;
+ String unsubscribeAddress = mailManager.getUnsubscribeAddress(issue);
+ String htmlBody = getHtmlBody(event, url, new Unsubscribable(unsubscribeAddress));
+ String textBody = getTextBody(event, url, new Unsubscribable(unsubscribeAddress));
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);
+ subject, htmlBody, textBody, 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 28476ffb88..214911a3fa 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
@@ -23,10 +23,16 @@ public interface MailManager {
String htmlBody, String textBody, @Nullable String replyAddress, @Nullable String references);
@Nullable
- String getReplyAddressForIssue(Issue issue);
+ String getReplyAddress(Issue issue);
@Nullable
- String getReplyAddressForPullRequest(PullRequest request);
+ String getReplyAddress(PullRequest request);
+
+ @Nullable
+ String getUnsubscribeAddress(Issue issue);
+
+ @Nullable
+ public String getUnsubscribeAddress(PullRequest request);
InboxMonitor monitorInbox(MailSetting mailSetting, MessageListener listener);
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 8baf90bcc2..3d0b232d97 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
@@ -64,19 +64,16 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
private final UserManager userManager;
- private final SettingManager settingManager;
-
@Inject
public PullRequestNotificationManager(MailManager mailManager, UrlManager urlManager,
MarkdownManager markdownManager, PullRequestWatchManager pullRequestWatchManager,
UserInfoManager userInfoManager, UserManager userManager, SettingManager settingManager) {
- super(markdownManager);
+ super(markdownManager, settingManager);
this.mailManager = mailManager;
this.urlManager = urlManager;
this.pullRequestWatchManager = pullRequestWatchManager;
this.userInfoManager = userInfoManager;
this.userManager = userManager;
- this.settingManager = settingManager;
}
@Transactional
@@ -179,7 +176,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
}
- String replyAddress = mailManager.getReplyAddressForPullRequest(request);
+ String replyAddress = mailManager.getReplyAddress(request);
String threadingReferences = getThreadingReferences(request);
if (event instanceof PullRequestChangeEvent
&& request.getSubmitter() != null
@@ -196,8 +193,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
if (subject != null) {
subject = "[" + getState(request) + "] " + subject;
mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()),
- Lists.newArrayList(), subject, getHtmlBody(event, url), getTextBody(event, url),
- replyAddress, threadingReferences);
+ Lists.newArrayList(), subject, getHtmlBody(event, url, null),
+ getTextBody(event, url, null), replyAddress, threadingReferences);
notifiedUsers.add(request.getSubmitter());
}
}
@@ -261,11 +258,14 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
else
subject = event.getActivity(true);
+ String unsubscribeAddress = mailManager.getUnsubscribeAddress(request);
subject = "[" + getState(request) + "] " + subject;
+ String htmlBody = getHtmlBody(event, url, new Unsubscribable(unsubscribeAddress));
+ String textBody = getTextBody(event, url, new Unsubscribable(unsubscribeAddress));
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);
+ subject, htmlBody, textBody, replyAddress, threadingReferences);
}
}
}
@@ -295,9 +295,9 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
String url = urlManager.urlFor(request);
String subject = String.format("[%s] You are invited to review pull request %s",
getState(request), request.getNumberAndTitle());
- String replyAddress = mailManager.getReplyAddressForPullRequest(request);
+ String replyAddress = mailManager.getReplyAddress(request);
mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()), Lists.newArrayList(),
- subject, getHtmlBody(event, url), getTextBody(event, url), replyAddress,
+ subject, getHtmlBody(event, url, null), getTextBody(event, url, null), replyAddress,
getThreadingReferences(request));
}
} else if (event.getEntity() instanceof PullRequestAssignment) {
@@ -308,9 +308,9 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
String url = urlManager.urlFor(request);
String subject = String.format("[%s] You are assigned and expected to merge pull request %s",
getState(request), request.getNumberAndTitle());
- String replyAddress = mailManager.getReplyAddressForPullRequest(request);
+ String replyAddress = mailManager.getReplyAddress(request);
mailManager.sendMailAsync(Lists.newArrayList(assignment.getUser().getEmail()), Lists.newArrayList(),
- subject, getHtmlBody(event, url), getTextBody(event, url), replyAddress,
+ subject, getHtmlBody(event, url, null), getTextBody(event, url, null), replyAddress,
getThreadingReferences(request));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java b/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java
new file mode 100644
index 0000000000..ac6e86e746
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java
@@ -0,0 +1,22 @@
+package io.onedev.server.notification;
+
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+public class Unsubscribable implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String emailAddress;
+
+ public Unsubscribable(@Nullable String emailAddress) {
+ this.emailAddress = emailAddress;
+ }
+
+ @Nullable
+ public String getEmailAddress() {
+ return emailAddress;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultRememberMeManager.java b/server-core/src/main/java/io/onedev/server/security/DefaultRememberMeManager.java
index 03d46a37d1..84830c134d 100644
--- a/server-core/src/main/java/io/onedev/server/security/DefaultRememberMeManager.java
+++ b/server-core/src/main/java/io/onedev/server/security/DefaultRememberMeManager.java
@@ -7,6 +7,7 @@ import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.web.mgt.CookieRememberMeManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.util.CryptoUtils;
@Singleton
public class DefaultRememberMeManager extends CookieRememberMeManager {
@@ -20,12 +21,12 @@ public class DefaultRememberMeManager extends CookieRememberMeManager {
@Override
public byte[] getEncryptionCipherKey() {
- return CipherUtils.getCipherKey();
+ return CryptoUtils.getCipherKey();
}
@Override
public byte[] getDecryptionCipherKey() {
- return CipherUtils.getCipherKey();
+ return CryptoUtils.getCipherKey();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java
index bd80988be6..6ba95823bd 100644
--- a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java
+++ b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java
@@ -13,7 +13,7 @@ import org.apache.sshd.server.session.ServerSession;
import io.onedev.server.entitymanager.SshKeyManager;
import io.onedev.server.model.SshKey;
import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.security.CipherUtils;
+import io.onedev.server.util.CryptoUtils;
@Singleton
public class DefaultSshAuthenticator implements SshAuthenticator {
@@ -30,7 +30,7 @@ public class DefaultSshAuthenticator implements SshAuthenticator {
@Sessional
@Override
public boolean authenticate(String username, PublicKey key, ServerSession session) throws AsyncAuthException {
- String digest = KeyUtils.getFingerPrint(CipherUtils.DIGEST_FORMAT, key);
+ String digest = KeyUtils.getFingerPrint(CryptoUtils.DIGEST_FORMAT, key);
SshKey sshKey = sshKeyManager.findByDigest(digest);
if (sshKey != null) {
session.setAttribute(ATTR_PUBLIC_KEY_OWNER_ID, sshKey.getOwner().getId());
diff --git a/server-core/src/main/java/io/onedev/server/security/CipherUtils.java b/server-core/src/main/java/io/onedev/server/util/CryptoUtils.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/security/CipherUtils.java
rename to server-core/src/main/java/io/onedev/server/util/CryptoUtils.java
index e7f5b44aa2..4a9b9d23bd 100644
--- a/server-core/src/main/java/io/onedev/server/security/CipherUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/CryptoUtils.java
@@ -1,4 +1,4 @@
-package io.onedev.server.security;
+package io.onedev.server.util;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
@@ -15,7 +15,7 @@ import org.apache.sshd.common.digest.Digest;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
-public class CipherUtils {
+public class CryptoUtils {
public static final Digest DIGEST_FORMAT = new BaseDigest("MD5", 512);
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CodeValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CodeValidator.java
new file mode 100644
index 0000000000..b074a8d6de
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/CodeValidator.java
@@ -0,0 +1,63 @@
+package io.onedev.server.util.validation;
+
+import java.util.List;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.commons.lang3.StringUtils;
+
+import groovy.text.SimpleTemplateEngine;
+import io.onedev.server.util.GroovyUtils;
+import io.onedev.server.util.validation.annotation.Code;
+
+public class CodeValidator implements ConstraintValidator<Code, List<String>> {
+
+ private String language;
+
+ private String message;
+
+ @Override
+ public void initialize(Code constaintAnnotation) {
+ language = constaintAnnotation.language();
+ message = constaintAnnotation.message();
+ }
+
+ @Override
+ public boolean isValid(List<String> value, ConstraintValidatorContext constraintContext) {
+ if (value != null && !value.isEmpty()) {
+ String joinedValue = StringUtils.join(value, "\n");
+ if (language.equals(Code.HTML_TEMPLATE)) {
+ try {
+ new SimpleTemplateEngine().createTemplate(joinedValue);
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+
+ String message = this.message;
+ if (message.length() == 0)
+ message = e.getMessage();
+ if (StringUtils.isBlank(message))
+ message = "Malformed html template";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ }
+ } else if (language.equals(Code.GROOVY)) {
+ try {
+ GroovyUtils.compile(joinedValue);
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+
+ String message = this.message;
+ if (message.length() == 0)
+ message = e.getMessage();
+ if (StringUtils.isBlank(message))
+ message = "Failed to compile groovy script";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Code.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/Code.java
similarity index 58%
rename from server-core/src/main/java/io/onedev/server/web/editable/annotation/Code.java
rename to server-core/src/main/java/io/onedev/server/util/validation/annotation/Code.java
index f5f6168406..7408a6b1f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Code.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/Code.java
@@ -6,23 +6,37 @@
*
* Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $
*/
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.util.validation.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.CodeValidator;
+
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=CodeValidator.class)
public @interface Code {
String GROOVY = "Groovy";
String SHELL = "Shell";
+ String HTML_TEMPLATE = "Java Server Pages";
+
String language();
String variableProvider() default "";
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
}
\ No newline at end of file
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 b9374128ff..3f6f88ce2f 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
@@ -27,6 +27,8 @@ import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage
import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
import io.onedev.server.web.page.admin.jobexecutor.JobExecutorsPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
+import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;
+import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;
import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationSettingPage;
import io.onedev.server.web.page.admin.role.NewRolePage;
import io.onedev.server.web.page.admin.role.RoleDetailPage;
@@ -214,6 +216,10 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("administration/settings/system", SystemSettingPage.class));
add(new DynamicPathPageMapper("administration/settings/mail", MailSettingPage.class));
+ add(new DynamicPathPageMapper("administration/settings/issue-notification-template",
+ IssueNotificationTemplatePage.class));
+ add(new DynamicPathPageMapper("administration/settings/pull-request-notification-template",
+ PullRequestNotificationTemplatePage.class));
add(new DynamicPathPageMapper("administration/settings/backup", DatabaseBackupPage.class));
add(new DynamicPathPageMapper("administration/settings/security", GeneralSecuritySettingPage.class));
add(new DynamicPathPageMapper("administration/settings/authenticator", AuthenticatorPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java
index 90087ec76f..c108ab1518 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java
@@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.util.validation.annotation.Code;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
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;
-import io.onedev.server.web.editable.annotation.Code;
@SuppressWarnings("serial")
public class CodeEditSupport implements EditSupport {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
index 0e592f3170..0333ed5994 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
@@ -31,11 +31,11 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.util.validation.annotation.Code;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.annotation.Code;
@SuppressWarnings("serial")
public class CodePropertyEditor extends PropertyEditor<List<String>> {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptCssResourceReference.java
deleted file mode 100644
index 71b46c7a0b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.admin.groovyscript;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class GroovyScriptCssResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public GroovyScriptCssResourceReference() {
- super(GroovyScriptCssResourceReference.class, "groovy-script.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
index 463d1d3fda..78fd34ddf0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java
@@ -15,8 +15,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolb
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.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.LoopItem;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -231,12 +229,6 @@ public class GroovyScriptListPage extends AdministrationPage {
}.sortable("tbody"));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new GroovyScriptCssResourceReference()));
- }
-
@Override
protected Component newTopbarTitle(String componentId) {
return new Label(componentId, "Groovy Scripts");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.css b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.css
deleted file mode 100644
index 5e4b906cb0..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/groovy-script.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.floating.groovy-script.off-canvas td.name {
- width: 120px !important;
-}
-@media(min-width: 768px) {
-.groovy-script.floating.off-canvas {
- width: 600px;
-}
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.html
new file mode 100644
index 0000000000..0721abcfc8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.html
@@ -0,0 +1,12 @@
+<wicket:extend>
+ <div class="card issue-notification-template">
+ <div class="card-body">
+ <div wicket:id="notificationTemplateHelp" class="alert alert-notice alert-light mb-5"></div>
+ <form wicket:id="form" 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 Template">
+ <input wicket:id="useDefault" type="button" class="btn btn-light-primary" value="Use Default">
+ </form>
+ </div>
+ </div>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java
new file mode 100644
index 0000000000..8feb366903
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java
@@ -0,0 +1,83 @@
+package io.onedev.server.web.page.admin.notificationtemplatesetting;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class IssueNotificationTemplatePage extends AdministrationPage {
+
+ public IssueNotificationTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ NotificationTemplateSetting setting = getSettingManager().getNotificationTemplateSetting();
+
+ Map<String, String> variableHelp = new LinkedHashMap<>();
+ variableHelp.put("issue", " represents the <a href='https://code.onedev.io/projects/onedev-server/blob/main/server-core/src/main/java/io/onedev/server/model/Issue.java' target='_blank'>issue</a> object to be notified");
+ add(new Label("notificationTemplateHelp", NotificationTemplateSetting.getTemplateHelp(variableHelp))
+ .setEscapeModelStrings(false));
+
+ BeanEditor editor = BeanContext.edit("editor", setting, Lists.newArrayList(NotificationTemplateSetting.PROP_ISSUE_NOTIFICATION_TEMPLATE), false);
+
+ Button saveButton = new Button("save") {
+
+ @Override
+ public void onSubmit() {
+ super.onSubmit();
+
+ getSettingManager().saveNotificationTemplateSetting(setting);
+ getSession().success("Issue notification template has been saved");
+ }
+
+ };
+
+ Link<?> useDefaultLink;
+ add(useDefaultLink = new Link<Void>("useDefault") {
+
+ @Override
+ public void onClick() {
+ setting.setIssueNotificationTemplate(NotificationTemplateSetting.DEFAULT_TEMPLATE);
+ getSettingManager().saveNotificationTemplateSetting(setting);
+ setResponsePage(IssueNotificationTemplatePage.class);
+ }
+
+ });
+
+ Form<?> form = new Form<Void>("form");
+ form.add(editor);
+ form.add(saveButton);
+ form.add(useDefaultLink);
+
+ add(form);
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Issue Notification Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.html
new file mode 100644
index 0000000000..611140e9fe
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.html
@@ -0,0 +1,12 @@
+<wicket:extend>
+ <div class="card pull-request-notification-template">
+ <div class="card-body">
+ <div wicket:id="notificationTemplateHelp" class="alert alert-notice alert-light mb-5"></div>
+ <form wicket:id="form" 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 Template">
+ <input wicket:id="useDefault" type="button" class="btn btn-light-primary" value="Use Default">
+ </form>
+ </div>
+ </div>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java
new file mode 100644
index 0000000000..d0f555235e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java
@@ -0,0 +1,83 @@
+package io.onedev.server.web.page.admin.notificationtemplatesetting;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class PullRequestNotificationTemplatePage extends AdministrationPage {
+
+ public PullRequestNotificationTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ NotificationTemplateSetting setting = getSettingManager().getNotificationTemplateSetting();
+
+ Map<String, String> variableHelp = new LinkedHashMap<>();
+ variableHelp.put("pullRequest", " represents the <a href='https://code.onedev.io/projects/onedev-server/blob/main/server-core/src/main/java/io/onedev/server/model/PullRequest.java' target='_blank'>pull request</a> object to be notified");
+ add(new Label("notificationTemplateHelp", NotificationTemplateSetting.getTemplateHelp(variableHelp))
+ .setEscapeModelStrings(false));
+
+ BeanEditor editor = BeanContext.edit("editor", setting, Lists.newArrayList(NotificationTemplateSetting.PROP_PULL_REQUEST_NOTIFICATION_TEMPLATE), false);
+
+ Button saveButton = new Button("save") {
+
+ @Override
+ public void onSubmit() {
+ super.onSubmit();
+
+ getSettingManager().saveNotificationTemplateSetting(setting);
+ getSession().success("Issue notification template has been saved");
+ }
+
+ };
+
+ Link<?> useDefaultLink;
+ add(useDefaultLink = new Link<Void>("useDefault") {
+
+ @Override
+ public void onClick() {
+ setting.setIssueNotificationTemplate(NotificationTemplateSetting.DEFAULT_TEMPLATE);
+ getSettingManager().saveNotificationTemplateSetting(setting);
+ setResponsePage(PullRequestNotificationTemplatePage.class);
+ }
+
+ });
+
+ Form<?> form = new Form<Void>("form");
+ form.add(editor);
+ form.add(saveButton);
+ form.add(useDefaultLink);
+
+ add(form);
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Pull Request Notification Template");
+ }
+
+}
\ No newline at end of file
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 316244e784..7f24cc3ad6 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
@@ -47,8 +47,8 @@ import com.google.common.base.Splitter;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.model.User;
-import io.onedev.server.security.CipherUtils;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.CryptoUtils;
import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -91,7 +91,7 @@ public abstract class BasePage extends WebPage {
String encodedData = params.getParameterValue("data").toString();
byte[] bytes = Base64.decodeBase64(encodedData.getBytes());
- Serializable data = (Serializable) SerializationUtils.deserialize(CipherUtils.decrypt(bytes));
+ Serializable data = (Serializable) SerializationUtils.deserialize(CryptoUtils.decrypt(bytes));
onPopState(target, data);
resizeWindow(target);
target.appendJavaScript("onedev.server.viewState.getFromHistoryAndSetToView();");
@@ -194,14 +194,14 @@ public abstract class BasePage extends WebPage {
}
public void pushState(IPartialPageRequestHandler handler, String url, Serializable data) {
- String encodedData = new String(Base64.encodeBase64(CipherUtils.encrypt(SerializationUtils.serialize(data))));
+ String encodedData = new String(Base64.encodeBase64(CryptoUtils.encrypt(SerializationUtils.serialize(data))));
String script = String.format("onedev.server.history.pushState('%s', '%s', '%s');",
url, encodedData, JavaScriptEscape.escapeJavaScript(getPageTitle()));
handler.prependJavaScript(script);
}
public void replaceState(IPartialPageRequestHandler handler, String url, Serializable data) {
- String encodedData = new String(Base64.encodeBase64(CipherUtils.encrypt(SerializationUtils.serialize(data))));
+ String encodedData = new String(Base64.encodeBase64(CryptoUtils.encrypt(SerializationUtils.serialize(data))));
String script = String.format("onedev.server.history.replaceState('%s', '%s', '%s');",
url, encodedData, JavaScriptEscape.escapeJavaScript(getPageTitle()));
handler.prependJavaScript(script);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 07a0da7983..2bdc6e06b0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -58,6 +58,8 @@ import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage
import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
import io.onedev.server.web.page.admin.jobexecutor.JobExecutorsPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
+import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;
+import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;
import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationSettingPage;
import io.onedev.server.web.page.admin.role.NewRolePage;
import io.onedev.server.web.page.admin.role.RoleDetailPage;
@@ -150,6 +152,16 @@ public abstract class LayoutPage extends BasePage {
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Mail Setting",
MailSettingPage.class, new PageParameters()));
+
+ List<SidebarMenuItem> notificationTemplateSettingMenuItems = new ArrayList<>();
+ notificationTemplateSettingMenuItems.add(new SidebarMenuItem.Page(null, "Issue",
+ IssueNotificationTemplatePage.class, new PageParameters()));
+ notificationTemplateSettingMenuItems.add(new SidebarMenuItem.Page(null, "Pull Request",
+ PullRequestNotificationTemplatePage.class, new PageParameters()));
+
+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Notification Templates",
+ notificationTemplateSettingMenuItems));
+
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Job Executors",
JobExecutorsPage.class, new PageParameters()));
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Groovy Scripts",
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 b47194918b..59f9329006 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,2 +1,6 @@
<wicket:extend>
+ <div class="d-flex border-primary justify-content-between align-items-center">
+ <span style="font-size: 64px;">hello</span>
+ <span>world</span>
+ </div>
</wicket:extend>
\ No newline at end of file
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 6990226782..cee8dc26f0 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
@@ -22,9 +22,9 @@ 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;
+import io.onedev.server.util.CryptoUtils;
public class AttachmentResource extends AbstractResource {
@@ -57,7 +57,7 @@ public class AttachmentResource extends AbstractResource {
String authorization = params.get(PARAM_AUTHORIZATION).toOptionalString();
if (authorization == null
- || !new String(CipherUtils.decrypt(Base64.decodeBase64(authorization)), StandardCharsets.UTF_8).equals(group)) {
+ || !new String(CryptoUtils.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();
@@ -118,7 +118,7 @@ public class AttachmentResource extends AbstractResource {
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));
+ byte[] encrypted = CryptoUtils.encrypt(group.getBytes(StandardCharsets.UTF_8));
String base64 = Base64.encodeBase64URLSafeString(encrypted);
builder.addParameter(PARAM_AUTHORIZATION, base64);
}