Repository: activemq-artemis Updated Branches: refs/heads/master 1d31227cd -> 0d9a114a9
This closes #1771 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0d9a114a Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0d9a114a Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0d9a114a Branch: refs/heads/master Commit: 0d9a114a96cf7916dff3d28fc5a412acc4daf9e0 Parents: 1d31227 bb84f67 Author: Justin Bertram <jbert...@apache.org> Authored: Thu Jan 18 08:59:00 2018 -0600 Committer: Justin Bertram <jbert...@apache.org> Committed: Thu Jan 18 08:59:00 2018 -0600 ---------------------------------------------------------------------- .../apache/activemq/cli/test/HashUtilTest.java | 47 ++++++ .../artemis/utils/PasswordMaskingUtil.java | 48 +++++- .../artemis/utils/SecureHashProcessor.java | 7 +- .../artemis/utils/SensitiveDataCodec.java | 3 +- .../utils/MaskPasswordResolvingTest.java | 116 ++++++++++++++ .../config/ActiveMQDefaultConfiguration.java | 4 +- .../client/ActiveMQClientMessageBundle.java | 6 - .../artemis/utils/ConfigurationHelper.java | 19 +-- artemis-dto/pom.xml | 8 + .../activemq/artemis/dto/WebServerDTO.java | 35 ++++- .../artemis/jms/bridge/impl/JMSBridgeImpl.java | 27 +--- .../artemis/ra/ActiveMQRAProperties.java | 28 +--- .../artemis/ra/ActiveMQResourceAdapter.java | 5 +- .../artemis/ra/inflow/ActiveMQActivation.java | 18 +-- .../artemis/core/config/Configuration.java | 4 +- .../core/config/impl/ConfigurationImpl.java | 23 ++- .../config/impl/FileSecurityConfiguration.java | 16 +- .../deployers/impl/FileConfigurationParser.java | 37 ++--- .../spi/core/security/jaas/LDAPLoginModule.java | 37 ++++- .../artemis/utils/XMLConfigurationUtil.java | 2 +- .../impl/FileConfigurationParserTest.java | 82 ++++++++++ .../jaas/LDAPLoginModuleMaskPasswordTest.java | 156 +++++++++++++++++++ .../jaas/PropertiesLoginModuleTest.java | 7 + artemis-server/src/test/resources/login.config | 59 +++++++ .../src/test/resources/users.properties | 1 + artemis-web/pom.xml | 7 + .../artemis/component/WebServerComponent.java | 4 +- .../cli/test/WebServerComponentTest.java | 51 +++++- .../src/test/resources/bootstrap_secure_web.xml | 34 ++++ .../src/test/resources/bootstrap_web.xml | 34 ++++ .../src/test/resources/bootstrap_web_codec.xml | 34 ++++ docs/user-manual/en/masking-passwords.md | 141 +++++++++++++++-- .../integration/ra/ResourceAdapterTest.java | 84 +++++++++- .../jms/bridge/impl/JMSBridgeImplTest.java | 39 +++++ 34 files changed, 1057 insertions(+), 166 deletions(-) ----------------------------------------------------------------------
