Skip to content

The Unified and Autonomous Development Platform

Check markdown file in repository to add missing mark

robin shen3b0411ba5cb5
diff --git a/core/src/main/java/com/gitplex/server/git/GitUtils.java b/core/src/main/java/com/gitplex/server/git/GitUtils.java
index 07026ab89c..c0ef36e1f4 100644
--- a/core/src/main/java/com/gitplex/server/git/GitUtils.java
+++ b/core/src/main/java/com/gitplex/server/git/GitUtils.java
@@ -49,6 +49,7 @@ import com.gitplex.server.git.exception.ObsoleteCommitException;
import com.gitplex.server.git.exception.RefUpdateException;
import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.utils.LockUtils;
+import com.gitplex.utils.PathUtils;
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -214,31 +215,20 @@ public class GitUtils {
}
public static List<String> splitPath(@Nullable String path) {
- List<String> pathElements = new ArrayList<>();
- if (path != null) {
- for (String element: Splitter.on("/").split(path)) {
- if (element.length() != 0)
- pathElements.add(element);
- }
- }
- return pathElements;
- }
-
- public static @Nullable String joinPath(List<String> pathSegments) {
- List<String> nonEmptyElements = new ArrayList<>();
- for (String element: pathSegments){
- if (element.length() != 0)
- nonEmptyElements.add(element);
- }
- if (!nonEmptyElements.isEmpty()) {
- return Joiner.on("/").join(nonEmptyElements);
- } else {
- return null;
- }
+ List<String> pathSegments;
+ if (path != null)
+ pathSegments = Splitter.on("/").omitEmptyStrings().splitToList(path);
+ else
+ pathSegments = new ArrayList<>();
+ return pathSegments;
}
public static @Nullable String normalizePath(@Nullable String path) {
- return joinPath(splitPath(path));
+ List<String> pathSegments = splitPath(PathUtils.normalizeDots(path));
+ if (!pathSegments.isEmpty())
+ return Joiner.on("/").join(pathSegments);
+ else
+ return null;
}
/**
diff --git a/core/src/main/java/com/gitplex/server/manager/MarkdownManager.java b/core/src/main/java/com/gitplex/server/manager/MarkdownManager.java
index adced56b58..83500d1b3f 100644
--- a/core/src/main/java/com/gitplex/server/manager/MarkdownManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/MarkdownManager.java
@@ -13,18 +13,10 @@ public interface MarkdownManager {
* @return
* rendered html
*/
- String render(String markdown, @Nullable String baseUrl, boolean postProcess);
-
- /**
- * Sanitize and transform specified html.
- *
- * @param html
- * html to be post-processed
- * @return
- * post-processed html
- */
- String postProcess(String html);
+ String render(String markdown);
+ String process(String rendered, @Nullable Object context);
+
/**
* Escape html characters in specified markdown so that the markdown plain text
* can be embedded in html content such as html email.
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
index efb8f6d51f..6bd3db46a7 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java
@@ -10,17 +10,11 @@ import javax.inject.Singleton;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Attribute;
import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.safety.Cleaner;
-import org.jsoup.safety.Whitelist;
import com.gitplex.server.manager.MarkdownManager;
-import com.gitplex.server.util.markdown.HtmlTransformer;
-import com.gitplex.server.util.markdown.UrlResolveExtension;
-import com.google.common.base.Preconditions;
+import com.gitplex.server.util.JsoupUtils;
+import com.gitplex.server.util.markdown.MarkdownProcessor;
import com.vladsch.flexmark.Extension;
import com.vladsch.flexmark.ast.Node;
import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension;
@@ -38,63 +32,18 @@ import com.vladsch.flexmark.util.options.MutableDataSet;
@Singleton
public class DefaultMarkdownManager implements MarkdownManager {
- private static final String[] SAFE_TAGS = new String[] { "h1", "h2", "h3", "h4", "h5", "h6", "h7", "h8", "br", "b",
- "i", "strong", "em", "a", "pre", "code", "img", "tt", "div", "ins", "del", "sup", "sub", "p", "ol", "ul",
- "li", "table", "thead", "tbody", "tfoot", "th", "tr", "td", "rt", "rp", "blockquote", "dl", "dt", "dd",
- "kbd", "q", "hr", "strike", "caption", "cite", "col", "colgroup", "small", "span", "u", "input", "video", "source"};
-
- private static final String[] SAFE_ATTRIBUTES = new String[] { "abbr", "accept", "accept-charset", "accesskey",
- "action", "align", "alt", "axis", "border", "cellpadding", "cellspacing", "char", "charoff", "charset",
- "checked", "cite", "clear", "cols", "colspan", "color", "compact", "coords", "datetime", "details", "dir",
- "disabled", "enctype", "for", "frame", "headers", "height", "hreflang", "hspace", "ismap", "label", "lang",
- "longdesc", "maxlength", "media", "method", "multiple", "name", "nohref", "noshade", "nowrap", "prompt",
- "readonly", "rel", "rev", "rows", "rowspan", "rules", "scope", "selected", "shape", "size", "span", "start",
- "style", "summary", "tabindex", "target", "title", "type", "usemap", "valign", "value", "vspace", "width",
- "itemprop", "class", "controls"};
-
- private static final String[] SAFE_ANCHOR_SCHEMES = new String[] { "http", "https", "mailto", };
-
- private final Whitelist whiteList;
-
private final Set<Extension> contributedExtensions;
- private final Set<HtmlTransformer> htmlTransformers;
+ private final Set<MarkdownProcessor> htmlTransformers;
@Inject
- public DefaultMarkdownManager(Set<Extension> contributedExtensions, Set<HtmlTransformer> htmlTransformers) {
+ public DefaultMarkdownManager(Set<Extension> contributedExtensions, Set<MarkdownProcessor> htmlTransformers) {
this.contributedExtensions = contributedExtensions;
this.htmlTransformers = htmlTransformers;
-
- whiteList = new Whitelist() {
-
- @Override
- protected boolean isSafeAttribute(String tagName, Element el, Attribute attr) {
- if (attr.getKey().startsWith("data-"))
- return true;
- else
- return super.isSafeAttribute(tagName, el, attr);
- }
-
- };
-
- whiteList.addTags(SAFE_TAGS)
- .addAttributes("a", "href", "title")
- .addAttributes("img", "align", "alt", "height", "src", "title", "width")
- .addAttributes("div", "itemscope", "itemtype")
- .addAttributes("source", "src")
- .addAttributes(":all", SAFE_ATTRIBUTES)
- .addProtocols("a", "href", SAFE_ANCHOR_SCHEMES)
- .addProtocols("blockquote", "cite", "http", "https")
- .addProtocols("cite", "cite", "http", "https")
- .addProtocols("img", "src", "http", "https")
- .addProtocols("q", "cite", "http", "https")
- .preserveRelativeLinks(true);
}
@Override
- public String render(String markdown, @Nullable String baseUrl, boolean postProcess) {
- Preconditions.checkArgument(baseUrl == null || baseUrl.startsWith("/"));
-
+ public String render(String markdown) {
List<Extension> extensions = new ArrayList<>();
extensions.add(AnchorLinkExtension.create());
extensions.add(TablesExtension.create());
@@ -102,7 +51,6 @@ public class DefaultMarkdownManager implements MarkdownManager {
extensions.add(DefinitionExtension.create());
extensions.add(TocExtension.create());
extensions.add(AutolinkExtension.create());
- extensions.add(new UrlResolveExtension());
extensions.addAll(contributedExtensions);
MutableDataHolder options = new MutableDataSet()
@@ -116,7 +64,6 @@ public class DefaultMarkdownManager implements MarkdownManager {
.set(TablesExtension.APPEND_MISSING_COLUMNS, true)
.set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
.set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
- .set(UrlResolveExtension.BASE_URL, baseUrl)
.set(Parser.EXTENSIONS, extensions);
Parser parser = Parser.builder(options).build();
@@ -124,25 +71,7 @@ public class DefaultMarkdownManager implements MarkdownManager {
HtmlRenderer htmlRenderer = HtmlRenderer.builder(options).build();
Node document = parser.parse(markdown);
- String html = htmlRenderer.render(document);
-
- if (postProcess)
- html = postProcess(html);
-
- return html;
- }
-
- @Override
- public String postProcess(String html) {
- // Use a faked baseURI, otherwise all relative urls will be stripped out
- Document body = Jsoup.parseBodyFragment(html, "http://localhost/sanitize");
-
- Cleaner cleaner = new Cleaner(whiteList);
- body = cleaner.clean(body);
-
- for (HtmlTransformer transformer : htmlTransformers)
- transformer.transform(body);
- return body.body().html();
+ return htmlRenderer.render(document);
}
@Override
@@ -152,4 +81,12 @@ public class DefaultMarkdownManager implements MarkdownManager {
return markdown;
}
+ @Override
+ public String process(String rendered, @Nullable Object context) {
+ Document document = JsoupUtils.clean(rendered);
+ for (MarkdownProcessor htmlTransformer: htmlTransformers)
+ htmlTransformer.process(document, context);
+ return document.body().html();
+ }
+
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
index 414795bcbb..077ab00998 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
@@ -91,8 +91,8 @@ public class DefaultNotificationManager implements NotificationManager {
if (event.getRequest() == null) {
MarkdownAware markdownAware = (MarkdownAware) event;
String markdown = markdownAware.getMarkdown();
- String html = markdownManager.render(markdown, null, false);
- Collection<User> mentionUsers = new MentionParser().parseMentions(html);
+ String rendered = markdownManager.render(markdown);
+ Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);
if (!mentionUsers.isEmpty()) {
String url;
if (event instanceof CodeCommentCreated)
@@ -298,8 +298,8 @@ public class DefaultNotificationManager implements NotificationManager {
MarkdownAware markdownAware = (MarkdownAware) event;
String markdown = markdownAware.getMarkdown();
if (markdown != null) {
- String html = markdownManager.render(markdown, null, false);
- mentionUsers.addAll(new MentionParser().parseMentions(html));
+ String rendered = markdownManager.render(markdown);
+ mentionUsers.addAll(new MentionParser().parseMentions(rendered));
if (!mentionUsers.isEmpty()) {
String url;
if (event instanceof PullRequestCommentCreated)
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java
index 5b2e863d25..f9a1151bad 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java
@@ -43,9 +43,9 @@ public class DefaultPullRequestReferenceManager extends AbstractEntityManager<Pu
if (event instanceof MarkdownAware) {
String markdown = ((MarkdownAware)event).getMarkdown();
if (markdown != null) {
- String html = markdownManager.render(markdown, null, false);
+ String rendered = markdownManager.render(markdown);
- for (PullRequest referenced: new PullRequestParser().parseRequests(html)) {
+ for (PullRequest referenced: new PullRequestParser().parseRequests(rendered)) {
if (!referenced.equals(event.getRequest())) {
EntityCriteria<PullRequestReference> criteria = EntityCriteria.of(PullRequestReference.class);
criteria.add(Restrictions.eq("referenced", referenced));
diff --git a/core/src/main/java/com/gitplex/server/util/JsoupUtils.java b/core/src/main/java/com/gitplex/server/util/JsoupUtils.java
index b30afb055b..9821e87efb 100644
--- a/core/src/main/java/com/gitplex/server/util/JsoupUtils.java
+++ b/core/src/main/java/com/gitplex/server/util/JsoupUtils.java
@@ -3,15 +3,65 @@ package com.gitplex.server.util;
import java.util.Collection;
import java.util.regex.Matcher;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Attribute;
import org.jsoup.nodes.DataNode;
+import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
import org.jsoup.nodes.TextNode;
+import org.jsoup.safety.Cleaner;
+import org.jsoup.safety.Whitelist;
import com.google.common.collect.Lists;
public class JsoupUtils {
+ private static final String[] SAFE_TAGS = new String[] { "h1", "h2", "h3", "h4", "h5", "h6", "h7", "h8", "br", "b",
+ "i", "strong", "em", "a", "pre", "code", "img", "tt", "div", "ins", "del", "sup", "sub", "p", "ol", "ul",
+ "li", "table", "thead", "tbody", "tfoot", "th", "tr", "td", "rt", "rp", "blockquote", "dl", "dt", "dd",
+ "kbd", "q", "hr", "strike", "caption", "cite", "col", "colgroup", "small", "span", "u", "input", "video", "source"};
+
+ private static final String[] SAFE_ATTRIBUTES = new String[] { "abbr", "accept", "accept-charset", "accesskey",
+ "action", "align", "alt", "axis", "border", "cellpadding", "cellspacing", "char", "charoff", "charset",
+ "checked", "cite", "clear", "cols", "colspan", "color", "compact", "coords", "datetime", "details", "dir",
+ "disabled", "enctype", "for", "frame", "headers", "height", "hreflang", "hspace", "ismap", "label", "lang",
+ "longdesc", "maxlength", "media", "method", "multiple", "name", "nohref", "noshade", "nowrap", "prompt",
+ "readonly", "rel", "rev", "rows", "rowspan", "rules", "scope", "selected", "shape", "size", "span", "start",
+ "style", "summary", "tabindex", "target", "title", "type", "usemap", "valign", "value", "vspace", "width",
+ "itemprop", "class", "controls"};
+
+ private static final String[] SAFE_ANCHOR_SCHEMES = new String[] { "http", "https", "mailto", };
+
+ private static final Whitelist whiteList;
+
+ static {
+ whiteList = new Whitelist() {
+
+ @Override
+ protected boolean isSafeAttribute(String tagName, Element el, Attribute attr) {
+ if (attr.getKey().startsWith("data-"))
+ return true;
+ else
+ return super.isSafeAttribute(tagName, el, attr);
+ }
+
+ };
+
+ whiteList.addTags(SAFE_TAGS)
+ .addAttributes("a", "href", "title")
+ .addAttributes("img", "align", "alt", "height", "src", "title", "width")
+ .addAttributes("div", "itemscope", "itemtype")
+ .addAttributes("source", "src")
+ .addAttributes(":all", SAFE_ATTRIBUTES)
+ .addProtocols("a", "href", SAFE_ANCHOR_SCHEMES)
+ .addProtocols("blockquote", "cite", "http", "https")
+ .addProtocols("cite", "cite", "http", "https")
+ .addProtocols("img", "src", "http", "https")
+ .addProtocols("q", "cite", "http", "https")
+ .preserveRelativeLinks(true);
+ }
+
public static boolean hasAncestor(Node node, Collection<String> tags) {
Node parent = node.parentNode();
while (parent != null) {
@@ -47,4 +97,15 @@ public class JsoupUtils {
node.before(new TextNode(buffer.toString(), node.baseUri()));
node.remove();
}
+
+ public static Document clean(String html) {
+ // Use a faked baseURI, otherwise all relative urls will be stripped out
+ Document body = Jsoup.parseBodyFragment(html, "http://localhost/sanitize");
+
+ Cleaner cleaner = new Cleaner(whiteList);
+ body = cleaner.clean(body);
+
+ return body;
+ }
+
}
diff --git a/core/src/main/java/com/gitplex/server/util/TextNodeVisitor.java b/core/src/main/java/com/gitplex/server/util/TextNodeVisitor.java
index 92abe66a5e..452268e752 100644
--- a/core/src/main/java/com/gitplex/server/util/TextNodeVisitor.java
+++ b/core/src/main/java/com/gitplex/server/util/TextNodeVisitor.java
@@ -17,7 +17,7 @@ public abstract class TextNodeVisitor implements NodeVisitor {
private final List<TextNode> matchedNodes = Lists.newArrayList();
- abstract protected boolean isApplicable(TextNode node);
+ protected abstract boolean isApplicable(TextNode node);
@Override
public void head(Node node, int depth) {
diff --git a/core/src/main/java/com/gitplex/server/util/markdown/HtmlTransformer.java b/core/src/main/java/com/gitplex/server/util/markdown/HtmlTransformer.java
deleted file mode 100644
index 844925f9ed..0000000000
--- a/core/src/main/java/com/gitplex/server/util/markdown/HtmlTransformer.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.gitplex.server.util.markdown;
-
-import org.jsoup.nodes.Element;
-
-import com.gitplex.launcher.loader.ExtensionPoint;
-
-@ExtensionPoint
-public interface HtmlTransformer {
- void transform(Element body);
-}
diff --git a/core/src/main/java/com/gitplex/server/util/markdown/MarkdownProcessor.java b/core/src/main/java/com/gitplex/server/util/markdown/MarkdownProcessor.java
new file mode 100644
index 0000000000..7e10cd1115
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/util/markdown/MarkdownProcessor.java
@@ -0,0 +1,14 @@
+package com.gitplex.server.util.markdown;
+
+import javax.annotation.Nullable;
+
+import org.jsoup.nodes.Document;
+
+import com.gitplex.launcher.loader.ExtensionPoint;
+
+@ExtensionPoint
+public interface MarkdownProcessor {
+
+ void process(Document rendered, @Nullable Object context);
+
+}
diff --git a/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java b/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java
index a8d63014a1..a8edc8f1dd 100644
--- a/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/MentionParser.java
@@ -6,16 +6,16 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Document;
import org.jsoup.nodes.TextNode;
import org.jsoup.select.NodeTraversor;
-import com.google.common.collect.ImmutableSet;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.UserManager;
import com.gitplex.server.model.User;
import com.gitplex.server.util.JsoupUtils;
import com.gitplex.server.util.TextNodeVisitor;
+import com.google.common.collect.ImmutableSet;
public class MentionParser {
@@ -23,11 +23,11 @@ public class MentionParser {
private static final Pattern PATTERN = Pattern.compile("(^|\\s+)@(\\S+)(?=($|\\s+))");
- public Collection<User> parseMentions(String html) {
- return parseMentions(Jsoup.parseBodyFragment(html).body());
+ public Collection<User> parseMentions(String rendered) {
+ return parseMentions(Jsoup.parseBodyFragment(rendered));
}
- public Collection<User> parseMentions(Element body) {
+ public Collection<User> parseMentions(Document document) {
Collection<User> mentions = new HashSet<>();
TextNodeVisitor visitor = new TextNodeVisitor() {
@@ -42,7 +42,7 @@ public class MentionParser {
};
NodeTraversor tranversor = new NodeTraversor(visitor);
- tranversor.traverse(body);
+ tranversor.traverse(document);
UserManager userManager = GitPlex.getInstance(UserManager.class);
diff --git a/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java b/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java
index 9e6251df66..e3e1d56c88 100644
--- a/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/PullRequestParser.java
@@ -6,16 +6,16 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Document;
import org.jsoup.nodes.TextNode;
import org.jsoup.select.NodeTraversor;
-import com.google.common.collect.ImmutableSet;
import com.gitplex.server.GitPlex;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.util.JsoupUtils;
import com.gitplex.server.util.TextNodeVisitor;
+import com.google.common.collect.ImmutableSet;
public class PullRequestParser {
@@ -23,11 +23,11 @@ public class PullRequestParser {
private static final Pattern PATTERN = Pattern.compile("(^|\\s+)#(\\d+)(?=($|\\s+))");
- public Collection<PullRequest> parseRequests(String html) {
- return parseRequests(Jsoup.parseBodyFragment(html).body());
+ public Collection<PullRequest> parseRequests(String rendered) {
+ return parseRequests(Jsoup.parseBodyFragment(rendered));
}
- public Collection<PullRequest> parseRequests(Element body) {
+ public Collection<PullRequest> parseRequests(Document document) {
Collection<PullRequest> references = new HashSet<>();
TextNodeVisitor visitor = new TextNodeVisitor() {
@@ -42,7 +42,7 @@ public class PullRequestParser {
};
NodeTraversor tranversor = new NodeTraversor(visitor);
- tranversor.traverse(body);
+ tranversor.traverse(document);
Dao dao = GitPlex.getInstance(Dao.class);
diff --git a/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java b/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java
index 360948ca60..97d725264d 100644
--- a/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java
+++ b/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java
@@ -57,7 +57,9 @@ public class UrlResolveExtension implements HtmlRenderer.HtmlRendererExtension {
url += content;
}
- html.attr("src", resolveUrl(baseUrl, url));
+ String resolvedUrl = resolveUrl(baseUrl, url);
+ html.attr("src", resolvedUrl);
+ html.attr("data-resolved", String.valueOf(!resolvedUrl.equals(url)));
html.attr("alt", altText);
if (image.getTitle().isNotNull()) {
html.attr("title", image.getTitle().unescape());
@@ -77,7 +79,9 @@ public class UrlResolveExtension implements HtmlRenderer.HtmlRendererExtension {
ResolvedLink resolvedLink =
context.resolveLink(LinkType.LINK, link.getUrl().unescape(), null);
- html.attr("href", resolveUrl(baseUrl, resolvedLink.getUrl()));
+ String resolvedUrl = resolveUrl(baseUrl, resolvedLink.getUrl());
+ html.attr("href", resolvedUrl);
+ html.attr("data-resolved", String.valueOf(!resolvedUrl.equals(resolvedLink.getUrl())));
if (link.getTitle().isNotNull()) {
html.attr("title", link.getTitle().unescape());
}
@@ -103,7 +107,7 @@ public class UrlResolveExtension implements HtmlRenderer.HtmlRendererExtension {
if (urlToResolve.contains(":") || urlToResolve.startsWith("/") || urlToResolve.startsWith("#")) {
return urlToResolve;
} else {
- return PathUtils.normalize(PathUtils.resolveSibling(baseUrl, urlToResolve));
+ return PathUtils.normalizeDots(PathUtils.resolve(baseUrl, urlToResolve));
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/WebModule.java b/web/src/main/java/com/gitplex/server/web/WebModule.java
index 485151d457..af531e3250 100644
--- a/web/src/main/java/com/gitplex/server/web/WebModule.java
+++ b/web/src/main/java/com/gitplex/server/web/WebModule.java
@@ -20,10 +20,8 @@ import com.gitplex.launcher.loader.AbstractPlugin;
import com.gitplex.launcher.loader.AbstractPluginModule;
import com.gitplex.server.git.exception.GitException;
import com.gitplex.server.manager.UrlManager;
-import com.gitplex.server.util.markdown.HtmlTransformer;
+import com.gitplex.server.util.markdown.MarkdownProcessor;
import com.gitplex.server.util.reviewrequirement.InvalidReviewRuleException;
-import com.gitplex.server.web.component.comment.MentionTransformer;
-import com.gitplex.server.web.component.comment.PullRequestTransformer;
import com.gitplex.server.web.component.diff.DiffRenderer;
import com.gitplex.server.web.component.markdown.SourcePositionTrackExtension;
import com.gitplex.server.web.component.markdown.emoji.EmojiExtension;
@@ -36,6 +34,9 @@ import com.gitplex.server.web.util.avatar.AvatarManager;
import com.gitplex.server.web.util.avatar.DefaultAvatarManager;
import com.gitplex.server.web.util.commitmessagetransform.CommitMessageTransformer;
import com.gitplex.server.web.util.commitmessagetransform.PatternCommitMessageTransformer;
+import com.gitplex.server.web.util.markdown.MentionProcessor;
+import com.gitplex.server.web.util.markdown.PullRequestProcessor;
+import com.gitplex.server.web.util.markdown.RelativeUrlProcessor;
import com.gitplex.server.web.websocket.CodeCommentChangeBroadcaster;
import com.gitplex.server.web.websocket.CommitIndexedBroadcaster;
import com.gitplex.server.web.websocket.DefaultWebSocketManager;
@@ -80,8 +81,10 @@ public class WebModule extends AbstractPluginModule {
contribute(Extension.class, new EmojiExtension());
contribute(Extension.class, new SourcePositionTrackExtension());
- contribute(HtmlTransformer.class, new MentionTransformer());
- contribute(HtmlTransformer.class, new PullRequestTransformer());
+
+ contribute(MarkdownProcessor.class, new MentionProcessor());
+ contribute(MarkdownProcessor.class, new PullRequestProcessor());
+ contribute(MarkdownProcessor.class, new RelativeUrlProcessor());
contribute(ResourcePackScopeContribution.class, new ResourcePackScopeContribution() {
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
index b986cbadd8..4c6ef56d1b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java
@@ -184,19 +184,11 @@ abstract class InsertUrlPanel extends Panel {
@Override
protected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {
- String baseUrl = markdownEditor.getBaseUrl();
+ String baseUrl = blobRenderContext.getBaseUrl();
String referenceUrl = urlFor(ProjectBlobPage.class,
ProjectBlobPage.paramsOf(blobRenderContext.getProject(), blobIdent)).toString();
String relativized = PathUtils.relativize(baseUrl, referenceUrl);
- String relativePath;
- if (relativized.length() != 0) {
- relativePath = relativized.toString().substring("../".length());
- } else if (baseUrl.contains("/")) {
- relativePath = StringUtils.substringAfterLast(baseUrl, "/");
- } else {
- relativePath = baseUrl;
- }
- markdownEditor.insertUrl(target, isImage, relativePath, blobIdent.getName(), null);
+ markdownEditor.insertUrl(target, isImage, relativized, blobIdent.getName(), null);
onClose(target);
dropdown.close();
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
index dc631fdb6f..d109dc7ecb 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div wicket:id="container" class="markdown-editor autofit no-autosize">
+ <div wicket:id="container" class="markdown-editor autofit no-autosize name-changing-listener">
<div class="head">
<div class="actions clearfix">
<div class="pull-left normal-mode clearfix">
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
index 4b23d46b56..c0e576428c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java
@@ -38,21 +38,18 @@ import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.util.crypt.Base64;
-import org.eclipse.jgit.lib.FileMode;
import org.unbescape.javascript.JavaScriptEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.gitplex.launcher.loader.AppLoader;
import com.gitplex.server.GitPlex;
-import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.manager.MarkdownManager;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.util.facade.UserFacade;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.component.markdown.emoji.EmojiOnes;
import com.gitplex.server.web.component.modal.ModalPanel;
-import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;
import com.gitplex.server.web.util.avatar.AvatarManager;
import com.google.common.base.Charsets;
@@ -112,31 +109,23 @@ public class MarkdownEditor extends FormComponentPanel<String> {
input.setModelObject(getModelObject());
}
- @Nullable
- public String getBaseUrl() {
- if (blobRenderContext != null) {
- BlobIdent blobIdent = new BlobIdent(blobRenderContext.getBlobIdent().revision, blobRenderContext.getNewPath(),
- FileMode.REGULAR_FILE.getBits());
- ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);
- return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(blobRenderContext.getProject(), state)).toString();
- } else {
- return null;
- }
- }
-
- private String render(String markdown) {
- if (StringUtils.isNotBlank(markdown)) {
- MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);
-
+ private String renderInput(String input) {
+ if (StringUtils.isNotBlank(input)) {
// Normalize line breaks to make source position tracking information comparable
// to textarea caret position when sync edit/preview scroll bar
- markdown = StringUtils.replace(markdown, "\r\n", "\n");
- return markdownManager.render(markdown, getBaseUrl(), true);
+ input = StringUtils.replace(input, "\r\n", "\n");
+ return renderMarkdown(input);
} else {
return "<div class='message'>Nothing to preview</div>";
}
}
+ protected String renderMarkdown(String markdown) {
+ MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);
+ String rendered = markdownManager.render(markdown);
+ return markdownManager.process(rendered, blobRenderContext);
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -167,7 +156,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
if (initialSplit) {
container.add(AttributeAppender.append("class", "split-mode"));
- preview.add(new Label("rendered", render(getModelObject())) {
+ preview.add(new Label("rendered", renderInput(getModelObject())) {
@Override
public void renderHead(IHeaderResponse response) {
@@ -203,7 +192,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
switch (action) {
case "render":
String markdown = params.getParameterValue("param1").toString();
- String rendered = render(markdown);
+ String rendered = renderInput(markdown);
String script = String.format("gitplex.server.markdown.onRendered('%s', '%s');",
container.getMarkupId(), JavaScriptEscape.escapeJavaScript(rendered));
target.appendJavaScript(script);
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java
index 39b75a7aa4..e57a518de1 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java
@@ -41,6 +41,10 @@ public class MarkdownViewer extends GenericPanel<String> {
lastContentVersion = contentVersionSupport.getVersion();
}
+ protected Object getRenderContext() {
+ return null;
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -55,7 +59,9 @@ public class MarkdownViewer extends GenericPanel<String> {
protected String load() {
String markdown = MarkdownViewer.this.getModelObject();
if (markdown != null) {
- return AppLoader.getInstance(MarkdownManager.class).render(markdown, getBaseUrl(), true);
+ MarkdownManager markdownManager = AppLoader.getInstance(MarkdownManager.class);
+ String html = markdownManager.render(markdown);
+ return markdownManager.process(html, getRenderContext());
} else {
return null;
}
@@ -95,10 +101,6 @@ public class MarkdownViewer extends GenericPanel<String> {
setOutputMarkupId(true);
}
- protected String getBaseUrl() {
- return null;
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
index 57980bafd0..d206f7d3c3 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
@@ -117,7 +117,7 @@ gitplex.server.markdown = {
function render() {
/*
* in case an ajax call is ongoing we postpone the render
- * as it the ongoing call may alter the component layout
+ * as the ongoing call may alter the component layout
*/
if (gitplex.server.ajaxRequests.count != 0) {
setTimeout(render, 10);
@@ -265,6 +265,18 @@ gitplex.server.markdown = {
}
});
+ $container.on("nameChanging", function() {
+ /*
+ * Re-render the markdown in case of name changing, as rendering process
+ * may depend on name associated with the markdown. For instance, the
+ * markdown editor might be used as a blob editor, and it might be
+ * referencing relative paths to other blob files. A name change might
+ * change the directory structure of the file being edited as well, hence
+ * affect the relative path rendering
+ */
+ gitplex.server.markdown.fireInputEvent($input);
+ });
+
$edit.resizable({
autoHide: false,
handles: {"s": $edit.children(".ui-resizable-handle")},
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
index 20f76d977f..523f2fbcad 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
@@ -31,6 +31,7 @@ import com.gitplex.server.model.Review;
import com.gitplex.server.model.ReviewInvitation;
import com.gitplex.server.model.User;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.JsoupUtils;
import com.gitplex.server.util.facade.UserFacade;
import com.gitplex.server.web.behavior.dropdown.DropdownHover;
import com.gitplex.server.web.component.avatar.AvatarLink;
@@ -130,7 +131,8 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
@Override
protected Component newContent(String id) {
MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);
- Label label = new Label(id, markdownManager.render(reviewNote, null, true));
+ String rendered = markdownManager.render(reviewNote);
+ Label label = new Label(id, JsoupUtils.clean(rendered).body().html());
label.add(AttributeAppender.append("class", "review-note"));
label.setEscapeModelStrings(false);
return label;
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.java
index 116e5a45cd..ec4b9d20d2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/ProjectBlobPage.java
@@ -104,6 +104,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {
private static final String PARAM_PATH = "path";
+ private static final String PARAM_INITIAL_NEW_PATH = "initial-new-path";
+
private static final String PARAM_REQUEST = "request";
private static final String PARAM_COMMENT = "comment";
@@ -166,6 +168,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {
state.commentId = params.get(PARAM_COMMENT).toOptionalLong();
state.query = params.get(PARAM_QUERY).toString();
+
+ state.initialNewPath = params.get(PARAM_INITIAL_NEW_PATH).toString();
if (state.mode == Mode.ADD || state.mode == Mode.EDIT || state.mode == Mode.DELETE) {
if (!isOnBranch())
@@ -736,6 +740,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {
params.add(PARAM_MODE, state.mode.name().toLowerCase());
if (state.query != null)
params.add(PARAM_QUERY, state.query);
+ if (state.initialNewPath != null)
+ params.add(PARAM_INITIAL_NEW_PATH, state.initialNewPath);
}
public static PageParameters paramsOf(Project project, State state) {
@@ -802,7 +808,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {
public BlobIdent getBlobIdent() {
return state.blobIdent;
}
-
+
@Override
public TextRange getMark() {
return state.mark;
@@ -929,6 +935,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {
public Mode mode = Mode.VIEW;
public String query;
+
+ public String initialNewPath;
public State(BlobIdent blobIdent) {
this.blobIdent = blobIdent;
@@ -942,6 +950,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {
@Override
public void onModeChange(AjaxRequestTarget target, Mode mode) {
+ state.initialNewPath = null;
+
/*
* User might be changing blob name when adding a file, and onModeChange will be called.
* In this case, we only need to re-create blob content
@@ -1027,6 +1037,49 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {
target.appendJavaScript("Wicket.WebSocket.send('RenderCallback');");
}
+ @Override
+ public String getInitialNewPath() {
+ return state.initialNewPath;
+ }
+
+ @Override
+ public String getBasePath() {
+ String path;
+ if (state.mode == Mode.ADD || state.mode == Mode.EDIT) {
+ path = getNewPath();
+ if (path != null) {
+ if (path.contains("/"))
+ path = StringUtils.substringBeforeLast(path, "/");
+ else
+ path = null;
+ } else {
+ throw new IllegalStateException();
+ }
+ } else if (state.blobIdent.isTree()) {
+ path = state.blobIdent.path;
+ } else if (state.blobIdent.path.contains("/")) {
+ path = StringUtils.substringBeforeLast(state.blobIdent.path, "/");
+ } else {
+ path = null;
+ }
+ return path;
+ }
+
+ @Override
+ public String getBaseUrl() {
+ String revision = state.blobIdent.revision;
+ BlobIdent blobIdent = new BlobIdent(revision, getBasePath(), FileMode.TREE.getBits());
+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);
+ return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject(), state)).toString();
+ }
+
+ @Override
+ public String getRootUrl() {
+ BlobIdent blobIdent = new BlobIdent(state.blobIdent.revision, null, FileMode.TREE.getBits());
+ return RequestCycle.get().urlFor(ProjectBlobPage.class,
+ ProjectBlobPage.paramsOf(getProject(), blobIdent)).toString();
+ }
+
@Override
public String getNewPath() {
BlobNavigator blobNavigator = (BlobNavigator) get(BLOB_NAVIGATOR_ID);
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigator.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigator.java
index 127af5a426..96a31327a0 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigator.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/navigator/BlobNavigator.java
@@ -245,8 +245,8 @@ public class BlobNavigator extends Panel {
Form<?> form = new Form<Void>("form");
lastSegment.add(form);
String name;
- if (context.getMode() == Mode.ADD)
- name = "";
+ if (context.getMode() == Mode.ADD)
+ name = context.getInitialNewPath();
else if (file.path.contains("/"))
name = StringUtils.substringAfterLast(file.path, "/");
else
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.css b/web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.css
index 5a1e3cf3ca..42611175b1 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/project-blob.css
@@ -98,3 +98,17 @@
background: #EEE;
}
+.markdown-rendered a+.missing, img+.missing {
+ color: #333;
+ background: #FDB3B3;
+ margin-left: 4px;
+ padding: 0 2px;
+}
+.markdown-rendered img+.missing {
+ vertical-align: middle;
+}
+
+.markdown-rendered .missing+.add-missing {
+ color: #05B305;
+ margin-left: 4px;
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRenderContext.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRenderContext.java
index d9000deca2..c972b0456c 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRenderContext.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/BlobRenderContext.java
@@ -35,6 +35,29 @@ public interface BlobRenderContext extends Serializable {
String getMarkUrl(TextRange mark);
+ /**
+ * Base path of current blob, which can be used to calculate relative paths
+ * for other files referenced by current blob
+ *
+ * @return
+ * base path of current blob for relative path calculation
+ *
+ * @return
+ */
+ @Nullable
+ String getBasePath();
+
+ /**
+ * Base url of current blob, which can be used to calculate relative urls
+ * for other files referenced by current blob
+ *
+ * @return
+ * base url of current blob for relative url calculation
+ */
+ String getBaseUrl();
+
+ String getRootUrl();
+
Mode getMode();
boolean isOnBranch();
@@ -62,10 +85,19 @@ public interface BlobRenderContext extends Serializable {
* @return
* new path of the file being added/edited, or <tt>null</tt> if new path is not specified yet
* @throws
- * IllegalStateException if call this method if file is not being added or edited
+ * IllegalStateException if file is not being added/edited
*/
@Nullable
String getNewPath();
+ /**
+ * Get initial new path when add a file
+ *
+ * @return
+ * initial path of the file being added, or <tt>null</tt> if no initial path is specified
+ */
+ @Nullable
+ String getInitialNewPath();
+
String getAutosaveKey();
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index 63adebd1c4..8b68ed855b 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -108,7 +108,7 @@ public class CommitOptionPanel extends Panel {
@Nullable
private String getOldPath() {
- return context.getBlobIdent().isFile()?context.getBlobIdent().path:null;
+ return context.getMode()!=Mode.ADD? context.getBlobIdent().path: null;
}
private String getDefaultCommitMessage() {
@@ -317,7 +317,6 @@ public class CommitOptionPanel extends Panel {
Map<String, BlobContent> newBlobs = new HashMap<>();
if (newContentProvider != null) {
-
if (GitPlex.getInstance(ProjectManager.class).isModificationNeedsQualityCheck(SecurityUtils.getUser(),
context.getProject(), context.getBlobIdent().revision, context.getNewPath())) {
CommitOptionPanel.this.error("Adding of file '" + context.getNewPath() + "' need to be reviewed/verified. "
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditPanel.java
index 820f2a140d..d9fa867e1d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/BlobEditPanel.java
@@ -15,6 +15,7 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
+import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
import com.gitplex.server.web.page.project.blob.navigator.BlobNameChanging;
import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;
@@ -105,10 +106,11 @@ public abstract class BlobEditPanel extends Panel {
}));
- add(recreateBehavior = new AbstractDefaultAjaxBehavior() {
+ add(recreateBehavior = new AbstractPostAjaxBehavior() {
@Override
protected void respond(AjaxRequestTarget target) {
+ // recreate content editor as different name might be using different editor
context.onModeChange(target, Mode.ADD);
}
@@ -125,15 +127,15 @@ public abstract class BlobEditPanel extends Panel {
@Override
public void onEvent(IEvent<?> event) {
super.onEvent(event);
- if ((event.getPayload() instanceof BlobNameChanging) && context.getMode() == Mode.ADD) {
+ if (event.getPayload() instanceof BlobNameChanging) {
/*
* Blob name is changing and current editor might be inappropriate for current
* blob name, so we need to re-create the editor if the form does not have
* any change yet
*/
BlobNameChanging payload = (BlobNameChanging) event.getPayload();
- String script = String.format("gitplex.server.blobEdit.checkClean('%s', %s);",
- getMarkupId(), recreateBehavior.getCallbackFunction());
+ String script = String.format("gitplex.server.blobEdit.onNameChanging('%s', %s, %s);",
+ getMarkupId(), context.getMode() == Mode.ADD, recreateBehavior.getCallbackFunction());
payload.getHandler().appendJavaScript(script);
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/blob-edit.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/blob-edit.js
index 87ac943e73..158fd04869 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/blob-edit.js
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/edit/blob-edit.js
@@ -66,8 +66,12 @@ gitplex.server.blobEdit = {
$body.children(".commit-options").show();
}
},
- checkClean: function(containerId, recreateCallback) {
- if ($("#" + containerId + ">.blob-edit>.body form.dirty").length == 0)
+ onNameChanging: function(containerId, addingFile, recreateCallback) {
+ var $body = $("#" + containerId + ">.blob-edit>.body");
+ var contentModified = $body.find("form.dirty").length != 0;
+ if (addingFile && !contentModified)
recreateCallback();
+ else
+ $body.find(".name-changing-listener").trigger("nameChanging");
}
};
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
index e9f77b0866..04bf155799 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
@@ -240,11 +240,10 @@ public class FolderViewPanel extends Panel {
}, null) {
@Override
- protected String getBaseUrl() {
- ProjectBlobPage.State state = new ProjectBlobPage.State(readmeModel.getObject());
- return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(context.getProject(), state)).toString();
+ protected Object getRenderContext() {
+ return context;
}
-
+
});
add(readmeContainer);
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index c62cd7d281..5470f5c183 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -8,6 +8,8 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.model.Model;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.MarkdownManager;
import com.gitplex.server.util.ContentDetector;
import com.gitplex.server.web.component.markdown.MarkdownEditor;
import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;
@@ -44,7 +46,15 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
return MarkdownBlobEditor.this.getAutosaveKey();
}
+ @Override
+ protected String renderMarkdown(String markdown) {
+ MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);
+ String html = markdownManager.render(markdown);
+ return markdownManager.process(html, context);
+ }
+
});
+
if (context.getMode() != Mode.EDIT) {
input.add(AttributeAppender.append("class", "no-autofocus"));
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java
index 9c4bc34f14..ff508c72c2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java
@@ -6,7 +6,6 @@ import org.apache.wicket.model.Model;
import com.gitplex.server.git.Blob;
import com.gitplex.server.web.component.markdown.MarkdownViewer;
-import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;
import com.gitplex.server.web.page.project.blob.render.view.BlobViewPanel;
@@ -25,9 +24,8 @@ public class MarkdownBlobViewPanel extends BlobViewPanel {
add(new MarkdownViewer("markdown", Model.of(blob.getText().getContent()), null) {
@Override
- protected String getBaseUrl() {
- ProjectBlobPage.State state = new ProjectBlobPage.State(context.getBlobIdent());
- return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(context.getProject(), state)).toString();
+ protected Object getRenderContext() {
+ return context;
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
index b89e69a8d1..d348179e46 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
@@ -148,7 +148,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {
sourceFormat.getIndentType(),
sourceFormat.getTabSize(),
sourceFormat.getLineWrapMode(),
- context.getMode() == Mode.EDIT,
+ context.getMode() == Mode.EDIT || context.getInitialNewPath() != null,
autosaveKey);
response.render(OnDomReadyHeaderItem.forScript(script));
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java
index 29e9a7d5bd..b918f1c09f 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java
@@ -34,7 +34,7 @@ public class SymbolLinkPanel extends BlobViewPanel {
super.onInitialize();
Blob blob = context.getProject().getBlob(context.getBlobIdent());
- String targetPath = PathUtils.normalize(
+ String targetPath = PathUtils.normalizeDots(
PathUtils.resolveSibling(context.getBlobIdent().path, blob.getText().getContent()));
if (targetPath != null && (targetPath.startsWith("/") || new File(targetPath).isAbsolute()))
targetPath = null;
diff --git a/web/src/main/java/com/gitplex/server/web/util/MissingReferencesMarker.java b/web/src/main/java/com/gitplex/server/web/util/MissingReferencesMarker.java
new file mode 100644
index 0000000000..40168c6dbb
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/util/MissingReferencesMarker.java
@@ -0,0 +1,84 @@
+package com.gitplex.server.web.util;
+
+import java.io.IOException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.treewalk.TreeWalk;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.select.NodeVisitor;
+
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;
+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import com.gitplex.utils.PathUtils;
+
+/**
+ * This visitor marks missing blob references in the document
+ *
+ * @author robin
+ *
+ */
+public class MissingReferencesMarker implements NodeVisitor {
+
+ private final BlobRenderContext context;
+
+ private final RevCommit commit;
+
+ public MissingReferencesMarker(BlobRenderContext context) {
+ this.context = context;
+ Repository repository = context.getProject().getRepository();
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ commit = revWalk.parseCommit(repository.resolve(context.getBlobIdent().revision));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void head(Node node, int depth) {
+ }
+
+ @Override
+ public void tail(Node node, int depth) {
+ if (node.nodeName().equals("a")) {
+ String href = node.attr("href");
+ if (StringUtils.isNotBlank(href) && "true".equals(node.attr("data-resolved"))) {
+ Element link = (Element) node;
+ Repository repository = context.getProject().getRepository();
+ try {
+ String referencedPath = PathUtils.parseRelative(href, context.getRootUrl());
+ if (referencedPath != null && referencedPath.startsWith("/")) {
+ referencedPath = referencedPath.substring(1);
+ if (TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null) {
+ link.parent().append("<span class='missing'>!!missing!!</span>");
+ if (context.getMode() != Mode.ADD && context.getMode() != Mode.EDIT
+ && SecurityUtils.canModify(context.getProject(), context.getBlobIdent().revision, referencedPath)) {
+ ProjectBlobPage.State state = new ProjectBlobPage.State();
+ state.blobIdent = context.getBlobIdent();
+ state.mode = Mode.ADD;
+
+ String basePath = context.getBasePath();
+ state.initialNewPath = PathUtils.relativize(basePath, referencedPath);
+ CharSequence urlToAddFile = RequestCycle.get().urlFor(ProjectBlobPage.class,
+ ProjectBlobPage.paramsOf(context.getProject(), state));
+ String htmlToAddFile = String.format(
+ "<a href='%s' title='Add this file' class='add-missing'><i class='fa fa-plus'></i></a>",
+ urlToAddFile.toString());
+ link.parent().append(htmlToAddFile);
+ }
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java b/web/src/main/java/com/gitplex/server/web/util/markdown/MentionProcessor.java
similarity index 63%
rename from web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java
rename to web/src/main/java/com/gitplex/server/web/util/markdown/MentionProcessor.java
index 448441b171..118f7489e0 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/MentionTransformer.java
+++ b/web/src/main/java/com/gitplex/server/web/util/markdown/MentionProcessor.java
@@ -1,18 +1,18 @@
-package com.gitplex.server.web.component.comment;
+package com.gitplex.server.web.util.markdown;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Document;
import com.gitplex.server.model.User;
-import com.gitplex.server.util.markdown.HtmlTransformer;
+import com.gitplex.server.util.markdown.MarkdownProcessor;
import com.gitplex.server.util.markdown.MentionParser;
import com.gitplex.server.web.page.user.UserProfilePage;
-public class MentionTransformer extends MentionParser implements HtmlTransformer {
+public class MentionProcessor extends MentionParser implements MarkdownProcessor {
@Override
- public void transform(Element body) {
- parseMentions(body);
+ public void process(Document document, Object context) {
+ parseMentions(document);
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java b/web/src/main/java/com/gitplex/server/web/util/markdown/PullRequestProcessor.java
similarity index 63%
rename from web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java
rename to web/src/main/java/com/gitplex/server/web/util/markdown/PullRequestProcessor.java
index 27a1ae7f22..33818ed7b9 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/PullRequestTransformer.java
+++ b/web/src/main/java/com/gitplex/server/web/util/markdown/PullRequestProcessor.java
@@ -1,18 +1,18 @@
-package com.gitplex.server.web.component.comment;
+package com.gitplex.server.web.util.markdown;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Document;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.util.markdown.HtmlTransformer;
+import com.gitplex.server.util.markdown.MarkdownProcessor;
import com.gitplex.server.util.markdown.PullRequestParser;
import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;
-public class PullRequestTransformer extends PullRequestParser implements HtmlTransformer {
+public class PullRequestProcessor extends PullRequestParser implements MarkdownProcessor {
@Override
- public void transform(Element body) {
- parseRequests(body);
+ public void process(Document document, Object context) {
+ parseRequests(document);
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/util/markdown/RelativeUrlProcessor.java b/web/src/main/java/com/gitplex/server/web/util/markdown/RelativeUrlProcessor.java
new file mode 100644
index 0000000000..729fd6365a
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/util/markdown/RelativeUrlProcessor.java
@@ -0,0 +1,121 @@
+package com.gitplex.server.web.util.markdown;
+
+import java.io.IOException;
+import java.net.URLDecoder;
+
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.treewalk.TreeWalk;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.select.NodeTraversor;
+import org.jsoup.select.NodeVisitor;
+
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.model.Project;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.markdown.MarkdownProcessor;
+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;
+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import com.gitplex.utils.PathUtils;
+import com.google.common.base.Charsets;
+
+public class RelativeUrlProcessor implements MarkdownProcessor {
+
+ @Override
+ public void process(Document rendered, Object context) {
+ if (context instanceof BlobRenderContext) {
+ BlobRenderContext blobRenderContext = (BlobRenderContext) context;
+
+ Project project = blobRenderContext.getProject();
+ Repository repository = project.getRepository();
+ RevCommit commit;
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ commit = revWalk.parseCommit(repository.resolve(blobRenderContext.getBlobIdent().revision));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ new NodeTraversor(new NodeVisitor() {
+
+ @Override
+ public void head(Node node, int depth) {
+ }
+
+ @Override
+ public void tail(Node node, int depth) {
+ if (node.nodeName().equals("a")) {
+ String url = node.attr("href");
+ if (url != null) {
+ url = url.trim();
+ if (isRelative(url)) {
+ Element element = (Element) node;
+ element.attr("href", resolveUrl(blobRenderContext.getBaseUrl(), url));
+ try {
+ String path = URLDecoder.decode(url, Charsets.UTF_8.name());
+ String basePath = blobRenderContext.getBasePath();
+ String referencedPath = PathUtils.resolve(basePath, path);
+ referencedPath = GitUtils.normalizePath(referencedPath);
+ if (referencedPath == null || TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null) {
+ Element missingElement = element.after("<span class='missing'>!!missing!!</span>");
+ BlobIdent blobIdent = blobRenderContext.getBlobIdent();
+ Mode mode = blobRenderContext.getMode();
+ if (referencedPath != null && mode != Mode.ADD && mode != Mode.EDIT
+ && SecurityUtils.canModify(project, blobIdent.revision, referencedPath)) {
+ ProjectBlobPage.State state = new ProjectBlobPage.State();
+ state.blobIdent = blobRenderContext.getBlobIdent();
+ state.mode = Mode.ADD;
+ state.initialNewPath = path;
+ CharSequence urlToAddFile = RequestCycle.get().urlFor(ProjectBlobPage.class,
+ ProjectBlobPage.paramsOf(project, state));
+ String htmlToAddFile = String.format(
+ "<a href='%s' title='Add this file' class='add-missing'><i class='fa fa-plus'></i></a>",
+ urlToAddFile.toString());
+ missingElement.after(htmlToAddFile);
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ } else if (node.nodeName().equals("img")) {
+ String url = node.attr("src");
+ if (url != null) {
+ url = url.trim();
+ if (isRelative(url)) {
+ Element element = (Element) node;
+ element.attr("src", resolveUrl(blobRenderContext.getBaseUrl(), url));
+ try {
+ String basePath = blobRenderContext.getBasePath();
+ String referencedPath = PathUtils.resolve(basePath, URLDecoder.decode(url, Charsets.UTF_8.name()));
+ referencedPath = GitUtils.normalizePath(referencedPath);
+ if (referencedPath == null || TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null) {
+ element.after("<span class='missing'>!!missing!!</span>");
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+ }
+ }).traverse(rendered);
+
+ }
+ }
+
+ private boolean isRelative(String url) {
+ return !url.contains(":") && !url.startsWith("/") && !url.startsWith("#");
+ }
+
+ private String resolveUrl(String baseUrl, String urlToResolve) {
+ return PathUtils.normalizeDots(PathUtils.resolve(baseUrl, urlToResolve));
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java
index 2aeed1a582..349d28cb9f 100644
--- a/web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java
@@ -53,7 +53,7 @@ class BundleAwareResourceReferenceFactory implements IResourceReferenceFactory {
possibleName = PathUtils.resolve(referenceParentPath, relativePath);
else
possibleName = relativePath.toString();
- possibleName = PathUtils.normalize(possibleName);
+ possibleName = PathUtils.normalizeDots(possibleName);
if (possibleName != null) {
Key possibleKey = new Key(headerItem.getReference().getScope().getName(), possibleName,
key.getLocale(), key.getStyle(), key.getVariation());