The Unified and Autonomous Development Platform
Fix the issue that some valid reference can be marked as missing in markdown
Robin Shen5141645b8259
diff --git a/web/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex 389db34dc0..514893eda3 100644--- a/web/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/web/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -209,7 +209,7 @@ abstract class InsertUrlPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {blobIdent = new BlobIdent(context.getBlobIdent().revision, blobIdent.path, blobIdent.mode);- String baseUrl = context.getBaseUrl();+ String baseUrl = context.getDirectoryUrl();String referenceUrl = urlFor(ProjectBlobPage.class,ProjectBlobPage.paramsOf(context.getProject(), blobIdent)).toString();String relativized = PathUtils.relativize(baseUrl, referenceUrl);diff --git a/web/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css b/web/src/main/java/io/onedev/server/web/component/sidebar/sidebar.cssindex 05608a8226..fbd0697971 100644--- a/web/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css+++ b/web/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css@@ -13,6 +13,7 @@}.sidebar .fa, .sidebar .fa-ext {margin-right: 4px;+ font-size: 16px;}.sidebar>.tabs {position: absolute;@@ -27,7 +28,7 @@.sidebar>.tabs>li>a {display: block;border-left: 4px solid #FAFAFA;- padding: 12px 8px;+ padding: 12px 6px;text-decoration: none;color: #616161;font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;diff --git a/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex f3482db94a..3ee60ea1ae 100644--- a/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -1057,7 +1057,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}@Override- public String getBasePath() {+ public String getDirectory() {String path;if (state.mode == Mode.ADD || state.mode == Mode.EDIT) {path = getNewPath();@@ -1080,15 +1080,15 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}@Override- public String getBaseUrl() {+ public String getDirectoryUrl() {String revision = state.blobIdent.revision;- BlobIdent blobIdent = new BlobIdent(revision, getBasePath(), FileMode.TREE.getBits());+ BlobIdent blobIdent = new BlobIdent(revision, getDirectory(), FileMode.TREE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject(), state)).toString();}@Override- public String getRootUrl() {+ public String getRootDirectoryUrl() {BlobIdent blobIdent = new BlobIdent(state.blobIdent.revision, null, FileMode.TREE.getBits());return RequestCycle.get().urlFor(ProjectBlobPage.class,ProjectBlobPage.paramsOf(getProject(), blobIdent)).toString();diff --git a/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex 25fcbaa47b..b0e328cc37 100644--- a/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -38,27 +38,25 @@ 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+ * Get directory of the blob. If the blob itself is a directory, the blob path will be returned instead** @return- * base path of current blob for relative path calculation+ * directory of current blob, or <tt>null</tt> for repository root** @return*/@Nullable- String getBasePath();+ String getDirectory();/**- * Base url of current blob, which can be used to calculate relative urls- * for other files referenced by current blob+ * Url to directory of the blob. Refer to {@link #getDirectory()}** @return- * base url of current blob for relative url calculation+ * url to directory of the blob*/- String getBaseUrl();+ String getDirectoryUrl();- String getRootUrl();+ String getRootDirectoryUrl();Mode getMode();diff --git a/web/src/main/java/io/onedev/server/web/util/MissingReferencesMarker.java b/web/src/main/java/io/onedev/server/web/util/MissingReferencesMarker.javadeleted file mode 100644index 2e8bbdd948..0000000000--- a/web/src/main/java/io/onedev/server/web/util/MissingReferencesMarker.java+++ /dev/null@@ -1,84 +0,0 @@-package io.onedev.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 io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.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/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java b/web/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.javaindex 164a0f3b4e..7dd741f507 100644--- a/web/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java+++ b/web/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java@@ -3,6 +3,7 @@ package io.onedev.server.web.util.markdown;import java.io.IOException;import java.net.URLDecoder;+import org.apache.commons.lang.StringUtils;import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;@@ -25,6 +26,7 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.utils.PathUtils;+import io.onedev.utils.UrlUtils;public class RelativeUrlProcessor implements MarkdownProcessor {@@ -52,22 +54,22 @@ public class RelativeUrlProcessor implements MarkdownProcessor {public void tail(Node node, int depth) {if (node.nodeName().equals("a")) {String url = node.attr("href");- if (url != null) {+ if (StringUtils.isNotBlank(url)) {url = url.trim();- if (isRelative(url)) {+ if (UrlUtils.isRelative(url) && !url.startsWith("#")) {Element element = (Element) node;- element.attr("href", resolveUrl(blobRenderContext.getBaseUrl(), url));+ element.attr("href", resolveUrl(blobRenderContext.getDirectoryUrl(), url));try {- String path = URLDecoder.decode(url, Charsets.UTF_8.name());- String basePath = blobRenderContext.getBasePath();- String referencedPath = PathUtils.resolve(basePath, path);+ String path = UrlUtils.trimHashAndQuery(URLDecoder.decode(url, Charsets.UTF_8.name()));+ String directory = blobRenderContext.getDirectory();+ String referencedPath = PathUtils.resolve(directory, path);referencedPath = GitUtils.normalizePath(referencedPath);- if (referencedPath == null || TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null) {+ if (referencedPath != null && TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null) {element.after("<span class='missing'>!!missing!!</span>");Element missingElement = element.nextElementSibling();BlobIdent blobIdent = blobRenderContext.getBlobIdent();Mode mode = blobRenderContext.getMode();- if (referencedPath != null && mode != Mode.ADD && mode != Mode.EDIT+ if (mode != Mode.ADD && mode != Mode.EDIT&& SecurityUtils.canModify(project, blobIdent.revision, referencedPath)) {ProjectBlobPage.State state = new ProjectBlobPage.State();state.blobIdent = blobRenderContext.getBlobIdent();@@ -88,16 +90,16 @@ public class RelativeUrlProcessor implements MarkdownProcessor {}} else if (node.nodeName().equals("img")) {String url = node.attr("src");- if (url != null) {+ if (StringUtils.isNotBlank(url)) {url = url.trim();- if (isRelative(url)) {+ if (UrlUtils.isRelative(url) && !url.startsWith("#")) {Element element = (Element) node;- element.attr("src", resolveUrl(blobRenderContext.getBaseUrl(), url));+ element.attr("src", resolveUrl(blobRenderContext.getDirectoryUrl(), url));try {- String basePath = blobRenderContext.getBasePath();- String referencedPath = PathUtils.resolve(basePath, URLDecoder.decode(url, Charsets.UTF_8.name()));+ String basePath = blobRenderContext.getDirectory();+ String referencedPath = PathUtils.resolve(basePath, UrlUtils.trimHashAndQuery(URLDecoder.decode(url, Charsets.UTF_8.name())));referencedPath = GitUtils.normalizePath(referencedPath);- if (referencedPath == null || TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null) {+ if (referencedPath != null && TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null) {element.after("<span class='missing'>!!missing!!</span>");}} catch (IOException e) {@@ -112,10 +114,6 @@ public class RelativeUrlProcessor implements MarkdownProcessor {}}- 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));}