Skip to content

DIRMINA-1205 - deadlock when using SSL in combination with proxy filter #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
the-thing wants to merge 1 commit into
base: 2.2.X
Choose a base branch
from
Open

DIRMINA-1205 - deadlock when using SSL in combination with proxy filter #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions mina-core/src/main/java/org/apache/mina/proxy/filter/ProxyFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,13 @@ private ProxyLogicHandler getProxyHandler(final IoSession session) {
public void messageReceived(final NextFilter nextFilter, final IoSession session, final Object message)
throws ProxyAuthException {
ProxyLogicHandler handler = getProxyHandler(session);
IoBuffer buf = (IoBuffer) message;
boolean forward;

synchronized (handler) {
IoBuffer buf = (IoBuffer) message;

if (handler.isHandshakeComplete()) {
// Handshake done - pass data on as-is
nextFilter.messageReceived(session, buf);

forward = true;
} else {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(" Data Read: {} ({})", handler, buf);
Expand All @@ -173,16 +172,19 @@ public void messageReceived(final NextFilter nextFilter, final IoSession session
}
}

// Pass on any remaining data to the next filter
if (buf.hasRemaining()) {
forward = buf.hasRemaining();

if (forward) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(" Passing remaining data to next filter");
}

nextFilter.messageReceived(session, buf);
}
}
}

if (forward) {
nextFilter.messageReceived(session, buf);
}
}

/**
Expand Down Expand Up @@ -210,35 +212,40 @@ public void filterWrite(final NextFilter nextFilter, final IoSession session, fi
public void writeData(final NextFilter nextFilter, final IoSession session, final WriteRequest writeRequest,
final boolean isHandshakeData) {
ProxyLogicHandler handler = getProxyHandler(session);
boolean forward;

synchronized (handler) {
if (handler.isHandshakeComplete()) {
// Handshake is done - write data as normal
nextFilter.filterWrite(session, writeRequest);
forward = true;
} else if (isHandshakeData) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(" handshake data: {}", writeRequest.getMessage());
}

// Writing handshake data
nextFilter.filterWrite(session, writeRequest);
forward = true;
} else {
// Writing non-handshake data before the handshake finished
if (!session.isConnected()) {
// Not even connected - ignore
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(" Write request on closed session. Request ignored.");
}
forward = false;
} else {
// Queue the data to be sent as soon as the handshake completes
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(" Handshaking is not complete yet. Buffering write request.");
}

handler.enqueueWriteRequest(nextFilter, writeRequest);
forward = false;
}
}
}

if (forward) {
nextFilter.filterWrite(session, writeRequest);
}
}

/**
Expand Down
Loading
Loading