This is an automated email from the ASF dual-hosted git repository. duhengforever pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit a5d34dd494be320287c1e355f0c2957b8c631359 Merge: a7e77d2 d1db4a1 Author: Heng Du <[email protected]> AuthorDate: Sun Jun 16 11:03:46 2019 +0800 Merge pull request #1257 from apache/enchanced_acl [ISSUE #1156]Add new mqadmin API for ACL configuration .../org/apache/rocketmq/acl/AccessValidator.java | 31 +++ .../apache/rocketmq/acl/common/AclConstants.java | 50 ++++ .../org/apache/rocketmq/acl/common/AclUtils.java | 34 ++- .../rocketmq/acl/plain/PlainAccessResource.java | 2 +- .../rocketmq/acl/plain/PlainAccessValidator.java | 28 +- ...sionLoader.java => PlainPermissionManager.java} | 282 ++++++++++++++------- .../apache/rocketmq/acl/common/AclUtilsTest.java | 73 +++++- .../acl/plain/PlainAccessValidatorTest.java | 264 +++++++++++++++++++ ...erTest.java => PlainPermissionManagerTest.java} | 93 +++---- acl/src/test/resources/conf/plain_acl_correct.yml | 39 +++ acl/src/test/resources/conf/plain_acl_delete.yml | 39 +++ .../conf/plain_acl_global_white_addrs.yml | 39 +++ .../resources/conf/plain_acl_update_create.yml | 39 +++ .../resources/conf/plain_acl_with_no_accouts.yml | 20 ++ .../apache/rocketmq/broker/BrokerController.java | 8 +- .../broker/processor/AdminBrokerProcessor.java | 149 +++++++++++ .../rocketmq/client/impl/MQClientAPIImpl.java | 105 ++++++++ .../rocketmq/client/impl/MQClientAPIImplTest.java | 137 ++++++++++ .../trace/DefaultMQConsumerWithTraceTest.java | 3 - .../apache/rocketmq/common/PlainAccessConfig.java | 102 ++++++++ .../java/org/apache/rocketmq/common/UtilAll.java | 28 +- .../rocketmq/common/protocol/RequestCode.java | 8 + .../rocketmq/common/protocol/ResponseCode.java | 7 + .../protocol/body/ClusterAclVersionInfo.java | 64 +++++ .../header/CreateAccessConfigRequestHeader.java | 113 +++++++++ .../header/DeleteAccessConfigRequestHeader.java | 42 +-- .../header/GetBrokerAclConfigResponseHeader.java | 71 ++++++ .../UpdateGlobalWhiteAddrsConfigRequestHeader.java | 35 +-- docs/cn/acl/user_guide.md | 73 +++++- .../rocketmq/tools/admin/DefaultMQAdminExt.java | 24 ++ .../tools/admin/DefaultMQAdminExtImpl.java | 25 ++ .../apache/rocketmq/tools/admin/MQAdminExt.java | 14 + .../rocketmq/tools/command/MQAdminStartup.java | 10 + .../acl/ClusterAclConfigVersionListSubCommand.java | 131 ++++++++++ .../command/acl/DeleteAccessConfigSubCommand.java | 106 ++++++++ .../command/acl/UpdateAccessConfigSubCommand.java | 185 ++++++++++++++ .../acl/UpdateGlobalWhiteAddrSubCommand.java | 101 ++++++++ ...ClusterAclConfigVersionListSubCommandTest.java} | 28 +- .../DeleteAccessConfigSubCommandTest.java} | 29 +-- .../acl/UpdateAccessConfigSubCommandTest.java | 89 +++++++ .../UpdateGlobalWhiteAddrSubCommandTest.java} | 29 +-- .../command/topic/UpdateTopicSubCommandTest.java | 2 - 42 files changed, 2487 insertions(+), 264 deletions(-)
