The Unified and Autonomous Development Platform
Fix the issue that downloaded embeding image in markdown corrupts
Robin Shencea12217aaa6
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex fd5241a3f6..35ab1fe271 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -415,6 +415,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {public void insertUrl(AjaxRequestTarget target, boolean isImage, String url,String name, @Nullable String replaceMessage) {+ if (isImage && getBlobRenderContext() != null)+ url = getBlobRenderContext().appendRaw(url);String script = String.format("onedev.server.markdown.insertUrl('%s', %s, '%s', '%s', %s);",container.getMarkupId(), isImage, StringEscapeUtils.escapeEcmaScript(url),StringEscapeUtils.escapeEcmaScript(name),diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 95ee6e0eec..a030c5f81d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -4,6 +4,7 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.io.IOException;import java.io.Serializable;+import java.net.URISyntaxException;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -14,6 +15,8 @@ import javax.annotation.Nullable;import org.apache.commons.lang3.SerializationUtils;import org.apache.commons.lang3.StringUtils;+import org.apache.http.NameValuePair;+import org.apache.http.client.utils.URIBuilder;import org.apache.shiro.subject.Subject;import org.apache.shiro.util.ThreadContext;import org.apache.wicket.Component;@@ -32,7 +35,6 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;-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.visit.IVisit;@@ -122,6 +124,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {private static final String PARAM_MARK = "mark";+ private static final String PARAM_RAW = "raw";+private static final String REVISION_PICKER_ID = "revisionPicker";private static final String BLOB_NAVIGATOR_ID = "blobNavigator";@@ -184,10 +188,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {if (!SecurityUtils.canModify(getProject(), state.blobIdent.revision, path))unauthorized();}-- WebRequest request = (WebRequest) RequestCycle.get().getRequest();- String accept = request.getHeader("Accept");- if (accept != null && !accept.startsWith("text/html") && state.blobIdent.isFile()) {++ Boolean raw = params.get(PARAM_RAW).toOptionalBoolean();+ if (raw != null && raw) {RequestCycle.get().scheduleRequestHandlerAfterCurrent(new ResourceReferenceRequestHandler(new RawBlobResourceReference(), getPageParameters()));}@@ -1196,4 +1199,18 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {return SecurityUtils.canReadCode(getProject().getFacade());}+ @Override+ public String appendRaw(String url) {+ try {+ URIBuilder builder = new URIBuilder(url);+ for (NameValuePair pair: builder.getQueryParams()) {+ if (pair.getName().equals(PARAM_RAW))+ return url;+ }+ return builder.addParameter(PARAM_RAW, "true").build().toString();+ } catch (URISyntaxException e) {+ throw new RuntimeException(e);+ }+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex b5f9bcb443..f317d3ac32 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -103,4 +103,5 @@ public interface BlobRenderContext extends Serializable {String getAutosaveKey();+ String appendRaw(String url);}diff --git a/product/src/test/java/io/onedev/server/product/Test.java b/product/src/test/java/io/onedev/server/product/Test.javaindex 25b80b8b77..457a49af9a 100644--- a/product/src/test/java/io/onedev/server/product/Test.java+++ b/product/src/test/java/io/onedev/server/product/Test.java@@ -1,11 +1,9 @@package io.onedev.server.product;-import java.io.IOException;-public class Test {@org.junit.Test- public void test() throws IOException {+ public void test() {}}\ No newline at end of file