Completed implementation of GzipRequestCustomizer
This commit is contained in:
Greg Wilkins
parent
c1f6f6b608
commit
6db357d2fc
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0"?>
|
||||
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
|
||||
<Configure id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
|
||||
<Call name="addCustomizer">
|
||||
<Arg>
|
||||
<New class="org.eclipse.jetty.server.handler.gzip.GzipRequestCustomizer">
|
||||
<Arg name="compressedBufferSize" type="int"><Property name="jetty.gzip.inflate.compressedBufferSize" default="4096"/></Arg>
|
||||
<Arg name="inflatedBufferSize" type="int"><Property name="jetty.gzip.inflate.inflatedBufferSize" default="16384"/></Arg>
|
||||
</New>
|
||||
</Arg>
|
||||
</Call>
|
||||
</Configure>
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
#
|
||||
# GZIP inflate module
|
||||
# Applies GzipRequestCustomizer to entire server to inflate gzipped requests
|
||||
#
|
||||
|
||||
[depend]
|
||||
server
|
||||
|
||||
[xml]
|
||||
etc/jetty-gzip-inflate.xml
|
||||
|
||||
[ini-template]
|
||||
## Buffer size for compressed data
|
||||
# jetty.gzip.inflate.compressedBufferSize=4096
|
||||
|
||||
## Buffer size for compressed data
|
||||
# jetty.gzip.inflate.inflatedBufferSize=16384
|
||||
|
|
@ -1,455 +0,0 @@
|
|||
//
|
||||
// ========================================================================
|
||||
// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
|
||||
// ------------------------------------------------------------------------
|
||||
// All rights reserved. This program and the accompanying materials
|
||||
// are made available under the terms of the Eclipse Public License v1.0
|
||||
// and Apache License v2.0 which accompanies this distribution.
|
||||
//
|
||||
// The Eclipse Public License is available at
|
||||
// http://www.eclipse.org/legal/epl-v10.html
|
||||
//
|
||||
// The Apache License v2.0 is available at
|
||||
// http://www.opensource.org/licenses/apache2.0.php
|
||||
//
|
||||
// You may elect to redistribute this code under either of these licenses.
|
||||
// ========================================================================
|
||||
//
|
||||
|
||||
package org.eclipse.jetty.server.handler.gzip;
|
||||
|
||||
import java.nio.Buffer;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.zip.DataFormatException;
|
||||
import java.util.zip.Inflater;
|
||||
import java.util.zip.ZipException;
|
||||
|
||||
import org.eclipse.jetty.io.ByteBufferPool;
|
||||
import org.eclipse.jetty.util.BufferUtil;
|
||||
import org.eclipse.jetty.util.component.Destroyable;
|
||||
|
||||
/**
|
||||
* <p>Decoder for the "gzip" content encoding.</p>
|
||||
* <p>This decoder inflates gzip compressed data, and has
|
||||
* been optimized for async usage with minimal data copies.</p>
|
||||
*/
|
||||
public class GZIPContentDecoder implements Destroyable
|
||||
{
|
||||
private final List<ByteBuffer> _inflateds = new ArrayList<>();
|
||||
private final Inflater _inflater = new Inflater(true);
|
||||
private final ByteBufferPool _pool;
|
||||
private final int _bufferSize;
|
||||
private State _state;
|
||||
private int _size;
|
||||
private int _value;
|
||||
private byte _flags;
|
||||
private ByteBuffer _inflated;
|
||||
|
||||
public GZIPContentDecoder()
|
||||
{
|
||||
this(null, 2048);
|
||||
}
|
||||
|
||||
public GZIPContentDecoder(int bufferSize)
|
||||
{
|
||||
this(null, bufferSize);
|
||||
}
|
||||
|
||||
public GZIPContentDecoder(ByteBufferPool pool, int bufferSize)
|
||||
{
|
||||
_bufferSize = bufferSize;
|
||||
_pool = pool;
|
||||
reset();
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Inflates compressed data from a buffer.</p>
|
||||
* <p>The buffers returned by this method should be released
|
||||
* via {@link #release(ByteBuffer)}.</p>
|
||||
* <p>This method may fully consume the input buffer, but return
|
||||
* only a chunk of the inflated bytes, to allow applications to
|
||||
* consume the inflated chunk before performing further inflation,
|
||||
* applying backpressure. In this case, this method should be
|
||||
* invoked again with the same input buffer (even if
|
||||
* it's already fully consumed) and that will produce another
|
||||
* chunk of inflated bytes. Termination happens when the input
|
||||
* buffer is fully consumed, and the returned buffer is empty.</p>
|
||||
* <p>See {@link #decodedChunk(ByteBuffer)} to perform inflating
|
||||
* in a non-blocking way that allows to apply backpressure.</p>
|
||||
*
|
||||
* @param compressed the buffer containing compressed data.
|
||||
* @return a buffer containing inflated data.
|
||||
*/
|
||||
public ByteBuffer decode(ByteBuffer compressed)
|
||||
{
|
||||
decodeChunks(compressed);
|
||||
|
||||
if (_inflateds.isEmpty())
|
||||
{
|
||||
if (BufferUtil.isEmpty(_inflated) || _state == State.CRC || _state == State.ISIZE)
|
||||
return BufferUtil.EMPTY_BUFFER;
|
||||
ByteBuffer result = _inflated;
|
||||
_inflated = null;
|
||||
return result;
|
||||
}
|
||||
else
|
||||
{
|
||||
_inflateds.add(_inflated);
|
||||
_inflated = null;
|
||||
int length = _inflateds.stream().mapToInt(Buffer::remaining).sum();
|
||||
ByteBuffer result = acquire(length);
|
||||
for (ByteBuffer buffer : _inflateds)
|
||||
{
|
||||
BufferUtil.append(result, buffer);
|
||||
release(buffer);
|
||||
}
|
||||
_inflateds.clear();
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Called when a chunk of data is inflated.</p>
|
||||
* <p>The default implementation aggregates all the chunks
|
||||
* into a single buffer returned from {@link #decode(ByteBuffer)}.</p>
|
||||
* <p>Derived implementations may choose to consume inflated chunks
|
||||
* individually and return {@code true} from this method to prevent
|
||||
* further inflation until a subsequent call to {@link #decode(ByteBuffer)}
|
||||
* or {@link #decodeChunks(ByteBuffer)} is made.
|
||||
*
|
||||
* @param chunk the inflated chunk of data
|
||||
* @return false if inflating should continue, or true if the call
|
||||
* to {@link #decodeChunks(ByteBuffer)} or {@link #decode(ByteBuffer)}
|
||||
* should return, allowing to consume the inflated chunk and apply
|
||||
* backpressure
|
||||
*/
|
||||
protected boolean decodedChunk(ByteBuffer chunk)
|
||||
{
|
||||
if (_inflated == null)
|
||||
{
|
||||
_inflated = chunk;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (BufferUtil.space(_inflated) >= chunk.remaining())
|
||||
{
|
||||
BufferUtil.append(_inflated, chunk);
|
||||
release(chunk);
|
||||
}
|
||||
else
|
||||
{
|
||||
_inflateds.add(_inflated);
|
||||
_inflated = chunk;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Inflates compressed data.</p>
|
||||
* <p>Inflation continues until the compressed block end is reached, there is no
|
||||
* more compressed data or a call to {@link #decodedChunk(ByteBuffer)} returns true.</p>
|
||||
*
|
||||
* @param compressed the buffer of compressed data to inflate
|
||||
*/
|
||||
protected void decodeChunks(ByteBuffer compressed)
|
||||
{
|
||||
ByteBuffer buffer = null;
|
||||
try
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
switch (_state)
|
||||
{
|
||||
case INITIAL:
|
||||
{
|
||||
_state = State.ID;
|
||||
break;
|
||||
}
|
||||
|
||||
case FLAGS:
|
||||
{
|
||||
if ((_flags & 0x04) == 0x04)
|
||||
{
|
||||
_state = State.EXTRA_LENGTH;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
}
|
||||
else if ((_flags & 0x08) == 0x08)
|
||||
_state = State.NAME;
|
||||
else if ((_flags & 0x10) == 0x10)
|
||||
_state = State.COMMENT;
|
||||
else if ((_flags & 0x2) == 0x2)
|
||||
{
|
||||
_state = State.HCRC;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
_state = State.DATA;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case DATA:
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
if (buffer == null)
|
||||
buffer = acquire(_bufferSize);
|
||||
|
||||
try
|
||||
{
|
||||
int length = _inflater.inflate(buffer.array(), buffer.arrayOffset(), buffer.capacity());
|
||||
buffer.limit(length);
|
||||
}
|
||||
catch (DataFormatException x)
|
||||
{
|
||||
throw new ZipException(x.getMessage());
|
||||
}
|
||||
|
||||
if (buffer.hasRemaining())
|
||||
{
|
||||
ByteBuffer chunk = buffer;
|
||||
buffer = null;
|
||||
if (decodedChunk(chunk))
|
||||
return;
|
||||
}
|
||||
else if (_inflater.needsInput())
|
||||
{
|
||||
if (!compressed.hasRemaining())
|
||||
return;
|
||||
if (compressed.hasArray())
|
||||
{
|
||||
_inflater.setInput(compressed.array(), compressed.arrayOffset() + compressed.position(), compressed.remaining());
|
||||
compressed.position(compressed.limit());
|
||||
}
|
||||
else
|
||||
{
|
||||
// TODO use the pool
|
||||
byte[] input = new byte[compressed.remaining()];
|
||||
compressed.get(input);
|
||||
_inflater.setInput(input);
|
||||
}
|
||||
}
|
||||
else if (_inflater.finished())
|
||||
{
|
||||
int remaining = _inflater.getRemaining();
|
||||
compressed.position(compressed.limit() - remaining);
|
||||
_state = State.CRC;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (!compressed.hasRemaining())
|
||||
break;
|
||||
|
||||
byte currByte = compressed.get();
|
||||
switch (_state)
|
||||
{
|
||||
case ID:
|
||||
{
|
||||
_value += (currByte & 0xFF) << 8 * _size;
|
||||
++_size;
|
||||
if (_size == 2)
|
||||
{
|
||||
if (_value != 0x8B1F)
|
||||
throw new ZipException("Invalid gzip bytes");
|
||||
_state = State.CM;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CM:
|
||||
{
|
||||
if ((currByte & 0xFF) != 0x08)
|
||||
throw new ZipException("Invalid gzip compression method");
|
||||
_state = State.FLG;
|
||||
break;
|
||||
}
|
||||
case FLG:
|
||||
{
|
||||
_flags = currByte;
|
||||
_state = State.MTIME;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
break;
|
||||
}
|
||||
case MTIME:
|
||||
{
|
||||
// Skip the 4 MTIME bytes
|
||||
++_size;
|
||||
if (_size == 4)
|
||||
_state = State.XFL;
|
||||
break;
|
||||
}
|
||||
case XFL:
|
||||
{
|
||||
// Skip XFL
|
||||
_state = State.OS;
|
||||
break;
|
||||
}
|
||||
case OS:
|
||||
{
|
||||
// Skip OS
|
||||
_state = State.FLAGS;
|
||||
break;
|
||||
}
|
||||
case EXTRA_LENGTH:
|
||||
{
|
||||
_value += (currByte & 0xFF) << 8 * _size;
|
||||
++_size;
|
||||
if (_size == 2)
|
||||
_state = State.EXTRA;
|
||||
break;
|
||||
}
|
||||
case EXTRA:
|
||||
{
|
||||
// Skip EXTRA bytes
|
||||
--_value;
|
||||
if (_value == 0)
|
||||
{
|
||||
// Clear the EXTRA flag and loop on the flags
|
||||
_flags &= ~0x04;
|
||||
_state = State.FLAGS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case NAME:
|
||||
{
|
||||
// Skip NAME bytes
|
||||
if (currByte == 0)
|
||||
{
|
||||
// Clear the NAME flag and loop on the flags
|
||||
_flags &= ~0x08;
|
||||
_state = State.FLAGS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case COMMENT:
|
||||
{
|
||||
// Skip COMMENT bytes
|
||||
if (currByte == 0)
|
||||
{
|
||||
// Clear the COMMENT flag and loop on the flags
|
||||
_flags &= ~0x10;
|
||||
_state = State.FLAGS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case HCRC:
|
||||
{
|
||||
// Skip HCRC
|
||||
++_size;
|
||||
if (_size == 2)
|
||||
{
|
||||
// Clear the HCRC flag and loop on the flags
|
||||
_flags &= ~0x02;
|
||||
_state = State.FLAGS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CRC:
|
||||
{
|
||||
_value += (currByte & 0xFF) << 8 * _size;
|
||||
++_size;
|
||||
if (_size == 4)
|
||||
{
|
||||
// From RFC 1952, compliant decoders need not to verify the CRC
|
||||
_state = State.ISIZE;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ISIZE:
|
||||
{
|
||||
_value += (currByte & 0xFF) << 8 * _size;
|
||||
++_size;
|
||||
if (_size == 4)
|
||||
{
|
||||
if (_value != _inflater.getBytesWritten())
|
||||
throw new ZipException("Invalid input size");
|
||||
|
||||
// TODO ByteBuffer result = output == null ? BufferUtil.EMPTY_BUFFER : ByteBuffer.wrap(output);
|
||||
reset();
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
throw new ZipException();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (ZipException x)
|
||||
{
|
||||
throw new RuntimeException(x);
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (buffer != null)
|
||||
release(buffer);
|
||||
}
|
||||
}
|
||||
|
||||
private void reset()
|
||||
{
|
||||
_inflater.reset();
|
||||
_state = State.INITIAL;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
_flags = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void destroy()
|
||||
{
|
||||
_inflater.end();
|
||||
}
|
||||
|
||||
public boolean isFinished()
|
||||
{
|
||||
return _state == State.INITIAL;
|
||||
}
|
||||
|
||||
private enum State
|
||||
{
|
||||
INITIAL, ID, CM, FLG, MTIME, XFL, OS, FLAGS, EXTRA_LENGTH, EXTRA, NAME, COMMENT, HCRC, DATA, CRC, ISIZE
|
||||
}
|
||||
|
||||
/**
|
||||
* @param capacity capacity of the ByteBuffer to acquire
|
||||
* @return a heap buffer of the configured capacity either from the pool or freshly allocated.
|
||||
*/
|
||||
public ByteBuffer acquire(int capacity)
|
||||
{
|
||||
return _pool == null ? BufferUtil.allocate(capacity) : _pool.acquire(capacity, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Releases an allocated buffer.</p>
|
||||
* <p>This method calls {@link ByteBufferPool#release(ByteBuffer)} if a buffer pool has
|
||||
* been configured.</p>
|
||||
* <p>This method should be called once for all buffers returned from {@link #decode(ByteBuffer)}
|
||||
* or passed to {@link #decodedChunk(ByteBuffer)}.</p>
|
||||
*
|
||||
* @param buffer the buffer to release.
|
||||
*/
|
||||
public void release(ByteBuffer buffer)
|
||||
{
|
||||
if (_pool != null && buffer!=BufferUtil.EMPTY_BUFFER)
|
||||
_pool.release(buffer);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,34 @@
|
|||
//
|
||||
// ========================================================================
|
||||
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
|
||||
// ------------------------------------------------------------------------
|
||||
// All rights reserved. This program and the accompanying materials
|
||||
// are made available under the terms of the Eclipse Public License v1.0
|
||||
// and Apache License v2.0 which accompanies this distribution.
|
||||
//
|
||||
// The Eclipse Public License is available at
|
||||
// http://www.eclipse.org/legal/epl-v10.html
|
||||
//
|
||||
// The Apache License v2.0 is available at
|
||||
// http://www.opensource.org/licenses/apache2.0.php
|
||||
//
|
||||
// You may elect to redistribute this code under either of these licenses.
|
||||
// ========================================================================
|
||||
//
|
||||
|
||||
package org.eclipse.jetty.server.handler.gzip;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.Queue;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.zip.DataFormatException;
|
||||
import java.util.zip.Inflater;
|
||||
import java.util.zip.ZipException;
|
||||
|
||||
import org.eclipse.jetty.http.BadMessageException;
|
||||
import org.eclipse.jetty.http.HttpField;
|
||||
import org.eclipse.jetty.http.HttpFields;
|
||||
import org.eclipse.jetty.http.HttpHeader;
|
||||
import org.eclipse.jetty.io.ArrayByteBufferPool;
|
||||
import org.eclipse.jetty.io.ByteBufferPool;
|
||||
import org.eclipse.jetty.server.Connector;
|
||||
import org.eclipse.jetty.server.HttpConfiguration;
|
||||
|
|
@ -16,6 +36,7 @@ import org.eclipse.jetty.server.HttpInput;
|
|||
import org.eclipse.jetty.server.Request;
|
||||
import org.eclipse.jetty.util.ArrayQueue;
|
||||
import org.eclipse.jetty.util.BufferUtil;
|
||||
import org.eclipse.jetty.util.annotation.Name;
|
||||
|
||||
public class GzipRequestCustomizer implements HttpConfiguration.Customizer
|
||||
{
|
||||
|
|
@ -23,12 +44,25 @@ public class GzipRequestCustomizer implements HttpConfiguration.Customizer
|
|||
private static final HttpField X_CE_GZIP = new HttpField("X-Content-Encoding","gzip");
|
||||
private static final Pattern COMMA_GZIP = Pattern.compile(".*, *gzip");
|
||||
|
||||
private final ByteBufferPool buffers = new ArrayByteBufferPool(); // TODO Configure
|
||||
private int compressedBufferSize = 4*1024; // TODO configure
|
||||
private int inflatedBufferSize = 16*1024; // TODO configure
|
||||
private final int _compressedBufferSize;
|
||||
private final int _inflatedBufferSize;
|
||||
|
||||
public GzipRequestCustomizer()
|
||||
{
|
||||
this(-1, -1);
|
||||
}
|
||||
|
||||
public GzipRequestCustomizer(@Name("compressedBufferSize") int compressedBufferSize, @Name("inflatedBufferSize") int inflatedBufferSize)
|
||||
{
|
||||
_compressedBufferSize = compressedBufferSize<=0?4*1024:compressedBufferSize;
|
||||
_inflatedBufferSize = inflatedBufferSize<=0?16*1024:inflatedBufferSize;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void customize(Connector connector, HttpConfiguration channelConfig, Request request)
|
||||
{
|
||||
ByteBufferPool bufferPool = request.getHttpChannel().getByteBufferPool();
|
||||
|
||||
try
|
||||
{
|
||||
HttpFields fields = request.getHttpFields();
|
||||
|
|
@ -60,7 +94,7 @@ public class GzipRequestCustomizer implements HttpConfiguration.Customizer
|
|||
{
|
||||
if (buffer==null || BufferUtil.isFull(buffer))
|
||||
{
|
||||
buffer = buffers.acquire(compressedBufferSize,false);
|
||||
buffer = bufferPool.acquire(_compressedBufferSize,false);
|
||||
compressed.add(buffer);
|
||||
}
|
||||
int l = input.read(buffer.array(), buffer.arrayOffset()+buffer.limit(), BufferUtil.space(buffer));
|
||||
|
|
@ -78,18 +112,7 @@ public class GzipRequestCustomizer implements HttpConfiguration.Customizer
|
|||
return;
|
||||
}
|
||||
|
||||
// TODO Perhaps pool docoders/inflators?
|
||||
GZIPContentDecoder decoder = new GZIPContentDecoder(buffers, inflatedBufferSize)
|
||||
{
|
||||
@Override
|
||||
protected boolean decodedChunk(ByteBuffer chunk)
|
||||
{
|
||||
super.decodedChunk(chunk);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
input.addContent(new InflatingContent(input, decoder,compressed));
|
||||
input.addContent(new InflatingContent(bufferPool, input, compressed));
|
||||
|
||||
}
|
||||
catch(Throwable t)
|
||||
|
|
@ -98,48 +121,290 @@ public class GzipRequestCustomizer implements HttpConfiguration.Customizer
|
|||
}
|
||||
}
|
||||
|
||||
private ByteBuffer inflate(GZIPContentDecoder decoder, Queue<ByteBuffer> compressed)
|
||||
private enum State
|
||||
{
|
||||
while (!compressed.isEmpty() && BufferUtil.isEmpty(compressed.peek()))
|
||||
buffers.release(compressed.poll());
|
||||
|
||||
if (compressed.isEmpty())
|
||||
return BufferUtil.EMPTY_BUFFER;
|
||||
|
||||
ByteBuffer inflated = decoder.decode(compressed.peek());
|
||||
System.err.println(BufferUtil.toDetailString(inflated));
|
||||
return inflated;
|
||||
INITIAL, ID, CM, FLG, MTIME, XFL, OS, FLAGS, EXTRA_LENGTH, EXTRA, NAME, COMMENT, HCRC, DATA, CRC, ISIZE, END
|
||||
}
|
||||
|
||||
|
||||
private class InflatingContent extends HttpInput.Content
|
||||
{
|
||||
final HttpInput input;
|
||||
final GZIPContentDecoder decoder;
|
||||
final Queue<ByteBuffer> compressed;
|
||||
final ByteBufferPool _bufferPool;
|
||||
final HttpInput _input;
|
||||
final Queue<ByteBuffer> _compressed;
|
||||
private final Inflater _inflater = new Inflater(true);
|
||||
private State _state = State.INITIAL;
|
||||
private int _size;
|
||||
private int _value;
|
||||
private byte _flags;
|
||||
|
||||
public InflatingContent(HttpInput input, GZIPContentDecoder decoder, Queue<ByteBuffer> compressed)
|
||||
public InflatingContent(ByteBufferPool bufferPool, HttpInput input, Queue<ByteBuffer> compressed)
|
||||
{
|
||||
super(inflate(decoder,compressed));
|
||||
this.input = input;
|
||||
this.decoder = decoder;
|
||||
this.compressed = compressed;
|
||||
super(bufferPool.acquire(_inflatedBufferSize,false));
|
||||
_bufferPool = bufferPool;
|
||||
_input = input;
|
||||
_compressed = compressed;
|
||||
|
||||
inflate();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void succeeded()
|
||||
{
|
||||
if (decoder.isFinished() && compressed.isEmpty())
|
||||
input.eof();
|
||||
BufferUtil.clear(getContent());
|
||||
inflate();
|
||||
if (BufferUtil.isEmpty(getContent()) && _state==State.END)
|
||||
{
|
||||
_bufferPool.release(getContent());
|
||||
_input.eof();
|
||||
}
|
||||
else
|
||||
input.addContent(new InflatingContent(input,decoder,compressed));
|
||||
{
|
||||
_input.addContent(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void failed(Throwable x)
|
||||
{
|
||||
input.failed(x);
|
||||
}
|
||||
_input.failed(x);
|
||||
}
|
||||
|
||||
protected void inflate()
|
||||
{
|
||||
try
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
switch (_state)
|
||||
{
|
||||
case INITIAL:
|
||||
{
|
||||
_state = State.ID;
|
||||
break;
|
||||
}
|
||||
|
||||
case FLAGS:
|
||||
{
|
||||
if ((_flags & 0x04) == 0x04)
|
||||
{
|
||||
_state = State.EXTRA_LENGTH;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
}
|
||||
else if ((_flags & 0x08) == 0x08)
|
||||
_state = State.NAME;
|
||||
else if ((_flags & 0x10) == 0x10)
|
||||
_state = State.COMMENT;
|
||||
else if ((_flags & 0x2) == 0x2)
|
||||
{
|
||||
_state = State.HCRC;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
_state = State.DATA;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case DATA:
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
ByteBuffer buffer = getContent();
|
||||
|
||||
if (BufferUtil.isFull(buffer))
|
||||
return;
|
||||
|
||||
try
|
||||
{
|
||||
int length = _inflater.inflate(buffer.array(), buffer.arrayOffset() + buffer.position(), BufferUtil.space(buffer));
|
||||
buffer.limit(buffer.limit()+length);
|
||||
}
|
||||
catch (DataFormatException x)
|
||||
{
|
||||
throw new ZipException(x.getMessage());
|
||||
}
|
||||
|
||||
if (_inflater.needsInput())
|
||||
{
|
||||
ByteBuffer data = _compressed.peek();
|
||||
while(data!=null && BufferUtil.isEmpty(data))
|
||||
{
|
||||
_bufferPool.release(_compressed.poll());
|
||||
data = _compressed.peek();
|
||||
}
|
||||
if (data==null)
|
||||
return;
|
||||
|
||||
_inflater.setInput(data.array(), data.arrayOffset() + data.position(), data.remaining());
|
||||
data.position(data.limit());
|
||||
}
|
||||
else if (_inflater.finished())
|
||||
{
|
||||
ByteBuffer data = _compressed.peek();
|
||||
int remaining = _inflater.getRemaining();
|
||||
data.position(data.limit() - remaining);
|
||||
_state = State.CRC;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
ByteBuffer data = _compressed.peek();
|
||||
if (BufferUtil.isEmpty(data))
|
||||
break;
|
||||
|
||||
byte currByte = data.get();
|
||||
switch (_state)
|
||||
{
|
||||
case ID:
|
||||
{
|
||||
_value += (currByte & 0xFF) << 8 * _size;
|
||||
++_size;
|
||||
if (_size == 2)
|
||||
{
|
||||
if (_value != 0x8B1F)
|
||||
throw new ZipException("Invalid gzip bytes");
|
||||
_state = State.CM;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CM:
|
||||
{
|
||||
if ((currByte & 0xFF) != 0x08)
|
||||
throw new ZipException("Invalid gzip compression method");
|
||||
_state = State.FLG;
|
||||
break;
|
||||
}
|
||||
case FLG:
|
||||
{
|
||||
_flags = currByte;
|
||||
_state = State.MTIME;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
break;
|
||||
}
|
||||
case MTIME:
|
||||
{
|
||||
// Skip the 4 MTIME bytes
|
||||
++_size;
|
||||
if (_size == 4)
|
||||
_state = State.XFL;
|
||||
break;
|
||||
}
|
||||
case XFL:
|
||||
{
|
||||
// Skip XFL
|
||||
_state = State.OS;
|
||||
break;
|
||||
}
|
||||
case OS:
|
||||
{
|
||||
// Skip OS
|
||||
_state = State.FLAGS;
|
||||
break;
|
||||
}
|
||||
case EXTRA_LENGTH:
|
||||
{
|
||||
_value += (currByte & 0xFF) << 8 * _size;
|
||||
++_size;
|
||||
if (_size == 2)
|
||||
_state = State.EXTRA;
|
||||
break;
|
||||
}
|
||||
case EXTRA:
|
||||
{
|
||||
// Skip EXTRA bytes
|
||||
--_value;
|
||||
if (_value == 0)
|
||||
{
|
||||
// Clear the EXTRA flag and loop on the flags
|
||||
_flags &= ~0x04;
|
||||
_state = State.FLAGS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case NAME:
|
||||
{
|
||||
// Skip NAME bytes
|
||||
if (currByte == 0)
|
||||
{
|
||||
// Clear the NAME flag and loop on the flags
|
||||
_flags &= ~0x08;
|
||||
_state = State.FLAGS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case COMMENT:
|
||||
{
|
||||
// Skip COMMENT bytes
|
||||
if (currByte == 0)
|
||||
{
|
||||
// Clear the COMMENT flag and loop on the flags
|
||||
_flags &= ~0x10;
|
||||
_state = State.FLAGS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case HCRC:
|
||||
{
|
||||
// Skip HCRC
|
||||
++_size;
|
||||
if (_size == 2)
|
||||
{
|
||||
// Clear the HCRC flag and loop on the flags
|
||||
_flags &= ~0x02;
|
||||
_state = State.FLAGS;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CRC:
|
||||
{
|
||||
_value += (currByte & 0xFF) << 8 * _size;
|
||||
++_size;
|
||||
if (_size == 4)
|
||||
{
|
||||
// From RFC 1952, compliant decoders need not to verify the CRC
|
||||
_state = State.ISIZE;
|
||||
_size = 0;
|
||||
_value = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ISIZE:
|
||||
{
|
||||
_value += (currByte & 0xFF) << 8 * _size;
|
||||
++_size;
|
||||
if (_size == 4)
|
||||
{
|
||||
if (_value != _inflater.getBytesWritten())
|
||||
throw new ZipException("Invalid input size");
|
||||
|
||||
_inflater.reset();
|
||||
_state = State.END;
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
throw new ZipException();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (ZipException x)
|
||||
{
|
||||
throw new RuntimeException(x);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue