Skip to content

R
Rocketmq

小五666\n哈哈 / Rocketmq
与 Fork 源项目一致

Fork自 Apache RocketMQ / Rocketmq

通知 1
Star 0
Fork 0
R
Rocketmq

体验新版 GitCode，发现更多精彩内容 >>

提交 693243e8 编写于 作者: H hujie
浏览文件
操作

finishing

上级 7c2b40c3
隐藏空白更改
内联 并排
Showing with 166 addition and 212 deletion
acl-plug/src/main/java/org/apache/rocketmq/acl/plug/AccessContralAnalysis.java
浏览文件 @ 693243e8
...@@ -21,9 +21,7 @@ import java.util.HashMap; ...@@ -21,9 +21,7 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.acl.plug.annotation.RequestCode;
import org.apache.rocketmq.acl.plug.entity.AccessControl; import org.apache.rocketmq.acl.plug.entity.AccessControl;
import org.apache.rocketmq.acl.plug.exception.AclPlugAccountAnalysisException; import org.apache.rocketmq.acl.plug.exception.AclPlugAccountAnalysisException;
...@@ -31,23 +29,23 @@ public class AccessContralAnalysis { ...@@ -31,23 +29,23 @@ public class AccessContralAnalysis {
private Map<Class<?>, Map<Integer, Field>> classTocodeAndMentod = new HashMap<>(); private Map<Class<?>, Map<Integer, Field>> classTocodeAndMentod = new HashMap<>();
private Map<String , Integer> fieldNameAndCode = new HashMap<>(); private Map<String, Integer> fieldNameAndCode = new HashMap<>();
public void analysisClass(Class<?> clazz) { public void analysisClass(Class<?> clazz) {
Field[] fields = clazz.getDeclaredFields(); Field[] fields = clazz.getDeclaredFields();
try { try {
for(Field field : fields) { for (Field field : fields) {
if( field.getType().equals(int.class)) { if (field.getType().equals(int.class)) {
String name = StringUtils.replace(field.getName(), "_", "").toLowerCase(); String name = StringUtils.replace(field.getName(), "_", "").toLowerCase();
fieldNameAndCode.put(name, (Integer)field.get(null)); fieldNameAndCode.put(name, (Integer) field.get(null));
} }
} }
} catch (IllegalArgumentException | IllegalAccessException e) { } catch (IllegalArgumentException | IllegalAccessException e) {
throw new AclPlugAccountAnalysisException(String.format("analysis on failure Class is %s", clazz.getName()), e); throw new AclPlugAccountAnalysisException(String.format("analysis on failure Class is %s", clazz.getName()), e);
} }
} }
public Map<Integer, Boolean> analysis(AccessControl accessControl) { public Map<Integer, Boolean> analysis(AccessControl accessControl) {
Class<? extends AccessControl> clazz = accessControl.getClass(); Class<? extends AccessControl> clazz = accessControl.getClass();
Map<Integer, Field> codeAndField = classTocodeAndMentod.get(clazz); Map<Integer, Field> codeAndField = classTocodeAndMentod.get(clazz);
...@@ -55,18 +53,18 @@ public class AccessContralAnalysis { ...@@ -55,18 +53,18 @@ public class AccessContralAnalysis {
codeAndField = new HashMap<>(); codeAndField = new HashMap<>();
Field[] fields = clazz.getDeclaredFields(); Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) { for (Field field : fields) {
if(!field.getType().equals(boolean.class)) if (!field.getType().equals(boolean.class))
continue; continue;
Integer code = fieldNameAndCode.get(field.getName().toLowerCase()); Integer code = fieldNameAndCode.get(field.getName().toLowerCase());
if(code == null) { if (code == null) {
throw new AclPlugAccountAnalysisException(String.format("field nonexistent in code", field.getName())); throw new AclPlugAccountAnalysisException(String.format("field nonexistent in code fieldName is %s", field.getName()));
} }
field.setAccessible( true ); field.setAccessible(true);
codeAndField.put(code, field); codeAndField.put(code, field);
} }
if(codeAndField.isEmpty()) { if (codeAndField.isEmpty()) {
throw new AclPlugAccountAnalysisException(String.format("AccessControl nonexistent code , name %s" , accessControl.getClass().getName())); throw new AclPlugAccountAnalysisException(String.format("AccessControl nonexistent code , name %s", accessControl.getClass().getName()));
} }
classTocodeAndMentod.put(clazz, codeAndField); classTocodeAndMentod.put(clazz, codeAndField);
} }
......
acl-plug/src/main/java/org/apache/rocketmq/acl/plug/annotation/RequestCode.java 已删除 100644 → 0
浏览文件 @ 7c2b40c3
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.rocketmq.acl.plug.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
public @interface RequestCode {
int code();
}
acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/AuthenticationInfoManagementAclPlugEngine.java
浏览文件 @ 693243e8
...@@ -37,25 +37,18 @@ import org.apache.rocketmq.logging.InternalLoggerFactory; ...@@ -37,25 +37,18 @@ import org.apache.rocketmq.logging.InternalLoggerFactory;
public abstract class AuthenticationInfoManagementAclPlugEngine implements AclPlugEngine { public abstract class AuthenticationInfoManagementAclPlugEngine implements AclPlugEngine {
private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.ACL_PLUG_LOGGER_NAME); private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.ACL_PLUG_LOGGER_NAME);
ControllerParametersEntity controllerParametersEntity;
private Map<String/** account **/, Map<String/** netaddress **/, AuthenticationInfo>> accessControlMap = new HashMap<>(); private Map<String/** account **/, Map<String/** netaddress **/, AuthenticationInfo>> accessControlMap = new HashMap<>();
private AuthenticationInfo authenticationInfo; private AuthenticationInfo authenticationInfo;
private NetaddressStrategyFactory netaddressStrategyFactory = new NetaddressStrategyFactory(); private NetaddressStrategyFactory netaddressStrategyFactory = new NetaddressStrategyFactory();
private AccessContralAnalysis accessContralAnalysis = new AccessContralAnalysis(); private AccessContralAnalysis accessContralAnalysis = new AccessContralAnalysis();
private Authentication authentication = new Authentication(); private Authentication authentication = new Authentication();
ControllerParametersEntity controllerParametersEntity; public AuthenticationInfoManagementAclPlugEngine(ControllerParametersEntity controllerParametersEntity) {
public AuthenticationInfoManagementAclPlugEngine(ControllerParametersEntity controllerParametersEntity) {
this.controllerParametersEntity = controllerParametersEntity; this.controllerParametersEntity = controllerParametersEntity;
accessContralAnalysis.analysisClass(controllerParametersEntity.getAccessContralAnalysisClass()); accessContralAnalysis.analysisClass(controllerParametersEntity.getAccessContralAnalysisClass());
} }
public void setAccessControl(AccessControl accessControl) throws AclPlugAccountAnalysisException { public void setAccessControl(AccessControl accessControl) throws AclPlugAccountAnalysisException {
if (accessControl.getAccount() == null || accessControl.getPassword() == null || accessControl.getAccount().length() <= 6 || accessControl.getPassword().length() <= 6) { if (accessControl.getAccount() == null || accessControl.getPassword() == null || accessControl.getAccount().length() <= 6 || accessControl.getPassword().length() <= 6) {
throw new AclPlugAccountAnalysisException(String.format("The account password cannot be null and is longer than 6, account is %s password is %s", accessControl.getAccount(), accessControl.getPassword())); throw new AclPlugAccountAnalysisException(String.format("The account password cannot be null and is longer than 6, account is %s password is %s", accessControl.getAccount(), accessControl.getPassword()));
......
acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/LoginInfoAclPlugEngine.java
浏览文件 @ 693243e8
...@@ -18,7 +18,6 @@ package org.apache.rocketmq.acl.plug.engine; ...@@ -18,7 +18,6 @@ package org.apache.rocketmq.acl.plug.engine;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.apache.rocketmq.acl.plug.entity.AccessControl; import org.apache.rocketmq.acl.plug.entity.AccessControl;
import org.apache.rocketmq.acl.plug.entity.AuthenticationInfo; import org.apache.rocketmq.acl.plug.entity.AuthenticationInfo;
import org.apache.rocketmq.acl.plug.entity.AuthenticationResult; import org.apache.rocketmq.acl.plug.entity.AuthenticationResult;
...@@ -30,11 +29,10 @@ public abstract class LoginInfoAclPlugEngine extends AuthenticationInfoManagemen ...@@ -30,11 +29,10 @@ public abstract class LoginInfoAclPlugEngine extends AuthenticationInfoManagemen
private Map<String, LoginInfo> loginInfoMap = new ConcurrentHashMap<>(); private Map<String, LoginInfo> loginInfoMap = new ConcurrentHashMap<>();
public LoginInfoAclPlugEngine(ControllerParametersEntity controllerParametersEntity) {
public LoginInfoAclPlugEngine(ControllerParametersEntity controllerParametersEntity) { super(controllerParametersEntity);
super(controllerParametersEntity); }
}
public LoginInfo getLoginInfo(AccessControl accessControl) { public LoginInfo getLoginInfo(AccessControl accessControl) {
LoginInfo loginInfo = loginInfoMap.get(accessControl.getRecognition()); LoginInfo loginInfo = loginInfoMap.get(accessControl.getRecognition());
if (loginInfo == null) { if (loginInfo == null) {
......
acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngine.java
浏览文件 @ 693243e8
...@@ -26,10 +26,10 @@ import org.yaml.snakeyaml.Yaml; ...@@ -26,10 +26,10 @@ import org.yaml.snakeyaml.Yaml;
public class PlainAclPlugEngine extends LoginInfoAclPlugEngine { public class PlainAclPlugEngine extends LoginInfoAclPlugEngine {
private ControllerParametersEntity controllerParametersEntity;
public PlainAclPlugEngine(ControllerParametersEntity controllerParametersEntity) throws AclPlugAccountAnalysisException { public PlainAclPlugEngine(
super(controllerParametersEntity); ControllerParametersEntity controllerParametersEntity) throws AclPlugAccountAnalysisException {
super(controllerParametersEntity);
init(); init();
} }
......
acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/BorkerAccessControl.java
浏览文件 @ 693243e8
...@@ -18,7 +18,6 @@ package org.apache.rocketmq.acl.plug.entity; ...@@ -18,7 +18,6 @@ package org.apache.rocketmq.acl.plug.entity;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.apache.rocketmq.acl.plug.annotation.RequestCode;
public class BorkerAccessControl extends AccessControl { public class BorkerAccessControl extends AccessControl {
...@@ -28,101 +27,101 @@ public class BorkerAccessControl extends AccessControl { ...@@ -28,101 +27,101 @@ public class BorkerAccessControl extends AccessControl {
private Set<String> noPermitPullTopic = new HashSet<>(); private Set<String> noPermitPullTopic = new HashSet<>();
private boolean sendMessage = true; private boolean sendMessage = true;
private boolean sendMessageV2 = true; private boolean sendMessageV2 = true;
private boolean sendBatchMessage = true; private boolean sendBatchMessage = true;
private boolean consumerSendMsgBack = true; private boolean consumerSendMsgBack = true;
@RequestCode(code = 11)
private boolean pullMessage = true; private boolean pullMessage = true;
@RequestCode(code = 12)
private boolean queryMessage = true; private boolean queryMessage = true;
@RequestCode(code = 33)
private boolean viewMessageById = true; private boolean viewMessageById = true;
@RequestCode(code = 34)
private boolean heartBeat = true; private boolean heartBeat = true;
@RequestCode(code = 35)
private boolean unregisterClient = true; private boolean unregisterClient = true;
@RequestCode(code = 46)
private boolean checkClientConfig = true; private boolean checkClientConfig = true;
@RequestCode(code = 38)
private boolean getConsumerListByGroup = true; private boolean getConsumerListByGroup = true;
@RequestCode(code = 15)
private boolean updateConsumerOffset = true; private boolean updateConsumerOffset = true;
@RequestCode(code = 14)
private boolean queryConsumerOffset = true; private boolean queryConsumerOffset = true;
@RequestCode(code = 37)
private boolean endTransaction = true; private boolean endTransaction = true;
@RequestCode(code = 17)
private boolean updateAndCreateTopic = true; private boolean updateAndCreateTopic = true;
@RequestCode(code = 215)
private boolean deleteTopicInbroker = true; private boolean deleteTopicInbroker = true;
@RequestCode(code = 21)
private boolean getAllTopicConfig = true; private boolean getAllTopicConfig = true;
@RequestCode(code = 25)
private boolean updateBrokerConfig = true; private boolean updateBrokerConfig = true;
@RequestCode(code = 26)
private boolean getBrokerConfig = true; private boolean getBrokerConfig = true;
@RequestCode(code = 29)
private boolean searchOffsetByTimestamp = true; private boolean searchOffsetByTimestamp = true;
@RequestCode(code = 30)
private boolean getMaxOffset = true; private boolean getMaxOffset = true;
@RequestCode(code = 31)
private boolean getMixOffset = true; private boolean getMinOffset = true;
@RequestCode(code = 32)
private boolean getEarliestMsgStoretime = true; private boolean getEarliestMsgStoretime = true;
@RequestCode(code = 28)
private boolean getBrokerRuntimeInfo = true; private boolean getBrokerRuntimeInfo = true;
@RequestCode(code = 41)
private boolean lockBatchMQ = true; private boolean lockBatchMQ = true;
@RequestCode(code = 42)
private boolean unlockBatchMQ = true; private boolean unlockBatchMQ = true;
@RequestCode(code = 200)
private boolean updateAndCreteSubscriptiongroup = true; private boolean updateAndCreateSubscriptiongroup = true;
@RequestCode(code = 201)
private boolean getAllSubscriptiongroupConfig = true; private boolean getAllSubscriptiongroupConfig = true;
@RequestCode(code = 207)
private boolean deleteSubscriptiongroup = true; private boolean deleteSubscriptiongroup = true;
@RequestCode(code = 202)
private boolean getTopicStatsInfo = true; private boolean getTopicStatsInfo = true;
@RequestCode(code = 203)
private boolean getConsumerConnectionList = true; private boolean getConsumerConnectionList = true;
@RequestCode(code = 204)
private boolean getProducerConnectionList = true; private boolean getProducerConnectionList = true;
@RequestCode(code = 208)
private boolean getConsumeStats = true; private boolean getConsumeStats = true;
@RequestCode(code = 43)
private boolean getAllConsumerOffset = true; private boolean getAllConsumerOffset = true;
@RequestCode(code = 25)
private boolean getAllDelayOffset = true; private boolean getAllDelayOffset = true;
@RequestCode(code = 222)
private boolean invokeBrokerToresetOffset = true; private boolean invokeBrokerToresetOffset = true;
@RequestCode(code = 300)
private boolean queryTopicConsumByWho = true; private boolean queryTopicConsumeByWho = true;
@RequestCode(code = 301)
private boolean registerFilterServer = true; private boolean registerFilterServer = true;
private boolean queryConsumeTimeSpan = true; private boolean queryConsumeTimeSpan = true;
private boolean getSystemTopicListFromBroker = true; private boolean getSystemTopicListFromBroker = true;
@RequestCode(code = 306)
private boolean cleanExpiredConsumequeue = true; private boolean cleanExpiredConsumequeue = true;
@RequestCode(code = 316)
private boolean cleanUnusedTopic = true; private boolean cleanUnusedTopic = true;
@RequestCode(code = 307)
private boolean getConsumerRunningInfo = true; private boolean getConsumerRunningInfo = true;
@RequestCode(code = 308)
private boolean queryCorrectionOffset = true; private boolean queryCorrectionOffset = true;
@RequestCode(code = 309)
private boolean consumeMessageDirectly = true; private boolean consumeMessageDirectly = true;
@RequestCode(code = 314)
private boolean cloneGroupOffset = true; private boolean cloneGroupOffset = true;
@RequestCode(code = 315)
private boolean viewBrokerStatsData = true; private boolean viewBrokerStatsData = true;
@RequestCode(code = 317)
private boolean getBrokerConsumeStats = true; private boolean getBrokerConsumeStats = true;
@RequestCode(code = 321)
private boolean queryConsumeQueue = true; private boolean queryConsumeQueue = true;
public BorkerAccessControl() { public BorkerAccessControl() {
...@@ -325,16 +324,16 @@ public class BorkerAccessControl extends AccessControl { ...@@ -325,16 +324,16 @@ public class BorkerAccessControl extends AccessControl {
return getMaxOffset; return getMaxOffset;
} }
public void setGetMaxOffset(boolean getMaxOffset) { public void setGetMaxOffset(boolean getMinOffset) {
this.getMaxOffset = getMaxOffset; this.getMaxOffset = getMinOffset;
} }
public boolean isGetMixOffset() { public boolean isGetMinOffset() {
return getMixOffset; return getMinOffset;
} }
public void setGetMixOffset(boolean getMixOffset) { public void setGetMinOffset(boolean getMinOffset) {
this.getMixOffset = getMixOffset; this.getMinOffset = getMinOffset;
} }
public boolean isGetEarliestMsgStoretime() { public boolean isGetEarliestMsgStoretime() {
...@@ -369,12 +368,12 @@ public class BorkerAccessControl extends AccessControl { ...@@ -369,12 +368,12 @@ public class BorkerAccessControl extends AccessControl {
this.unlockBatchMQ = unlockBatchMQ; this.unlockBatchMQ = unlockBatchMQ;
} }
public boolean isUpdateAndCreteSubscriptiongroup() { public boolean isUpdateAndCreateSubscriptiongroup() {
return updateAndCreteSubscriptiongroup; return updateAndCreateSubscriptiongroup;
} }
public void setUpdateAndCreteSubscriptiongroup(boolean updateAndCreteSubscriptiongroup) { public void setUpdateAndCreateSubscriptiongroup(boolean updateAndCreateSubscriptiongroup) {
this.updateAndCreteSubscriptiongroup = updateAndCreteSubscriptiongroup; this.updateAndCreateSubscriptiongroup = updateAndCreateSubscriptiongroup;
} }
public boolean isGetAllSubscriptiongroupConfig() { public boolean isGetAllSubscriptiongroupConfig() {
...@@ -449,12 +448,12 @@ public class BorkerAccessControl extends AccessControl { ...@@ -449,12 +448,12 @@ public class BorkerAccessControl extends AccessControl {
this.invokeBrokerToresetOffset = invokeBrokerToresetOffset; this.invokeBrokerToresetOffset = invokeBrokerToresetOffset;
} }
public boolean isQueryTopicConsumByWho() { public boolean isQueryTopicConsumeByWho() {
return queryTopicConsumByWho; return queryTopicConsumeByWho;
} }
public void setQueryTopicConsumByWho(boolean queryTopicConsumByWho) { public void setQueryTopicConsumeByWho(boolean queryTopicConsumeByWho) {
this.queryTopicConsumByWho = queryTopicConsumByWho; this.queryTopicConsumeByWho = queryTopicConsumeByWho;
} }
public boolean isRegisterFilterServer() { public boolean isRegisterFilterServer() {
...@@ -601,8 +600,8 @@ public class BorkerAccessControl extends AccessControl { ...@@ -601,8 +600,8 @@ public class BorkerAccessControl extends AccessControl {
builder.append(", searchOffsetByTimestamp=").append(searchOffsetByTimestamp); builder.append(", searchOffsetByTimestamp=").append(searchOffsetByTimestamp);
if (!getMaxOffset) if (!getMaxOffset)
builder.append(", getMaxOffset=").append(getMaxOffset); builder.append(", getMaxOffset=").append(getMaxOffset);
if (!getMixOffset) if (!getMinOffset)
builder.append(", getMixOffset=").append(getMixOffset); builder.append(", getMixOffset=").append(getMinOffset);
if (!getEarliestMsgStoretime) if (!getEarliestMsgStoretime)
builder.append(", getEarliestMsgStoretime=").append(getEarliestMsgStoretime); builder.append(", getEarliestMsgStoretime=").append(getEarliestMsgStoretime);
if (!getBrokerRuntimeInfo) if (!getBrokerRuntimeInfo)
...@@ -611,8 +610,8 @@ public class BorkerAccessControl extends AccessControl { ...@@ -611,8 +610,8 @@ public class BorkerAccessControl extends AccessControl {
builder.append(", lockBatchMQ=").append(lockBatchMQ); builder.append(", lockBatchMQ=").append(lockBatchMQ);
if (!unlockBatchMQ) if (!unlockBatchMQ)
builder.append(", unlockBatchMQ=").append(unlockBatchMQ); builder.append(", unlockBatchMQ=").append(unlockBatchMQ);
if (!updateAndCreteSubscriptiongroup) if (!updateAndCreateSubscriptiongroup)
builder.append(", updateAndCreteSubscriptiongroup=").append(updateAndCreteSubscriptiongroup); builder.append(", updateAndCreateSubscriptiongroup=").append(updateAndCreateSubscriptiongroup);
if (!getAllSubscriptiongroupConfig) if (!getAllSubscriptiongroupConfig)
builder.append(", getAllSubscriptiongroupConfig=").append(getAllSubscriptiongroupConfig); builder.append(", getAllSubscriptiongroupConfig=").append(getAllSubscriptiongroupConfig);
if (!deleteSubscriptiongroup) if (!deleteSubscriptiongroup)
...@@ -631,8 +630,8 @@ public class BorkerAccessControl extends AccessControl { ...@@ -631,8 +630,8 @@ public class BorkerAccessControl extends AccessControl {
builder.append(", getAllDelayOffset=").append(getAllDelayOffset); builder.append(", getAllDelayOffset=").append(getAllDelayOffset);
if (!invokeBrokerToresetOffset) if (!invokeBrokerToresetOffset)
builder.append(", invokeBrokerToresetOffset=").append(invokeBrokerToresetOffset); builder.append(", invokeBrokerToresetOffset=").append(invokeBrokerToresetOffset);
if (!queryTopicConsumByWho) if (!queryTopicConsumeByWho)
builder.append(", queryTopicConsumByWho=").append(queryTopicConsumByWho); builder.append(", queryTopicConsumeByWho=").append(queryTopicConsumeByWho);
if (!registerFilterServer) if (!registerFilterServer)
builder.append(", registerFilterServer=").append(registerFilterServer); builder.append(", registerFilterServer=").append(registerFilterServer);
if (!queryConsumeTimeSpan) if (!queryConsumeTimeSpan)
......
acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/ControllerParametersEntity.java
浏览文件 @ 693243e8
...@@ -23,7 +23,7 @@ public class ControllerParametersEntity { ...@@ -23,7 +23,7 @@ public class ControllerParametersEntity {
private String fileHome; private String fileHome;
private Class<?> accessContralAnalysisClass = RequestCode.class; private Class<?> accessContralAnalysisClass = RequestCode.class;
public String getFileHome() { public String getFileHome() {
return fileHome; return fileHome;
} }
...@@ -32,21 +32,20 @@ public class ControllerParametersEntity { ...@@ -32,21 +32,20 @@ public class ControllerParametersEntity {
this.fileHome = fileHome; this.fileHome = fileHome;
} }
public Class<?> getAccessContralAnalysisClass() { public Class<?> getAccessContralAnalysisClass() {
return accessContralAnalysisClass; return accessContralAnalysisClass;
} }
public void setAccessContralAnalysisClass(Class<?> accessContralAnalysisClass) { public void setAccessContralAnalysisClass(Class<?> accessContralAnalysisClass) {
this.accessContralAnalysisClass = accessContralAnalysisClass; this.accessContralAnalysisClass = accessContralAnalysisClass;
} }
@Override @Override
public String toString() { public String toString() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append("ControllerParametersEntity [fileHome=").append(fileHome).append(", accessContralAnalysisClass=") builder.append("ControllerParametersEntity [fileHome=").append(fileHome).append(", accessContralAnalysisClass=")
.append(accessContralAnalysisClass).append("]"); .append(accessContralAnalysisClass).append("]");
return builder.toString(); return builder.toString();
} }
} }
acl-plug/src/test/java/org/apache/rocketmq/acl/plug/AccessContralAnalysisTest.java
浏览文件 @ 693243e8
...@@ -19,7 +19,6 @@ package org.apache.rocketmq.acl.plug; ...@@ -19,7 +19,6 @@ package org.apache.rocketmq.acl.plug;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.apache.rocketmq.acl.plug.entity.AccessControl; import org.apache.rocketmq.acl.plug.entity.AccessControl;
import org.apache.rocketmq.acl.plug.entity.BorkerAccessControl; import org.apache.rocketmq.acl.plug.entity.BorkerAccessControl;
import org.apache.rocketmq.acl.plug.exception.AclPlugAccountAnalysisException; import org.apache.rocketmq.acl.plug.exception.AclPlugAccountAnalysisException;
...@@ -30,13 +29,13 @@ import org.junit.Test; ...@@ -30,13 +29,13 @@ import org.junit.Test;
public class AccessContralAnalysisTest { public class AccessContralAnalysisTest {
AccessContralAnalysis accessContralAnalysis = new AccessContralAnalysis(); AccessContralAnalysis accessContralAnalysis = new AccessContralAnalysis();
@Before @Before
public void init() { public void init() {
accessContralAnalysis.analysisClass(RequestCode.class); accessContralAnalysis.analysisClass(RequestCode.class);
} }
@Test @Test
public void analysisTest() { public void analysisTest() {
BorkerAccessControl accessControl = new BorkerAccessControl(); BorkerAccessControl accessControl = new BorkerAccessControl();
...@@ -54,12 +53,11 @@ public class AccessContralAnalysisTest { ...@@ -54,12 +53,11 @@ public class AccessContralAnalysisTest {
} }
Assert.assertEquals(num, 1); Assert.assertEquals(num, 1);
} }
@Test(expected = AclPlugAccountAnalysisException.class)
@Test(expected=AclPlugAccountAnalysisException.class) public void analysisExceptionTest() {
public void analysisExceptionTest(){ AccessControl accessControl = new AccessControl();
AccessControl accessControl = new AccessControl(); accessContralAnalysis.analysis(accessControl);
accessContralAnalysis.analysis(accessControl);
} }
} }
acl-plug/src/test/java/org/apache/rocketmq/acl/plug/AuthenticationTest.java
浏览文件 @ 693243e8
...@@ -24,6 +24,7 @@ import org.apache.rocketmq.acl.plug.entity.AuthenticationResult; ...@@ -24,6 +24,7 @@ import org.apache.rocketmq.acl.plug.entity.AuthenticationResult;
import org.apache.rocketmq.acl.plug.entity.BorkerAccessControl; import org.apache.rocketmq.acl.plug.entity.BorkerAccessControl;
import org.apache.rocketmq.acl.plug.entity.LoginOrRequestAccessControl; import org.apache.rocketmq.acl.plug.entity.LoginOrRequestAccessControl;
import org.apache.rocketmq.acl.plug.strategy.OneNetaddressStrategy; import org.apache.rocketmq.acl.plug.strategy.OneNetaddressStrategy;
import org.apache.rocketmq.common.protocol.RequestCode;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
...@@ -33,9 +34,9 @@ public class AuthenticationTest { ...@@ -33,9 +34,9 @@ public class AuthenticationTest {
Authentication authentication = new Authentication(); Authentication authentication = new Authentication();
AuthenticationInfo authenticationInfo; AuthenticationInfo authenticationInfo;
BorkerAccessControl borkerAccessControl; BorkerAccessControl borkerAccessControl;
AuthenticationResult authenticationResult = new AuthenticationResult(); AuthenticationResult authenticationResult = new AuthenticationResult();
LoginOrRequestAccessControl loginOrRequestAccessControl = new LoginOrRequestAccessControl(); LoginOrRequestAccessControl loginOrRequestAccessControl = new LoginOrRequestAccessControl();
...@@ -63,6 +64,7 @@ public class AuthenticationTest { ...@@ -63,6 +64,7 @@ public class AuthenticationTest {
borkerAccessControl.setNoPermitPullTopic(noPermitPullTopic); borkerAccessControl.setNoPermitPullTopic(noPermitPullTopic);
AccessContralAnalysis accessContralAnalysis = new AccessContralAnalysis(); AccessContralAnalysis accessContralAnalysis = new AccessContralAnalysis();
accessContralAnalysis.analysisClass(RequestCode.class);
Map<Integer, Boolean> map = accessContralAnalysis.analysis(borkerAccessControl); Map<Integer, Boolean> map = accessContralAnalysis.analysis(borkerAccessControl);
authenticationInfo = new AuthenticationInfo(map, borkerAccessControl, netaddressStrategy); authenticationInfo = new AuthenticationInfo(map, borkerAccessControl, netaddressStrategy);
...@@ -71,7 +73,6 @@ public class AuthenticationTest { ...@@ -71,7 +73,6 @@ public class AuthenticationTest {
@Test @Test
public void authenticationTest() { public void authenticationTest() {
loginOrRequestAccessControl.setCode(317); loginOrRequestAccessControl.setCode(317);
boolean isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult); boolean isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult);
...@@ -116,26 +117,26 @@ public class AuthenticationTest { ...@@ -116,26 +117,26 @@ public class AuthenticationTest {
Assert.assertFalse(isReturn); Assert.assertFalse(isReturn);
} }
@Test @Test
public void isEmptyTest() { public void isEmptyTest() {
loginOrRequestAccessControl.setCode(10); loginOrRequestAccessControl.setCode(10);
loginOrRequestAccessControl.setTopic("absentTopic"); loginOrRequestAccessControl.setTopic("absentTopic");
boolean isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult); boolean isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult);
Assert.assertFalse(isReturn); Assert.assertFalse(isReturn);
Set<String> permitSendTopic = new HashSet<>(); Set<String> permitSendTopic = new HashSet<>();
borkerAccessControl.setPermitSendTopic(permitSendTopic); borkerAccessControl.setPermitSendTopic(permitSendTopic);
isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult); isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult);
Assert.assertTrue(isReturn); Assert.assertTrue(isReturn);
loginOrRequestAccessControl.setCode(11); loginOrRequestAccessControl.setCode(11);
isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult); isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult);
Assert.assertFalse(isReturn); Assert.assertFalse(isReturn);
borkerAccessControl.setPermitPullTopic(permitSendTopic); borkerAccessControl.setPermitPullTopic(permitSendTopic);
isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult); isReturn = authentication.authentication(authenticationInfo, loginOrRequestAccessControl, authenticationResult);
Assert.assertTrue(isReturn); Assert.assertTrue(isReturn);
} }
} }
acl-plug/src/test/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngineTest.java
浏览文件 @ 693243e8
...@@ -83,31 +83,30 @@ public class PlainAclPlugEngineTest { ...@@ -83,31 +83,30 @@ public class PlainAclPlugEngineTest {
} }
@Test(expected = AclPlugAccountAnalysisException.class) @Test(expected = AclPlugAccountAnalysisException.class)
public void accountNullTest() { public void accountNullTest() {
accessControl.setAccount(null); accessControl.setAccount(null);
plainAclPlugEngine.setAccessControl(accessControl); plainAclPlugEngine.setAccessControl(accessControl);
} }
@Test(expected = AclPlugAccountAnalysisException.class) @Test(expected = AclPlugAccountAnalysisException.class)
public void accountThanTest() { public void accountThanTest() {
accessControl.setAccount("123"); accessControl.setAccount("123");
plainAclPlugEngine.setAccessControl(accessControl); plainAclPlugEngine.setAccessControl(accessControl);
} }
@Test(expected = AclPlugAccountAnalysisException.class) @Test(expected = AclPlugAccountAnalysisException.class)
public void passWordtNullTest() { public void passWordtNullTest() {
accessControl.setAccount(null); accessControl.setAccount(null);
plainAclPlugEngine.setAccessControl(accessControl); plainAclPlugEngine.setAccessControl(accessControl);
} }
@Test(expected = AclPlugAccountAnalysisException.class) @Test(expected = AclPlugAccountAnalysisException.class)
public void passWordThanTest() { public void passWordThanTest() {
accessControl.setAccount("123"); accessControl.setAccount("123");
plainAclPlugEngine.setAccessControl(accessControl); plainAclPlugEngine.setAccessControl(accessControl);
} }
@Test(expected = AclPlugAccountAnalysisException.class) @Test(expected = AclPlugAccountAnalysisException.class)
public void testPlainAclPlugEngineInit() { public void testPlainAclPlugEngineInit() {
ControllerParametersEntity controllerParametersEntity = new ControllerParametersEntity(); ControllerParametersEntity controllerParametersEntity = new ControllerParametersEntity();
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或