X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=cachecontrol%2Fsrc%2Fmain%2Fjava%2Fde%2Fhalbekunst%2Fjuplo%2Fcachecontrol%2FAcceleratorFilter.java;h=501c3a27a84f28f4ca3105c752121b1ad1ac90d6;hb=672f062d477264d87bf84778771c2c5abc8b479a;hp=f76c7132cfd1c3b0de341011d23e2d3bf8b0c1d2;hpb=1bb1a0f0e1d347538ae93c23395bba172cd87342;p=percentcodec diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java index f76c7132..501c3a27 100644 --- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java +++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java @@ -1,6 +1,6 @@ package de.halbekunst.juplo.cachecontrol; -import de.halbekunst.juplo.cachecontrol.CacheControl.CacheMethodHandle; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; @@ -19,9 +19,9 @@ import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowire; @@ -38,18 +38,11 @@ import org.springframework.beans.factory.annotation.Configurable; public class AcceleratorFilter implements Filter { private final static Logger log = LoggerFactory.getLogger(AcceleratorFilter.class); - private final static Map ADDITIONAL_HEADERS_NONE = Collections.unmodifiableMap(new HashMap()); - private final static Map ADDITIONAL_HEADERS_GZIP; + private final static Map EMPTY = Collections.unmodifiableMap(new HashMap()); public final static String REQUEST_URI_ATTRIBUTE = "javax.servlet.include.request_uri"; public final static String RESPONSE_WRAPPER = AcceleratorFilter.class.getName() + ".RESPONSE_WRAPPER"; - static { - Map map = new HashMap(1); - map.put(Headers.HEADER_CONTENT_ENCODING, "gzip"); - ADDITIONAL_HEADERS_GZIP = Collections.unmodifiableMap(map); - } - @Autowired CacheControl cacheControl; @Autowired(required=true) Integer buffer; @@ -80,8 +73,6 @@ public class AcceleratorFilter implements Filter { httpRequest.setAttribute(RESPONSE_WRAPPER, wrapper); cacheControl.init(wrapper); chain.doFilter(request, wrapper); - /** Dekoration auslösen, falls sie bisher nicht ausgelöst wurde... */ - cacheControl.decorate(httpRequest, httpResponse, wrapper); wrapper.finish(); } @@ -94,14 +85,15 @@ public class AcceleratorFilter implements Filter { } - class AccelerationWrapper extends HttpServletResponseWrapper implements CacheMethodHandle { + class AccelerationWrapper implements HttpServletResponse, CacheMethodHandle { private final HttpServletRequest request; private final HttpServletResponse response; - private boolean zipped; - private int buffer; - private GZIPServletOutputStream out; + boolean zipped; // CacheControll greift direkt auf dieses Flag zu! + boolean forceCompression = false; + + private CountingServletOutputStream out; private ServletOutputStream stream; private PrintWriter writer; @@ -118,7 +110,6 @@ public class AcceleratorFilter implements Filter { AccelerationWrapper(HttpServletRequest request, HttpServletResponse response) throws IOException { - super(response); this.request = request; this.response = response; @@ -131,7 +122,6 @@ public class AcceleratorFilter implements Filter { weak = AcceleratorFilter.this.weak; cacheParams = new HashMap(); - buffer = AcceleratorFilter.this.buffer; zipped = false; Enumeration values = request.getHeaders(Headers.HEADER_ACCEPT_ENCODING); while (values.hasMoreElements()) { @@ -141,12 +131,14 @@ public class AcceleratorFilter implements Filter { break; } } + if (zipped) + out = new GZIPServletOutputStream(); + else + out = new CountingServletOutputStream(); } - public void finish() throws IOException { - if (zipped && out != null) - out.zout.finish(); + out.close(); } @@ -178,7 +170,7 @@ public class AcceleratorFilter implements Filter { public void addDateHeader(String name, long value) { if (!guessing) { - super.addDateHeader(name, value); + response.addDateHeader(name, value); return; } @@ -200,14 +192,14 @@ public class AcceleratorFilter implements Filter { } /** Unknown header: pass throug! */ - super.addDateHeader(name, value); + response.addDateHeader(name, value); } @Override public void addHeader(String name, String value) { if (!guessing) { - super.addHeader(name, value); + response.addHeader(name, value); return; } @@ -220,7 +212,7 @@ public class AcceleratorFilter implements Filter { public void addIntHeader(String name, int value) { if (!guessing) { - super.addIntHeader(name, value); + response.addIntHeader(name, value); return; } @@ -231,7 +223,7 @@ public class AcceleratorFilter implements Filter { public void setDateHeader(String name, long value) { if (!guessing) { - super.setDateHeader(name, value); + response.setDateHeader(name, value); return; } @@ -253,14 +245,14 @@ public class AcceleratorFilter implements Filter { } /** Unknown header: pass throug! */ - super.setDateHeader(name, value); + response.setDateHeader(name, value); } @Override public void setHeader(String name, String value) { if (!guessing) { - super.setHeader(name, value); + response.setHeader(name, value); return; } @@ -271,7 +263,7 @@ public class AcceleratorFilter implements Filter { public void setIntHeader(String name, int value) { if (!guessing) { - super.setIntHeader(name, value); + response.setIntHeader(name, value); return; } @@ -285,7 +277,6 @@ public class AcceleratorFilter implements Filter { throw new IllegalStateException("ServletOutputStream and PrintWriter cannot be requested both!"); if (stream == null) { - out = new GZIPServletOutputStream(); stream = out; } @@ -299,7 +290,6 @@ public class AcceleratorFilter implements Filter { throw new IllegalStateException("ServletOutputStream and PrintWriter cannot be requested both!"); if (writer == null) { - out = new GZIPServletOutputStream(); writer = new PrintWriter(out); } @@ -317,21 +307,14 @@ public class AcceleratorFilter implements Filter { @Override public void setBufferSize(int size) { - if (out != null && this.buffer != out.left) - throw new IllegalStateException("setBufferSize() cannot be called after content has been written!"); - - if (size < 0) - size = 0; - - this.buffer = size; - if (out != null) - out.left = size; + out.setBuffer(size); response.setBufferSize(size); } @Override public void flushBuffer() throws IOException { + forceCompression = true; cacheControl.decorate(request, response, this); response.flushBuffer(); } @@ -340,6 +323,15 @@ public class AcceleratorFilter implements Filter { public void resetBuffer() { response.resetBuffer(); + try { + if (zipped) + out = new GZIPServletOutputStream(); + else + out = new CountingServletOutputStream(); + } + catch (IOException e) { + throw new IllegalStateException(e); + } stream = null; writer = null; } @@ -348,16 +340,30 @@ public class AcceleratorFilter implements Filter { public void reset() { response.reset(); - out = null; + try { + if (zipped) + out = new GZIPServletOutputStream(); + else + out = new CountingServletOutputStream(); + } + catch (IOException e) { + throw new IllegalStateException(e); + } stream = null; writer = null; /** Cookies has been cleared! Reinitialize decorator... */ + forceCompression = false; cacheControl.init(this); } + @Override + public boolean isZipped() { + return out.isZipped(); + } + @Override public long getTimestamp() { return now; @@ -395,13 +401,10 @@ public class AcceleratorFilter implements Filter { @Override public Map getAdditionalHeaders(HttpServletRequest request) { - if (zipped && !out.empty) - return ADDITIONAL_HEADERS_GZIP; - else - return ADDITIONAL_HEADERS_NONE; + return EMPTY; } - public void guessingFinished() { + public void supressGuessing() { guessing = false; } @@ -537,9 +540,9 @@ public class AcceleratorFilter implements Filter { /** Pass header through, if no value from intrest was found */ if (overwrite) - super.setHeader(name, value); + response.setHeader(name, value); else - super.addHeader(name, value); + response.addHeader(name, value); } private void calculateCacheSeconds() { @@ -549,70 +552,239 @@ public class AcceleratorFilter implements Filter { } } + @Override + public void addCookie(Cookie cookie) { + // TODO: Je nach Vary-Einstellung ETag anpassen? + response.addCookie(cookie); + } + + @Override + public boolean containsHeader(String name) { + return response.containsHeader(name); + } + + @Override + public String encodeURL(String url) { + return response.encodeURL(url); + } + + @Override + public String encodeRedirectURL(String url) { + return response.encodeRedirectURL(url); + } + + @Override + public String encodeUrl(String url) { + return response.encodeUrl(url); + } + + @Override + public String encodeRedirectUrl(String url) { + return response.encodeRedirectUrl(url); + } + + @Override + public void sendError(int sc, String msg) throws IOException { + // TODO: Decoration anpassen/anstoßen?!? + response.sendError(sc,msg); + } + + @Override + public void sendError(int sc) throws IOException { + // TODO: Decoration anpassen/anstoßen?!? + response.sendError(sc); + } + + @Override + public void sendRedirect(String location) throws IOException { + // TODO: Decoration anpassen/anstoßen?!? + response.sendRedirect(location); + } + + @Override + public String getCharacterEncoding() { + return response.getCharacterEncoding(); + } + + @Override + public String getContentType() { + return response.getContentType(); + } + + @Override + public void setCharacterEncoding(String charset) { + // TODO: Je nach Vary-Einstellung ETag anpassen? + response.setCharacterEncoding(charset); + } + + @Override + public void setContentType(String type) { + // TODO: Je nach Vary-Einstellung ETag anpassen? + response.setContentType(type); + } + + @Override + public int getBufferSize() { + return response.getBufferSize(); + } + + @Override + public boolean isCommitted() { + // TODO: Eigene commit-Kontrolle wegen Dekorations-Einstiegspunkt?!? + return response.isCommitted(); + } - class GZIPServletOutputStream extends ServletOutputStream { + @Override + public void setLocale(Locale loc) { + // TODO: Je nach Vary-Einstellung ETag anpassen? + response.setLocale(loc); + } + + @Override + public Locale getLocale() { + return getLocale(); + } - private final OutputStream out; - private final GZIPOutputStream zout; + + class CountingServletOutputStream extends ServletOutputStream { + + private OutputStream out; int left; boolean empty; - public GZIPServletOutputStream() throws IOException { - if (zipped) { - this.zout = new GZIPOutputStream(response.getOutputStream(), buffer); - this.out = this.zout; - } - else { - this.zout = null; - this.out = response.getOutputStream(); - } - empty = true; + + CountingServletOutputStream() throws IOException { + out = response.getOutputStream(); left = buffer; + empty = true; } - @Override - public void close() throws IOException { + void setBuffer(int size) throws IllegalStateException {} + + boolean isZipped() { + return false; + } + + void finish() throws IOException { + decorate(); + } + + void decorate() throws IOException { try { - AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, buffer); + AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, AccelerationWrapper.this); } catch (Exception e) { log.error("Error while guessing Cache-Header's", e); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } + } + - if (!empty && zout != null) - zout.finish(); + @Override + public void close() throws IOException { + decorate(); out.close(); } @Override public void flush() throws IOException { - try { - AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, buffer); - } - catch (Exception e) { - log.error("Error while guessing Cache-Header's", e); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - } - + decorate(); out.flush(); } @Override public void write(int i) throws IOException { - if (left == 0) { + empty = false; + if (left == 0) + decorate(); + left--; + out.write(i); + } + } + + + final class GZIPServletOutputStream extends CountingServletOutputStream { + + final static int MINIMAL_BUFFER_SIZE = 128; + + private ByteArrayOutputStream buffer; + private OutputStream out; + private GZIPOutputStream zout; + private int bufferSize; + private boolean decorated = false; + + + public GZIPServletOutputStream() throws IOException { + setBuffer(AcceleratorFilter.this.buffer); + } + + + @Override + void finish() throws IOException { + decorate(); + zout.finish(); + super.out.write(buffer.toByteArray()); + } + + @Override + boolean isZipped() { + if (decorated) + return true; + return !empty; + } + + @Override + void setBuffer(int size) throws IllegalStateException { + if (!empty) + throw new IllegalStateException("attemp to change buffer size after writing data to response!"); + + if (size > MINIMAL_BUFFER_SIZE) { + left = size; try { - AcceleratorFilter.this.cacheControl.decorate(AccelerationWrapper.this.request, response, buffer); + bufferSize = size; + out = response.getOutputStream(); + buffer = new ByteArrayOutputStream(size); + zout = new GZIPOutputStream(buffer, size); + super.out = zout; } - catch (Exception e) { - log.error("Error while guessing Cache-Header's", e); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + catch (IOException e) { + throw new IllegalStateException(e); } } + } + + + + @Override + public void close() throws IOException { + decorate(); + zout.close(); + out.write(buffer.toByteArray()); + out.close(); + } + + @Override + public void flush() throws IOException { + decorate(); + out.write(buffer.toByteArray()); + out.flush(); + } + + @Override + public void write(int i) throws IOException { empty = false; + if (left == 0) { + if (!decorated) { + decorate(); + decorated = true; + } + out.write(buffer.toByteArray()); + buffer.reset(); + left = bufferSize; + } left--; - out.write(i); + zout.write(i); } } }