Author: isudana
Date: Sun Dec 25 16:57:39 2016
New Revision: 1776016
URL: http://svn.apache.org/viewvc?rev=1776016&view=rev
Log:
Fix possible buffer corruption issue in Passthrough Transport
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceContext.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetContext.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/SourceConnections.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java?rev=1776016&r1=1776015&r2=1776016&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
Sun Dec 25 16:57:39 2016
@@ -579,7 +579,7 @@ public class PassThroughHttpSender exten
}
SourceContext.updateState(conn, ProtocolState.CLOSED);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
}
}
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceContext.java?rev=1776016&r1=1776015&r2=1776016&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceContext.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceContext.java
Sun Dec 25 16:57:39 2016
@@ -23,8 +23,6 @@ import org.apache.http.nio.NHttpConnecti
import org.apache.synapse.transport.passthru.config.SourceConfiguration;
import org.apache.synapse.transport.passthru.util.ControlledByteBuffer;
-import java.nio.ByteBuffer;
-
/**
* This class represents the information about a TCP Connection at a given
point in time.
* In a Single TCP Connection there can be multiple HTTP Requests.
@@ -76,7 +74,24 @@ public class SourceContext {
this.response = response;
}
+ /**
+ * Reset the resources associated with this context
+ */
public void reset() {
+ reset(false);
+ }
+
+ /**
+ * Reset the resources associated with this context
+ *
+ * @param isError whether an error is causing this shutdown of the
connection.
+ * It is very important to set this flag correctly.
+ * When an error causing the shutdown of the connections we
should not
+ * release associated writer buffer to the pool as it might
lead into
+ * situations like same buffer is getting released to both
source and target
+ * buffer factories
+ */
+ public void reset(boolean isError) {
this.request = null;
this.response = null;
if (this.state != ProtocolState.CLOSED) {
@@ -85,7 +100,7 @@ public class SourceContext {
this.state = ProtocolState.REQUEST_READY;
}
- if (writer != null) {
+ if (writer != null && !isError) { // If there is an error we do not
release the buffer to the factory
ControlledByteBuffer buffer = writer.getBuffer();
buffer.clear();
sourceConfiguration.getBufferFactory().release(buffer);
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java?rev=1776016&r1=1776015&r2=1776016&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
Sun Dec 25 16:57:39 2016
@@ -113,12 +113,12 @@ public class SourceHandler implements NH
log.error("HTTP exception while processing request", e);
informReaderError(conn);
SourceContext.updateState(conn, ProtocolState.CLOSED);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
} catch (IOException e) {
logIOException(e);
informReaderError(conn);
SourceContext.updateState(conn, ProtocolState.CLOSED);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
}
}
@@ -143,7 +143,7 @@ public class SourceHandler implements NH
logIOException(e);
informReaderError(conn);
SourceContext.updateState(conn, ProtocolState.CLOSED);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
}
}
@@ -174,12 +174,12 @@ public class SourceHandler implements NH
logIOException(e);
informWriterError(conn);
SourceContext.updateState(conn, ProtocolState.CLOSING);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
} catch (HttpException e) {
log.error(e.getMessage(), e);
informWriterError(conn);
SourceContext.updateState(conn, ProtocolState.CLOSING);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
}
}
@@ -254,29 +254,33 @@ public class SourceHandler implements NH
logIOException(e);
informWriterError(conn);
SourceContext.updateState(conn, ProtocolState.CLOSING);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
}
}
public void endOfInput(NHttpServerConnection conn) throws IOException {
ProtocolState state = SourceContext.getState(conn);
+ boolean isError = false;
if (state == ProtocolState.REQUEST_READY || state ==
ProtocolState.RESPONSE_DONE) {
if (log.isDebugEnabled()) {
log.debug("Keep-Alive connection was closed by the client: " +
conn);
}
} else if (state == ProtocolState.REQUEST_BODY || state ==
ProtocolState.REQUEST_HEAD) {
+ isError = true;
informReaderError(conn);
log.warn("Connection closed by the client while reading the
request: " + conn);
} else if (state == ProtocolState.RESPONSE_BODY || state ==
ProtocolState.RESPONSE_HEAD) {
+ isError = true;
informWriterError(conn);
log.warn("Connection closed by the client end while writing the
response: " + conn);
} else if (state == ProtocolState.REQUEST_DONE) {
+ isError = true;
log.warn("Connection closed by the client after request is read: "
+ conn);
}
SourceContext.updateState(conn, ProtocolState.CLOSED);
- sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+ sourceConfiguration.getSourceConnections().shutDownConnection(conn,
isError);
}
public void exception(NHttpServerConnection conn, Exception e) {
@@ -302,7 +306,7 @@ public class SourceHandler implements NH
}
SourceContext.updateState(conn, ProtocolState.CLOSED);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
}
}
@@ -325,7 +329,7 @@ public class SourceHandler implements NH
}
SourceContext.updateState(conn, ProtocolState.CLOSED);
- sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+ sourceConfiguration.getSourceConnections().shutDownConnection(conn,
true);
}
private void logIOException(IOException e) {
@@ -361,7 +365,7 @@ public class SourceHandler implements NH
}
if (conn.isResponseSubmitted()) {
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
return;
}
HttpContext httpContext = conn.getContext();
@@ -382,7 +386,7 @@ public class SourceHandler implements NH
log.error("Error while handling HttpException", ex);
} finally {
SourceContext.updateState(conn, ProtocolState.CLOSED);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, true);
}
}
@@ -409,30 +413,34 @@ public class SourceHandler implements NH
}
SourceContext.updateState(conn, ProtocolState.CLOSED);
- sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+ sourceConfiguration.getSourceConnections().shutDownConnection(conn,
true);
}
public void closed(NHttpServerConnection conn) {
ProtocolState state = SourceContext.getState(conn);
+ boolean isFault = false;
if (state == ProtocolState.REQUEST_READY || state ==
ProtocolState.RESPONSE_DONE) {
if (log.isDebugEnabled()) {
log.debug("Keep-Alive connection was closed: " + conn);
}
} else if (state == ProtocolState.REQUEST_BODY || state ==
ProtocolState.REQUEST_HEAD) {
+ isFault = true;
informReaderError(conn);
log.warn("Connection closed while reading the request: " + conn);
} else if (state == ProtocolState.RESPONSE_BODY || state ==
ProtocolState.RESPONSE_HEAD) {
+ isFault = true;
informWriterError(conn);
log.warn("Connection closed while writing the response: " + conn);
} else if (state == ProtocolState.REQUEST_DONE) {
+ isFault = true;
log.warn("Connection closed after request is read: " + conn);
}
metrics.disconnected();
if (state != ProtocolState.CLOSED) {
SourceContext.updateState(conn, ProtocolState.CLOSED);
-
sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+
sourceConfiguration.getSourceConnections().shutDownConnection(conn, isFault);
}
}
@@ -440,7 +448,7 @@ public class SourceHandler implements NH
log.warn(action + " while the handler is in an inconsistent state " +
SourceContext.getState(conn));
SourceContext.updateState(conn, ProtocolState.CLOSED);
- sourceConfiguration.getSourceConnections().shutDownConnection(conn);
+ sourceConfiguration.getSourceConnections().shutDownConnection(conn,
true);
}
private void informReaderError(NHttpServerConnection conn) {
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetContext.java?rev=1776016&r1=1776015&r2=1776016&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetContext.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetContext.java
Sun Dec 25 16:57:39 2016
@@ -106,7 +106,24 @@ public class TargetContext {
this.writer = writer;
}
+ /**
+ * Reset the resources associated with this context
+ */
public void reset() {
+ reset(false);
+ }
+
+ /**
+ * Reset the resources associated with this context
+ *
+ * @param isError whether an error is causing this shutdown of the
connection.
+ * It is very important to set this flag correctly.
+ * When an error causing the shutdown of the connections we
should not
+ * release associated writer buffer to the pool as it might
lead into
+ * situations like same buffer is getting released to both
source and target
+ * buffer factories
+ */
+ public void reset(boolean isError) {
request = null;
response = null;
if (state != ProtocolState.CLOSED) {
@@ -114,14 +131,14 @@ public class TargetContext {
state = ProtocolState.REQUEST_READY;
}
- if (writer != null) {
+ if (writer != null && !isError) { // If there is an error we do not
release the buffer to the factory
ControlledByteBuffer buffer = writer.getBuffer();
buffer.clear();
targetConfiguration.getBufferFactory().release(buffer);
}
reader = null;
- writer = null;
+ writer = null;
}
public static void create(NHttpConnection conn, ProtocolState state,
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/SourceConnections.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/SourceConnections.java?rev=1776016&r1=1776015&r2=1776016&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/SourceConnections.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/SourceConnections.java
Sun Dec 25 16:57:39 2016
@@ -117,12 +117,27 @@ public class SourceConnections {
* @param conn the connection that needs to be shut down
*/
public void shutDownConnection(NHttpServerConnection conn) {
+ shutDownConnection(conn, false);
+ }
+
+ /**
+ * Shutdown a connection
+ *
+ * @param conn the connection that needs to be shut down
+ * @param isError whether an error is causing this shutdown of the
connection
+ * It is very important to set this flag correctly.
+ * When an error causing the shutdown of the connections we
should not
+ * release associated writer buffer to the pool as it might
lead into
+ * situations like same buffer is getting released to both
source and target
+ * buffer factories
+ */
+ public void shutDownConnection(NHttpServerConnection conn, boolean
isError) {
if (log.isDebugEnabled()) {
log.debug("Shutting down connection forcefully " + conn);
}
lock.lock();
try {
- SourceContext.get(conn).reset();
+ SourceContext.get(conn).reset(isError);
if (!busyConnections.remove(conn)) {
freeConnections.remove(conn);
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java?rev=1776016&r1=1776015&r2=1776016&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/connections/TargetConnections.java
Sun Dec 25 16:57:39 2016
@@ -150,10 +150,25 @@ public class TargetConnections {
* @param conn connection to shutdownConnection
*/
public void shutdownConnection(NHttpClientConnection conn) {
+ shutdownConnection(conn, false);
+ }
+
+ /**
+ * This connection is no longer valid. So we need to shutdown connection.
+ *
+ * @param conn connection to shutdownConnection
+ * @param isError whether an error is causing this shutdown of the
connection.
+ * It is very important to set this flag correctly.
+ * When an error causing the shutdown of the connections we
should not
+ * release associated writer buffer to the pool as it might
lead into
+ * situations like same buffer is getting released to both
source and target
+ * buffer factories
+ */
+ public void shutdownConnection(NHttpClientConnection conn, boolean
isError) {
HostConnections pool = (HostConnections)
conn.getContext().getAttribute(
PassThroughConstants.CONNECTION_POOL);
- TargetContext.get(conn).reset();
+ TargetContext.get(conn).reset(isError);
if (pool != null) {
pool.forget(conn);
