The Unified and Autonomous Development Platform
fix issue #54: Errors when pasting an image from clipboard
Robin Shen65749cd482ef
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 7084a25a2f..79857f755e 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -262,6 +262,7 @@ import io.onedev.server.web.WebApplicationConfigurator;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.avatar.DefaultAvatarManager;import io.onedev.server.web.component.diff.DiffRenderer;+import io.onedev.server.web.component.markdown.AttachmentUploadServlet;import io.onedev.server.web.component.markdown.SourcePositionTrackExtension;import io.onedev.server.web.component.markdown.emoji.EmojiExtension;import io.onedev.server.web.component.taskbutton.TaskButton;@@ -535,6 +536,8 @@ public class CoreModule extends AbstractPluginModule {bind(WebSocketPolicy.class).toProvider(WebSocketPolicyProvider.class);bind(EditSupportRegistry.class).to(DefaultEditSupportRegistry.class);bind(WebSocketManager.class).to(DefaultWebSocketManager.class);++ bind(AttachmentUploadServlet.class);contributeFromPackage(EditSupport.class, EditSupport.class);diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java b/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.javaindex ec5b29a00d..5eef8033a8 100644--- a/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java+++ b/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java@@ -3,6 +3,7 @@ package io.onedev.server.web;import java.io.IOException;import javax.inject.Inject;+import javax.inject.Singleton;import javax.servlet.ServletException;import javax.servlet.ServletRequest;import javax.servlet.ServletResponse;@@ -13,6 +14,7 @@ import org.apache.wicket.protocol.http.WicketServlet;import io.onedev.server.persistence.annotation.Sessional;+@Singletonpublic class DefaultWicketServlet extends WicketServlet {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.javaindex c6b0ea6157..96f90d588b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.java@@ -5,6 +5,7 @@ import java.net.URLDecoder;import java.net.URLEncoder;import java.nio.charset.StandardCharsets;+import javax.inject.Singleton;import javax.servlet.ServletException;import javax.servlet.http.HttpServlet;import javax.servlet.http.HttpServletRequest;@@ -15,11 +16,15 @@ import org.apache.wicket.util.crypt.Base64;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import io.onedev.server.persistence.annotation.Sessional;+@SuppressWarnings("serial")+@Singletonpublic class AttachmentUploadServlet extends HttpServlet {private static final Logger logger = LoggerFactory.getLogger(AttachmentUploadServlet.class);+ @Sessional@Overrideprotected void doPost(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException {diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.javaindex 1fc8195eba..23f4ba9ee5 100644--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java@@ -43,6 +43,8 @@ public class ProductServletConfigurator implements ServletConfigurator {private final WicketServlet wicketServlet;+ private final AttachmentUploadServlet attachmentUploadServlet;+private final ServletContainer jerseyServlet;private final WebSocketManager webSocketManager;@@ -51,7 +53,7 @@ public class ProductServletConfigurator implements ServletConfigurator {public ProductServletConfigurator(ServerConfig serverConfig, ShiroFilter shiroFilter, GitFilter gitFilter,GitPreReceiveCallback preReceiveServlet, GitPostReceiveCallback postReceiveServlet,WicketServlet wicketServlet, WebSocketManager webSocketManager,- ServletContainer jerseyServlet) {+ AttachmentUploadServlet attachmentUploadServlet, ServletContainer jerseyServlet) {this.serverConfig = serverConfig;this.shiroFilter = shiroFilter;this.gitFilter = gitFilter;@@ -60,6 +62,7 @@ public class ProductServletConfigurator implements ServletConfigurator {this.wicketServlet = wicketServlet;this.webSocketManager = webSocketManager;this.jerseyServlet = jerseyServlet;+ this.attachmentUploadServlet = attachmentUploadServlet;}@Override@@ -70,30 +73,23 @@ public class ProductServletConfigurator implements ServletConfigurator {context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, OneWebEnvironment.class.getName());context.addEventListener(new EnvironmentLoaderListener());- FilterHolder shiroFilterHolder = new FilterHolder(shiroFilter);- context.addFilter(shiroFilterHolder, "/*", EnumSet.allOf(DispatcherType.class));+ context.addFilter(new FilterHolder(shiroFilter), "/*", EnumSet.allOf(DispatcherType.class));- FilterHolder gitFilterHolder = new FilterHolder(gitFilter);- context.addFilter(gitFilterHolder, "/*", EnumSet.allOf(DispatcherType.class));+ context.addFilter(new FilterHolder(gitFilter), "/*", EnumSet.allOf(DispatcherType.class));- ServletHolder preReceiveServletHolder = new ServletHolder(preReceiveServlet);- context.addServlet(preReceiveServletHolder, GitPreReceiveCallback.PATH + "/*");+ context.addServlet(new ServletHolder(preReceiveServlet), GitPreReceiveCallback.PATH + "/*");- ServletHolder postReceiveServletHolder = new ServletHolder(postReceiveServlet);- context.addServlet(postReceiveServletHolder, GitPostReceiveCallback.PATH + "/*");+ context.addServlet(new ServletHolder(postReceiveServlet), GitPostReceiveCallback.PATH + "/*");- ServletHolder wicketServletHolder = new ServletHolder(wicketServlet);-/** Add wicket servlet as the default servlet which will serve all requests failed to* match a path pattern*/- context.addServlet(wicketServletHolder, "/");+ context.addServlet(new ServletHolder(wicketServlet), "/");- context.addServlet(AttachmentUploadServlet.class, "/attachment_upload");+ context.addServlet(new ServletHolder(attachmentUploadServlet), "/attachment_upload");- ServletHolder imgServletHolder = new ServletHolder(new ClasspathAssetServlet(Img.class));- context.addServlet(imgServletHolder, "/img/*");+ context.addServlet(new ServletHolder(new ClasspathAssetServlet(Img.class)), "/img/*");context.getSessionHandler().addEventListener(new HttpSessionListener() {@@ -116,8 +112,7 @@ public class ProductServletConfigurator implements ServletConfigurator {context.addServlet(fileServletHolder, "/site/*");context.addServlet(fileServletHolder, "/robots.txt");- ServletHolder jerseyServletHolder = new ServletHolder(jerseyServlet);- context.addServlet(jerseyServletHolder, "/rest/*");+ context.addServlet(new ServletHolder(jerseyServlet), "/rest/*");}}