This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.
from a7e77d2 modify exception declaration
add a2165d8 [ISSUE #1156]new mqadmin API for ACL configuration (#1217)
add 18601ec Merge remote-tracking branch 'origin/develop' into
enchanced_acl
add 3adbca9 [ISSUE #1156]fix failure test cases for acl mqadmin command;
add d1db4a1 [ISSUE #1156]fix too many files with unapproved license
issues;
new a5d34dd Merge pull request #1257 from apache/enchanced_acl
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 +++----
.../conf/{plain_acl.yml => plain_acl_correct.yml} | 5 -
.../conf/{plain_acl.yml => plain_acl_delete.yml} | 5 -
...in_acl.yml => plain_acl_global_white_addrs.yml} | 5 -
.../{plain_acl.yml => plain_acl_update_create.yml} | 5 -
..._acl_null.yml => plain_acl_with_no_accouts.yml} | 4 +-
.../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 +
.../ClusterAclVersionInfo.java} | 30 +--
.../header/CreateAccessConfigRequestHeader.java | 113 +++++++++
...r.java => DeleteAccessConfigRequestHeader.java} | 17 +-
....java => GetBrokerAclConfigResponseHeader.java} | 31 +--
...UpdateGlobalWhiteAddrsConfigRequestHeader.java} | 17 +-
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 ++++++++++
.../DeleteAccessConfigSubCommand.java} | 60 ++---
.../command/acl/UpdateAccessConfigSubCommand.java | 185 ++++++++++++++
.../UpdateGlobalWhiteAddrSubCommand.java} | 69 +++--
...ClusterAclConfigVersionListSubCommandTest.java} | 13 +-
.../DeleteAccessConfigSubCommandTest.java} | 15 +-
.../acl/UpdateAccessConfigSubCommandTest.java | 89 +++++++
.../UpdateGlobalWhiteAddrSubCommandTest.java} | 15 +-
.../command/topic/UpdateTopicSubCommandTest.java | 2 -
42 files changed, 2038 insertions(+), 323 deletions(-)
create mode 100644
acl/src/main/java/org/apache/rocketmq/acl/common/AclConstants.java
rename
acl/src/main/java/org/apache/rocketmq/acl/plain/{PlainPermissionLoader.java =>
PlainPermissionManager.java} (53%)
rename
acl/src/test/java/org/apache/rocketmq/acl/plain/{PlainPermissionLoaderTest.java
=> PlainPermissionManagerTest.java} (75%)
copy acl/src/test/resources/conf/{plain_acl.yml => plain_acl_correct.yml} (92%)
copy acl/src/test/resources/conf/{plain_acl.yml => plain_acl_delete.yml} (92%)
copy acl/src/test/resources/conf/{plain_acl.yml =>
plain_acl_global_white_addrs.yml} (92%)
copy acl/src/test/resources/conf/{plain_acl.yml =>
plain_acl_update_create.yml} (92%)
copy acl/src/test/resources/conf/{plain_acl_null.yml =>
plain_acl_with_no_accouts.yml} (93%)
create mode 100644
common/src/main/java/org/apache/rocketmq/common/PlainAccessConfig.java
copy
common/src/main/java/org/apache/rocketmq/common/protocol/{header/namesrv/QueryDataVersionRequestHeader.java
=> body/ClusterAclVersionInfo.java} (69%)
create mode 100644
common/src/main/java/org/apache/rocketmq/common/protocol/header/CreateAccessConfigRequestHeader.java
copy
common/src/main/java/org/apache/rocketmq/common/protocol/header/{GetTopicsByClusterRequestHeader.java
=> DeleteAccessConfigRequestHeader.java} (77%)
copy
common/src/main/java/org/apache/rocketmq/common/protocol/header/{namesrv/QueryDataVersionRequestHeader.java
=> GetBrokerAclConfigResponseHeader.java} (81%)
copy
common/src/main/java/org/apache/rocketmq/common/protocol/header/{GetConsumeStatsInBrokerHeader.java
=> UpdateGlobalWhiteAddrsConfigRequestHeader.java} (73%)
create mode 100644
tools/src/main/java/org/apache/rocketmq/tools/command/acl/ClusterAclConfigVersionListSubCommand.java
copy
tools/src/main/java/org/apache/rocketmq/tools/command/{broker/UpdateBrokerConfigSubCommand.java
=> acl/DeleteAccessConfigSubCommand.java} (60%)
create mode 100644
tools/src/main/java/org/apache/rocketmq/tools/command/acl/UpdateAccessConfigSubCommand.java
copy
tools/src/main/java/org/apache/rocketmq/tools/command/{broker/UpdateBrokerConfigSubCommand.java
=> acl/UpdateGlobalWhiteAddrSubCommand.java} (57%)
copy
tools/src/test/java/org/apache/rocketmq/tools/command/{topic/TopicStatusSubCommandTest.java
=> acl/ClusterAclConfigVersionListSubCommandTest.java} (79%)
copy
tools/src/test/java/org/apache/rocketmq/tools/command/{topic/DeleteTopicSubCommandTest.java
=> acl/DeleteAccessConfigSubCommandTest.java} (79%)
create mode 100644
tools/src/test/java/org/apache/rocketmq/tools/command/acl/UpdateAccessConfigSubCommandTest.java
copy
tools/src/test/java/org/apache/rocketmq/tools/command/{topic/DeleteTopicSubCommandTest.java
=> acl/UpdateGlobalWhiteAddrSubCommandTest.java} (75%)
