This is an automated email from the ASF dual-hosted git repository. dongeforever pushed a commit to branch feature_acl in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 76ab7bdbfbc838fd2d998419ada57b469689f7e6 Merge: 4915871 aea7461 Author: Zhendong Liu <[email protected]> AuthorDate: Sat Oct 27 14:06:57 2018 +0800 Merge pull request #485 from githublaohu/develop-acl Merge to branch feature_acl, and make it easy for others to polish acl-plug/pom.xml | 52 ++ .../rocketmq/acl/plug/AccessContralAnalysis.java | 84 +++ .../rocketmq/acl/plug/AclPlugController.java | 59 ++ .../rocketmq/acl/plug/AclRemotingService.java | 26 + .../org/apache/rocketmq/acl/plug/AclUtils.java | 82 +++ .../apache/rocketmq/acl/plug/Authentication.java | 59 ++ .../acl/plug/DefaultAclRemotingServiceImpl.java | 44 ++ .../rocketmq/acl/plug/engine/AclPlugEngine.java | 35 ++ .../AuthenticationInfoManagementAclPlugEngine.java | 139 +++++ .../acl/plug/engine/LoginInfoAclPlugEngine.java | 65 ++ .../acl/plug/engine/PlainAclPlugEngine.java | 59 ++ .../rocketmq/acl/plug/entity/AccessControl.java | 93 +++ .../acl/plug/entity/AuthenticationInfo.java | 80 +++ .../acl/plug/entity/AuthenticationResult.java | 61 ++ .../acl/plug/entity/BorkerAccessControl.java | 663 +++++++++++++++++++++ .../plug/entity/BorkerAccessControlTransport.java | 52 ++ .../acl/plug/entity/ControllerParameters.java | 51 ++ .../apache/rocketmq/acl/plug/entity/LoginInfo.java | 82 +++ .../plug/exception/AclPlugRuntimeException.java | 31 + .../acl/plug/strategy/NetaddressStrategy.java | 24 + .../plug/strategy/NetaddressStrategyFactory.java | 160 +++++ .../acl/plug/AccessContralAnalysisTest.java | 63 ++ .../rocketmq/acl/plug/AclPlugControllerTest.java | 21 + .../org/apache/rocketmq/acl/plug/AclUtilsTest.java | 129 ++++ .../rocketmq/acl/plug/AuthenticationTest.java | 141 +++++ .../acl/plug/engine/PlainAclPlugEngineTest.java | 291 +++++++++ .../acl/plug/strategy/NetaddressStrategyTest.java | 202 +++++++ .../src/test/resources/conf/transport.yml | 26 +- broker/pom.xml | 34 +- .../apache/rocketmq/broker/BrokerController.java | 56 ++ .../broker/client/ClientHousekeepingService.java | 3 + .../org/apache/rocketmq/common/BrokerConfig.java | 31 +- .../rocketmq/common/constant/LoggerName.java | 1 + .../org/apache/rocketmq/common/MixAllTest.java | 3 +- distribution/conf/broker.conf | 2 + distribution/conf/{broker.conf => transport.yml} | 26 +- .../rocketmq/example/simple/PullConsumer.java | 4 +- .../rocketmq/example/simple/PullConsumerTest.java | 1 + pom.xml | 11 +- 39 files changed, 2999 insertions(+), 47 deletions(-)
