loglinkregex = "(?:pull request|pull|pr)\\s*[-#]?[0-9]+"\r
logregex = "\\d+"\r
loglinktext = "pull request #%BUGID%"\r
+[bugtraq "tickets"]\r
+ url = "https://dev.gitblit.com/tickets/gitblit.git/%BUGID%"\r
+ loglinkregex = "(?:ticket)\\s*[-#]?[0-9]+"\r
+ logregex = "\\d+"\r
+ loglinktext = "ticket #%BUGID%"\r
+
\ No newline at end of file
import com.gitblit.models.RepositoryModel;\r
import com.gitblit.models.UserModel;\r
import com.gitblit.servlet.AuthenticationFilter.AuthenticatedRequest;\r
+import com.gitblit.utils.BugtraqProcessor;\r
import com.gitblit.utils.HttpUtils;\r
import com.gitblit.utils.JGitUtils;\r
-import com.gitblit.utils.MessageProcessor;\r
import com.gitblit.utils.StringUtils;\r
import com.gitblit.utils.SyndicationUtils;\r
\r
offset, length);\r
}\r
Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(repository, model.showRemoteBranches);\r
- MessageProcessor processor = new MessageProcessor(settings);\r
+ BugtraqProcessor processor = new BugtraqProcessor(settings);\r
\r
// convert RevCommit to SyndicatedEntryModel\r
for (RevCommit commit : commits) {\r
--- /dev/null
+/*
+ * Copyright 2013 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.utils;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.jgit.errors.ConfigInvalidException;
+import org.eclipse.jgit.lib.Repository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.gitblit.IStoredSettings;
+import com.gitblit.Keys;
+import com.gitblit.models.RepositoryModel;
+import com.syntevo.bugtraq.BugtraqConfig;
+import com.syntevo.bugtraq.BugtraqFormatter;
+import com.syntevo.bugtraq.BugtraqFormatter.OutputHandler;
+
+public class BugtraqProcessor {
+
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
+ private final IStoredSettings settings;
+
+ public BugtraqProcessor(IStoredSettings settings) {
+ this.settings = settings;
+ }
+
+ /**
+ * Returns an html version of the commit message with any global or
+ * repository-specific regular expression substitution applied.
+ *
+ * This method uses the preferred renderer to transform the commit message.
+ *
+ * @param repository
+ * @param model
+ * @param text
+ * @return html version of the commit message
+ */
+ public String processCommitMessage(Repository repository, RepositoryModel model, String text) {
+ switch (model.commitMessageRenderer) {
+ case MARKDOWN:
+ try {
+ String prepared = processTextRegex(repository, model.name, text);
+ return MarkdownUtils.transformMarkdown(prepared);
+ } catch (Exception e) {
+ logger.error("Failed to render commit message as markdown", e);
+ }
+ break;
+ default:
+ // noop
+ break;
+ }
+
+ return processPlainCommitMessage(repository, model.name, text);
+ }
+
+ /**
+ * Returns an html version of the commit message with any global or
+ * repository-specific regular expression substitution applied.
+ *
+ * This method assumes the commit message is plain text.
+ *
+ * @param repository
+ * @param repositoryName
+ * @param text
+ * @return html version of the commit message
+ */
+ public String processPlainCommitMessage(Repository repository, String repositoryName, String text) {
+ String html = StringUtils.escapeForHtml(text, false);
+ html = processTextRegex(repository, repositoryName, html);
+ return StringUtils.breakLinesForHtml(html);
+
+ }
+
+ /**
+ * Returns an processed version of the text with any global or
+ * repository-specific regular expression substitution applied.
+ *
+ * @param repository
+ * @param repositoryName
+ * @param text
+ * @return processed version of the text
+ */
+ public String processText(Repository repository, String repositoryName, String text) {
+ String html = processTextRegex(repository, repositoryName, text);
+ return html;
+ }
+
+ /**
+ * Apply globally or per-repository specified regex substitutions to the
+ * text.
+ *
+ * @param repository
+ * @param repositoryName
+ * @param text
+ * @return the processed text
+ */
+ protected String processTextRegex(Repository repository, String repositoryName, String text) {
+ Map<String, String> map = new HashMap<String, String>();
+ // global regex keys
+ if (settings.getBoolean(Keys.regex.global, false)) {
+ for (String key : settings.getAllKeys(Keys.regex.global)) {
+ if (!key.equals(Keys.regex.global)) {
+ String subKey = key.substring(key.lastIndexOf('.') + 1);
+ map.put(subKey, settings.getString(key, ""));
+ }
+ }
+ }
+
+ // repository-specific regex keys
+ List<String> keys = settings.getAllKeys(Keys.regex._ROOT + "."
+ + repositoryName.toLowerCase());
+ for (String key : keys) {
+ String subKey = key.substring(key.lastIndexOf('.') + 1);
+ map.put(subKey, settings.getString(key, ""));
+ }
+
+ for (Entry<String, String> entry : map.entrySet()) {
+ String definition = entry.getValue().trim();
+ String[] chunks = definition.split("!!!");
+ if (chunks.length == 2) {
+ text = text.replaceAll(chunks[0], chunks[1]);
+ } else {
+ logger.warn(entry.getKey()
+ + " improperly formatted. Use !!! to separate match from replacement: "
+ + definition);
+ }
+ }
+
+ try {
+ // parse bugtraq repo config
+ BugtraqConfig config = BugtraqConfig.read(repository);
+ if (config != null) {
+ BugtraqFormatter formatter = new BugtraqFormatter(config);
+ StringBuilder sb = new StringBuilder();
+ formatter.formatLogMessage(text, new BugtraqOutputHandler(sb));
+ text = sb.toString();
+ }
+ } catch (IOException e) {
+ logger.error(MessageFormat.format("Bugtraq config for {0} is invalid!", repositoryName), e);
+ } catch (ConfigInvalidException e) {
+ logger.error(MessageFormat.format("Bugtraq config for {0} is invalid!", repositoryName), e);
+ }
+
+ return text;
+ }
+
+ private class BugtraqOutputHandler implements OutputHandler {
+
+ final StringBuilder sb;
+
+ BugtraqOutputHandler(StringBuilder sb) {
+ this.sb = sb;
+ }
+
+ @Override
+ public void appendText(String text) {
+ sb.append(text);
+ }
+
+ @Override
+ public void appendLink(String name, String target) {
+ sb.append(MessageFormat.format("<a class=\"bugtraq\" href=\"{1}\" target=\"_blank\">{0}</a>", name, target));
+ }
+ }
+}
+++ /dev/null
-/*
- * Copyright 2013 gitblit.com.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gitblit.utils;
-
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.jgit.errors.ConfigInvalidException;
-import org.eclipse.jgit.lib.Repository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.gitblit.IStoredSettings;
-import com.gitblit.Keys;
-import com.gitblit.models.RepositoryModel;
-import com.syntevo.bugtraq.BugtraqConfig;
-import com.syntevo.bugtraq.BugtraqFormatter;
-import com.syntevo.bugtraq.BugtraqFormatter.OutputHandler;
-
-public class MessageProcessor {
-
- private final Logger logger = LoggerFactory.getLogger(getClass());
-
- private final IStoredSettings settings;
-
- public MessageProcessor(IStoredSettings settings) {
- this.settings = settings;
- }
-
- /**
- * Returns an html version of the commit message with any global or
- * repository-specific regular expression substitution applied.
- *
- * This method uses the preferred renderer to transform the commit message.
- *
- * @param repository
- * @param model
- * @param text
- * @return html version of the commit message
- */
- public String processCommitMessage(Repository repository, RepositoryModel model, String text) {
- switch (model.commitMessageRenderer) {
- case MARKDOWN:
- try {
- String prepared = processCommitMessageRegex(repository, model.name, text);
- return MarkdownUtils.transformMarkdown(prepared);
- } catch (Exception e) {
- logger.error("Failed to render commit message as markdown", e);
- }
- break;
- default:
- // noop
- break;
- }
-
- return processPlainCommitMessage(repository, model.name, text);
- }
-
- /**
- * Returns an html version of the commit message with any global or
- * repository-specific regular expression substitution applied.
- *
- * This method assumes the commit message is plain text.
- *
- * @param repository
- * @param repositoryName
- * @param text
- * @return html version of the commit message
- */
- public String processPlainCommitMessage(Repository repository, String repositoryName, String text) {
- String html = StringUtils.escapeForHtml(text, false);
- html = processCommitMessageRegex(repository, repositoryName, html);
- return StringUtils.breakLinesForHtml(html);
-
- }
-
- /**
- * Apply globally or per-repository specified regex substitutions to the
- * commit message.
- *
- * @param repository
- * @param repositoryName
- * @param text
- * @return the processed commit message
- */
- protected String processCommitMessageRegex(Repository repository, String repositoryName, String text) {
- Map<String, String> map = new HashMap<String, String>();
- // global regex keys
- if (settings.getBoolean(Keys.regex.global, false)) {
- for (String key : settings.getAllKeys(Keys.regex.global)) {
- if (!key.equals(Keys.regex.global)) {
- String subKey = key.substring(key.lastIndexOf('.') + 1);
- map.put(subKey, settings.getString(key, ""));
- }
- }
- }
-
- // repository-specific regex keys
- List<String> keys = settings.getAllKeys(Keys.regex._ROOT + "."
- + repositoryName.toLowerCase());
- for (String key : keys) {
- String subKey = key.substring(key.lastIndexOf('.') + 1);
- map.put(subKey, settings.getString(key, ""));
- }
-
- for (Entry<String, String> entry : map.entrySet()) {
- String definition = entry.getValue().trim();
- String[] chunks = definition.split("!!!");
- if (chunks.length == 2) {
- text = text.replaceAll(chunks[0], chunks[1]);
- } else {
- logger.warn(entry.getKey()
- + " improperly formatted. Use !!! to separate match from replacement: "
- + definition);
- }
- }
-
- try {
- // parse bugtraq repo config
- BugtraqConfig config = BugtraqConfig.read(repository);
- if (config != null) {
- BugtraqFormatter formatter = new BugtraqFormatter(config);
- StringBuilder sb = new StringBuilder();
- formatter.formatLogMessage(text, new BugtraqOutputHandler(sb));
- text = sb.toString();
- }
- } catch (IOException e) {
- logger.error(MessageFormat.format("Bugtraq config for {0} is invalid!", repositoryName), e);
- } catch (ConfigInvalidException e) {
- logger.error(MessageFormat.format("Bugtraq config for {0} is invalid!", repositoryName), e);
- }
-
- return text;
- }
-
- private class BugtraqOutputHandler implements OutputHandler {
-
- final StringBuilder sb;
-
- BugtraqOutputHandler(StringBuilder sb) {
- this.sb = sb;
- }
-
- @Override
- public void appendText(String text) {
- sb.append(text);
- }
-
- @Override
- public void appendLink(String name, String target) {
- sb.append(MessageFormat.format("<a class=\"bugtraq\" href=\"{1}\" target=\"_blank\">{0}</a>", name, target));
- }
- }
-}
item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));
item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef
.getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));
- item.add(new Label("noteContent", messageProcessor().processPlainCommitMessage(getRepository(), repositoryName,
+ item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName,
entry.content)).setEscapeModelStrings(false));
}
};
item.add(new GravatarImage("noteAuthorAvatar", entry.notesRef.getAuthorIdent()));\r
item.add(WicketUtils.createTimestampLabel("authorDate", entry.notesRef\r
.getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));\r
- item.add(new Label("noteContent", messageProcessor().processPlainCommitMessage(getRepository(), repositoryName,\r
+ item.add(new Label("noteContent", bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName,\r
entry.content)).setEscapeModelStrings(false));\r
}\r
};\r
import org.eclipse.jgit.lib.Repository;\r
import org.eclipse.jgit.revwalk.RevCommit;\r
\r
+import com.gitblit.utils.BugtraqProcessor;\r
import com.gitblit.utils.JGitUtils;\r
import com.gitblit.utils.StringUtils;\r
import com.gitblit.wicket.CacheControl;\r
}\r
}\r
\r
+ BugtraqProcessor bugtraq = new BugtraqProcessor(app().settings());\r
+ markupText = bugtraq.processText(getRepository(), repositoryName, markupText);\r
+\r
Fragment fragment;\r
MarkupDocument markupDoc = processor.parse(repositoryName, getBestCommitId(commit), documentPath, markupText);\r
if (MarkupSyntax.PLAIN.equals(markupDoc.syntax)) {\r
import com.gitblit.servlet.SyndicationServlet;\r
import com.gitblit.tickets.TicketIndexer.Lucene;\r
import com.gitblit.utils.ArrayUtils;\r
+import com.gitblit.utils.BugtraqProcessor;\r
import com.gitblit.utils.DeepCopier;\r
import com.gitblit.utils.JGitUtils;\r
-import com.gitblit.utils.MessageProcessor;\r
import com.gitblit.utils.RefLogUtils;\r
import com.gitblit.utils.StringUtils;\r
import com.gitblit.wicket.CacheControl;\r
return getClass();\r
}\r
\r
- protected MessageProcessor messageProcessor() {\r
- return new MessageProcessor(app().settings());\r
+ protected BugtraqProcessor bugtraqProcessor() {\r
+ return new BugtraqProcessor(app().settings());\r
}\r
\r
private Map<String, PageRegistration> registerPages() {\r
\r
protected void addFullText(String wicketId, String text) {\r
RepositoryModel model = getRepositoryModel();\r
- String content = messageProcessor().processCommitMessage(r, model, text);\r
+ String content = bugtraqProcessor().processCommitMessage(r, model, text);\r
String html;\r
switch (model.commitMessageRenderer) {\r
case MARKDOWN:\r
add(new Label("ticketTopic").setVisible(false));\r
} else {\r
// process the topic using the bugtraq config to link things\r
- String topic = messageProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.topic);\r
+ String topic = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.topic);\r
add(new Label("ticketTopic", topic).setEscapeModelStrings(false));\r
}\r
\r
\r
@Override\r
public void populateItem(final Item<String> labelItem) {\r
- String content = messageProcessor().processPlainCommitMessage(getRepository(), repositoryName, labelItem.getModelObject());\r
+ String content = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, labelItem.getModelObject());\r
Label label = new Label("label", content);\r
label.setEscapeModelStrings(false);\r
TicketLabel tLabel = app().tickets().getLabel(getRepositoryModel(), labelItem.getModelObject());\r
projects / gitblit.git / commitdiff