diff --git a/src/main/scala/gitbucket/core/controller/FileUploadController.scala b/src/main/scala/gitbucket/core/controller/FileUploadController.scala index 6a45d9d..edf7268 100644 --- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala +++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala @@ -116,6 +116,7 @@ case Some(file) if(mimeTypeChcker(file.name)) => defining(FileUtil.generateFileId){ fileId => f(file, fileId) + contentType = "text/plain" Ok(fileId) } case _ => BadRequest() diff --git a/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala b/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala index 29102d0..6b6ee47 100644 --- a/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala +++ b/src/main/scala/gitbucket/core/servlet/CompositeScalatraFilter.scala @@ -36,18 +36,22 @@ requestPath + "/" } - filters - .filter { case (_, path) => - val start = path.replaceFirst("/\\*$", "/") - checkPath.startsWith(start) - } - .foreach { case (filter, _) => - val mockChain = new MockFilterChain() - filter.doFilter(request, response, mockChain) - if(mockChain.continue == false){ - return () + if(!checkPath.startsWith("/upload/") && !checkPath.startsWith("/git/") && !checkPath.startsWith("/git-lfs/") && + !checkPath.startsWith("/plugin-assets/") && !checkPath.startsWith("/console/")){ + filters + .filter { case (_, path) => + val start = path.replaceFirst("/\\*$", "/") + checkPath.startsWith(start) } - } + .foreach { case (filter, _) => + val mockChain = new MockFilterChain() + filter.doFilter(request, response, mockChain) + if(mockChain.continue == false){ + return () + } + } + } + chain.doFilter(request, response) } @@ -62,8 +66,8 @@ } } -class FilterChainFilter(chain: FilterChain) extends Filter { - override def init(filterConfig: FilterConfig): Unit = () - override def destroy(): Unit = () - override def doFilter(request: ServletRequest, response: ServletResponse, mockChain: FilterChain) = chain.doFilter(request, response) -} +//class FilterChainFilter(chain: FilterChain) extends Filter { +// override def init(filterConfig: FilterConfig): Unit = () +// override def destroy(): Unit = () +// override def doFilter(request: ServletRequest, response: ServletResponse, mockChain: FilterChain) = chain.doFilter(request, response) +//}