Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6029 - make certs available to tunnle servlet - HttpsNeedClientAuthSendAndReceiveTest regression, add javax.security so login exceptions can propogate over http - https://issues.apache.org/jira/browse/AMQ-6013

This commit is contained in:
gtully 2015-11-17 14:27:38 +00:00
parent 09054fc4a8
commit d7a3b9406b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-client/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java
View File

@ -40,7 +40,7 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream {
static { static {
serializablePackages = System.getProperty("org.apache.activemq.SERIALIZABLE_PACKAGES", serializablePackages = System.getProperty("org.apache.activemq.SERIALIZABLE_PACKAGES",
"java.lang,java.util,org.apache.activemq,org.fusesource.hawtbuf,com.thoughtworks.xstream.mapper").split(","); "java.lang,javax.security,java.util,org.apache.activemq,org.fusesource.hawtbuf,com.thoughtworks.xstream.mapper").split(",");
} }
public ClassLoadingAwareObjectInputStream(InputStream in) throws IOException { public ClassLoadingAwareObjectInputStream(InputStream in) throws IOException {

4
activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
View File

@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.activemq.Service; import org.apache.activemq.Service;
import org.apache.activemq.command.Command; import org.apache.activemq.command.Command;
import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.command.WireFormatInfo; import org.apache.activemq.command.WireFormatInfo;
import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportAcceptListener; import org.apache.activemq.transport.TransportAcceptListener;
@ -140,6 +141,9 @@ public class HttpTunnelServlet extends HttpServlet {
return; return;
} }
if (command instanceof ConnectionInfo) {
((ConnectionInfo) command).setTransportContext(request.getAttribute("javax.servlet.request.X509Certificate"));
}
transport.doConsume(command); transport.doConsume(command);
} }
} }