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

fix GZipResponseFilter b using the HttpServletRequest to check if the client supports gzip

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-02-05 16:47:22 +01:00
parent 7369f1cfce
commit 18b64ebde2
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scm-core/src/main/java/sonia/scm/filter/GZipResponseFilter.java
View File

@@ -3,9 +3,11 @@ package sonia.scm.filter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.WebApplicationException; import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.ext.Provider;
import javax.ws.rs.ext.WriterInterceptor; import javax.ws.rs.ext.WriterInterceptor;
import javax.ws.rs.ext.WriterInterceptorContext; import javax.ws.rs.ext.WriterInterceptorContext;
import java.io.IOException; import java.io.IOException;
@@ -13,14 +15,21 @@ import java.io.OutputStream;
import java.util.Locale; import java.util.Locale;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
@Provider @javax.ws.rs.ext.Provider
public class GZipResponseFilter implements WriterInterceptor { public class GZipResponseFilter implements WriterInterceptor {
private static final Logger LOG = LoggerFactory.getLogger(GZipResponseFilter.class); private static final Logger LOG = LoggerFactory.getLogger(GZipResponseFilter.class);
private final Provider<HttpServletRequest> requestProvider;
@Inject
public GZipResponseFilter(Provider<HttpServletRequest> requestProvider) {
this.requestProvider = requestProvider;
}
@Override @Override
public void aroundWriteTo(WriterInterceptorContext context) throws IOException, WebApplicationException { public void aroundWriteTo(WriterInterceptorContext context) throws IOException, WebApplicationException {
if (isGZipSupported(context)) { if (isGZipSupported()) {
LOG.trace("compress output with gzip"); LOG.trace("compress output with gzip");
encodeWithGZip(context); encodeWithGZip(context);
} else { } else {
@@ -43,8 +52,8 @@ public class GZipResponseFilter implements WriterInterceptor {
} }
} }
private boolean isGZipSupported(WriterInterceptorContext context) { private boolean isGZipSupported() {
Object encoding = context.getHeaders().getFirst(HttpHeaders.ACCEPT_ENCODING); Object encoding = requestProvider.get().getHeader(HttpHeaders.ACCEPT_ENCODING);
return encoding != null && encoding.toString().toLowerCase(Locale.ENGLISH).contains("gzip"); return encoding != null && encoding.toString().toLowerCase(Locale.ENGLISH).contains("gzip");
} }
} }

16
scm-core/src/test/java/sonia/scm/filter/GZipResponseFilterTest.java
View File

@@ -1,5 +1,6 @@
package sonia.scm.filter; package sonia.scm.filter;
import com.google.inject.util.Providers;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -7,6 +8,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoExtension;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.WriterInterceptorContext; import javax.ws.rs.ext.WriterInterceptorContext;
@@ -20,22 +22,25 @@ import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
class GZipResponseFilterTest { class GZipResponseFilterTest {
@Mock
private HttpServletRequest request;
@Mock @Mock
private WriterInterceptorContext context; private WriterInterceptorContext context;
@Mock @Mock
private MultivaluedMap<String,Object> headers; private MultivaluedMap<String,Object> headers;
private final GZipResponseFilter filter = new GZipResponseFilter(); private GZipResponseFilter filter;
@BeforeEach @BeforeEach
void setUpContext() { void setupObjectUnderTest() {
when(context.getHeaders()).thenReturn(headers); filter = new GZipResponseFilter(Providers.of(request));
} }
@Test @Test
void shouldSkipGZipCompression() throws IOException { void shouldSkipGZipCompression() throws IOException {
when(headers.getFirst(HttpHeaders.ACCEPT_ENCODING)).thenReturn("deflate, br"); when(request.getHeader(HttpHeaders.ACCEPT_ENCODING)).thenReturn("deflate, br");
filter.aroundWriteTo(context); filter.aroundWriteTo(context);
@@ -60,7 +65,8 @@ class GZipResponseFilterTest {
@BeforeEach @BeforeEach
void setUpContext() { void setUpContext() {
when(headers.getFirst(HttpHeaders.ACCEPT_ENCODING)).thenReturn("gzip, deflate, br"); when(request.getHeader(HttpHeaders.ACCEPT_ENCODING)).thenReturn("gzip, deflate, br");
when(context.getHeaders()).thenReturn(headers);
when(context.getOutputStream()).thenReturn(new ByteArrayOutputStream()); when(context.getOutputStream()).thenReturn(new ByteArrayOutputStream());
} }