This closes #1961
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2f9d3739 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2f9d3739 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2f9d3739 Branch: refs/heads/master Commit: 2f9d3739375ed1b2aea19d77eda8440c56101072 Parents: 92a73e2 72ec6c8 Author: Timothy Bish <[email protected]> Authored: Thu Mar 22 10:10:50 2018 -0400 Committer: Timothy Bish <[email protected]> Committed: Thu Mar 22 10:10:50 2018 -0400 ---------------------------------------------------------------------- .../amqp/broker/AMQPConnectionCallback.java | 16 ++ .../amqp/proton/AMQPConnectionContext.java | 1 - .../amqp/proton/handler/ProtonHandler.java | 213 +++++++++-------- .../protocol/amqp/sasl/ExternalServerSASL.java | 62 +++++ .../protocol/amqp/sasl/GSSAPISASLResult.java | 51 ---- .../protocol/amqp/sasl/GSSAPIServerSASL.java | 4 +- .../protocol/amqp/sasl/PrincipalSASLResult.java | 51 ++++ docs/user-manual/en/security.md | 5 + .../integration/amqp/JMSSaslExternalTest.java | 235 +++++++++++++++++++ .../integration/amqp/JMSSaslGssapiTest.java | 11 +- .../src/test/resources/cert-roles.properties | 1 + .../src/test/resources/cert-users.properties | 1 + 12 files changed, 492 insertions(+), 159 deletions(-) ----------------------------------------------------------------------
