Repository: activemq-artemis Updated Branches: refs/heads/master 15c2f09bc -> e07d40ce6
This closes #1388 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e07d40ce Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e07d40ce Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e07d40ce Branch: refs/heads/master Commit: e07d40ce689bbe1e600e866beeb3c2afa0dd785c Parents: 15c2f09 d4150be Author: Clebert Suconic <clebertsuco...@apache.org> Authored: Thu Jul 6 23:41:02 2017 -0400 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Thu Jul 6 23:41:02 2017 -0400 ---------------------------------------------------------------------- .../artemis/core/remoting/CertificateUtil.java | 55 +++++++++ .../openwire/OpenWireProtocolManager.java | 10 +- .../core/protocol/stomp/StompConnection.java | 5 +- .../protocol/stomp/StompProtocolManager.java | 8 +- .../stomp/v10/StompFrameHandlerV10.java | 10 +- .../stomp/v11/StompFrameHandlerV11.java | 10 +- .../artemis/core/security/SecurityStore.java | 5 +- .../core/security/impl/SecurityStoreImpl.java | 11 +- .../core/server/impl/ActiveMQServerImpl.java | 9 +- .../security/ActiveMQJAASSecurityManager.java | 27 ++--- .../core/security/ActiveMQSecurityManager3.java | 7 +- .../core/security/jaas/JaasCallbackHandler.java | 18 ++- .../spi/core/security/jaas/Krb5SslCallback.java | 46 ++++++++ .../core/security/jaas/Krb5SslLoginModule.java | 112 +++++++++++++++++++ .../security/jaas/PropertiesLoginModule.java | 14 ++- .../TextFileCertificateLoginModuleTest.java | 18 ++- .../integration/security/SecurityTest.java | 7 +- .../ssl/CoreClientOverOneWaySSLKerb5Test.java | 55 +++++++-- .../dual-authentication-roles.properties | 3 +- .../src/test/resources/login.config | 11 ++ 20 files changed, 349 insertions(+), 92 deletions(-) ----------------------------------------------------------------------
