You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by do...@apache.org on 2018/12/26 13:24:04 UTC
[rocketmq] 01/01: Merge branch 'feature_acl' into msg_track
This is an automated email from the ASF dual-hosted git repository.
dongeforever pushed a commit to branch msg_track
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 4250af6e564f9f68a42e17ffed604d81a235c3f0
Merge: d572ffa 0bb40f9
Author: dongeforever <do...@apache.org>
AuthorDate: Wed Dec 26 21:23:26 2018 +0800
Merge branch 'feature_acl' into msg_track
.gitignore | 1 +
acl/pom.xml | 53 ++++
.../org/apache/rocketmq/acl/AccessResource.java | 21 ++
.../org/apache/rocketmq/acl/AccessValidator.java | 37 +++
.../rocketmq/acl/common/AclClientRPCHook.java | 97 ++++++
.../apache/rocketmq/acl/common/AclException.java | 72 +++++
.../org/apache/rocketmq/acl/common/AclSigner.java | 88 ++++++
.../org/apache/rocketmq/acl/common/AclUtils.java | 140 +++++++++
.../org/apache/rocketmq/acl/common/Permission.java | 96 ++++++
.../rocketmq/acl/common/SessionCredentials.java | 163 ++++++++++
.../rocketmq/acl/common/SigningAlgorithm.java | 24 ++
.../rocketmq/acl/plain/PlainAccessResource.java | 201 ++++++++++++
.../rocketmq/acl/plain/PlainAccessValidator.java | 130 ++++++++
.../rocketmq/acl/plain/PlainPermissionLoader.java | 349 +++++++++++++++++++++
.../rocketmq/acl/plain/RemoteAddressStrategy.java | 22 ++
.../acl/plain/RemoteAddressStrategyFactory.java | 181 +++++++++++
.../apache/rocketmq/acl/common/AclSignerTest.java | 18 ++
.../apache/rocketmq/acl/common/AclUtilsTest.java | 141 +++++++++
.../apache/rocketmq/acl/common/PermissionTest.java | 156 +++++++++
.../acl/common/SessionCredentialsTest.java | 29 ++
.../acl/plain/PlainAccessValidatorTest.java | 233 ++++++++++++++
.../acl/plain/PlainPermissionLoaderTest.java | 263 ++++++++++++++++
.../acl/plain/RemoteAddressStrategyTest.java | 218 +++++++++++++
.../src/test/resources/conf/plain_acl.yml | 36 ++-
.../src/test/resources/conf/plain_acl_null.yml | 10 +-
broker/pom.xml | 34 +-
.../apache/rocketmq/broker/BrokerController.java | 49 +++
.../rocketmq/broker/util/ServiceProvider.java | 8 +
.../org.apache.rocketmq.acl.AccessValidator | 1 +
.../rocketmq/broker/BrokerControllerTest.java | 1 +
.../rocketmq/broker/util/ServiceProviderTest.java | 9 +
.../org.apache.rocketmq.acl.AccessValidator | 1 +
.../org/apache/rocketmq/common/BrokerConfig.java | 35 ++-
.../java/org/apache/rocketmq/common/UtilAll.java | 12 +
.../rocketmq/common/constant/LoggerName.java | 1 +
.../org/apache/rocketmq/common/MixAllTest.java | 3 +-
distribution/conf/broker.conf | 2 +
distribution/conf/{broker.conf => plain_acl.yml} | 32 +-
distribution/conf/{broker.conf => tools.yml} | 11 +-
example/pom.xml | 5 +
.../apache/rocketmq/example/simple/AclClient.java | 175 +++++++++++
.../rocketmq/example/simple/PullConsumer.java | 4 +-
.../rocketmq/example/simple/PullConsumerTest.java | 1 +
pom.xml | 25 +-
.../remoting/netty/NettyRemotingAbstract.java | 60 +++-
.../remoting/netty/NettyRemotingClient.java | 31 +-
.../remoting/netty/NettyRemotingServer.java | 13 +-
.../org/apache/rocketmq/srvutil/ServerUtil.java | 4 +-
.../org/apache/rocketmq/test/base/BaseConf.java | 5 +
tools/pom.xml | 11 +-
.../rocketmq/tools/command/MQAdminStartup.java | 33 +-
51 files changed, 3234 insertions(+), 111 deletions(-)