Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 09:25:43 +01:00
Code Issues Packages Projects Releases Activity

merge repository heads

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-06-19 13:07:53 +02:00
parent 33702e0e9d bc8c89cbf8
commit c02ac21b6a
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-webapp/src/main/java/sonia/scm/boot/StaticResourceServlet.java
View File

@@ -2,7 +2,8 @@ package sonia.scm.boot;
import com.github.sdorra.webresources.CacheControl; import com.github.sdorra.webresources.CacheControl;
import com.github.sdorra.webresources.WebResourceSender; import com.github.sdorra.webresources.WebResourceSender;
import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.util.HttpUtil; import sonia.scm.util.HttpUtil;
import javax.inject.Singleton; import javax.inject.Singleton;
@@ -16,6 +17,8 @@ import java.net.URL;
@Singleton @Singleton
public class StaticResourceServlet extends HttpServlet { public class StaticResourceServlet extends HttpServlet {
private static final Logger LOG = LoggerFactory.getLogger(StaticResourceServlet.class);
private final WebResourceSender sender = WebResourceSender.create() private final WebResourceSender sender = WebResourceSender.create()
.withGZIP() .withGZIP()
.withGZIPMinLength(512) .withGZIPMinLength(512)
@@ -23,13 +26,18 @@ public class StaticResourceServlet extends HttpServlet {
.withCacheControl(CacheControl.create().noCache()); .withCacheControl(CacheControl.create().noCache());
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { protected void doGet(HttpServletRequest request, HttpServletResponse response) {
try {
URL resource = createResourceUrlFromRequest(request); URL resource = createResourceUrlFromRequest(request);
if (resource != null) { if (resource != null) {
sender.resource(resource).get(request, response); sender.resource(resource).get(request, response);
} else { } else {
response.setStatus(HttpServletResponse.SC_NOT_FOUND); response.setStatus(HttpServletResponse.SC_NOT_FOUND);
} }
} catch (IOException ex) {
LOG.warn("failed to servce resource", ex);
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
} }
private URL createResourceUrlFromRequest(HttpServletRequest request) throws MalformedURLException { private URL createResourceUrlFromRequest(HttpServletRequest request) throws MalformedURLException {

2
scm-webapp/src/test/java/sonia/scm/boot/StaticResourceServletTest.java
View File

@@ -47,7 +47,7 @@ class StaticResourceServletTest {
} }
@Test @Test
void shouldReturnNotFound() throws IOException { void shouldReturnNotFound() {
doReturn("/scm").when(request).getContextPath(); doReturn("/scm").when(request).getContextPath();
doReturn("/scm/resource.txt").when(request).getRequestURI(); doReturn("/scm/resource.txt").when(request).getRequestURI();
doReturn(context).when(request).getServletContext(); doReturn(context).when(request).getServletContext();