clean

acl-plug/pom.xml

@@ -18,7 +18,7 @@
         <artifactId>rocketmq-all</artifactId>
         <version>4.4.0-SNAPSHOT</version>
     </parent>
-    <artifactId>rocketmq-acl-plug</artifactId>
+    <artifactId>rocketmq-acl</artifactId>
     <name>rocketmq-acl-plug ${project.version}</name>
 
     <url>http://maven.apache.org</url>

acl-plug/src/main/java/org/apache/rocketmq/acl/AccessValidator.java

@@ -22,14 +22,16 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 public interface AccessValidator {
     /**
      * Parse to get the AccessResource(user, resource, needed permission)
+     *
      * @param request
      * @return
      */
-    AccessResource parse(RemotingCommand request,String remoteAddr);
+    AccessResource parse(RemotingCommand request, String remoteAddr);
 
     /**
      * Validate the access resource.
+     *
      * @param accessResource
      */
-    void validate(AccessResource accessResource) ;
+    void validate(AccessResource accessResource);
 }

acl-plug/src/main/java/org/apache/rocketmq/acl/DefaultAccessValidator.java

@@ -21,11 +21,13 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 
 public class DefaultAccessValidator implements AccessValidator {
 
-    @Override public AccessResource parse(RemotingCommand request,String remoteAddr ) {
+    @Override
+    public AccessResource parse(RemotingCommand request, String remoteAddr) {
         return null;
     }
 
-    @Override public void validate(AccessResource accessResource) {
+    @Override
+    public void validate(AccessResource accessResource) {
 
     }
 }

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/AccessContralAnalysis.java

@@ -16,14 +16,15 @@
  */
 package org.apache.rocketmq.acl.plug;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.acl.plug.entity.AccessControl;
+import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
+
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.rocketmq.acl.plug.entity.AccessControl;
-import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
 
 public class AccessContralAnalysis {
 

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/DefaultAclRemotingServiceImpl.java

@@ -16,8 +16,6 @@
  */
 package org.apache.rocketmq.acl.plug;
 
-import java.util.HashMap;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.acl.AccessResource;
 import org.apache.rocketmq.acl.AccessValidator;
@@ -29,7 +27,9 @@ import org.apache.rocketmq.acl.plug.entity.ControllerParameters;
 import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 
-public class DefaultAclRemotingServiceImpl implements AclRemotingService ,AccessValidator{
+import java.util.HashMap;
+
+public class DefaultAclRemotingServiceImpl implements AclRemotingService, AccessValidator {
 
     private AclPlugEngine aclPlugEngine;
 
@@ -56,7 +56,7 @@ public class DefaultAclRemotingServiceImpl implements AclRemotingService ,Access
     }
 
     @Override
-	public AccessResource parse(RemotingCommand request ,String remoteAddr) {
+    public AccessResource parse(RemotingCommand request, String remoteAddr) {
         HashMap<String, String> extFields = request.getExtFields();
         AccessControl accessControl = new AccessControl();
         accessControl.setCode(request.getCode());
@@ -66,13 +66,13 @@ public class DefaultAclRemotingServiceImpl implements AclRemotingService ,Access
             accessControl.setPassword(extFields.get("password"));
             accessControl.setNetaddress(StringUtils.split(remoteAddr, ":")[0]);
             accessControl.setTopic(extFields.get("topic"));
-}
+        }
         return accessControl;
     }
 
     @Override
     public void validate(AccessResource accessResource) {
-		AuthenticationResult authenticationResult = aclPlugEngine.eachCheckAuthentication((AccessControl)accessResource);
+        AuthenticationResult authenticationResult = aclPlugEngine.eachCheckAuthentication((AccessControl) accessResource);
         if (authenticationResult.getException() != null) {
             throw new AclPlugRuntimeException(String.format("eachCheck the inspection appear exception, accessControl data is %s", accessResource.toString()), authenticationResult.getException());
         }

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/AuthenticationInfoManagementAclPlugEngine.java

@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.rocketmq.acl.plug.AccessContralAnalysis;
 import org.apache.rocketmq.acl.plug.Authentication;
 import org.apache.rocketmq.acl.plug.entity.AccessControl;
@@ -61,10 +62,10 @@ public abstract class AuthenticationInfoManagementAclPlugEngine implements AclPl
                 accessControlMap.put(accessControl.getAccount(), accessControlAddressList);
             }
             AuthenticationInfo authenticationInfo = new AuthenticationInfo(accessContralAnalysis.analysis(accessControl), accessControl, netaddressStrategy);
-            accessControlAddressList.add( authenticationInfo);
+            accessControlAddressList.add(authenticationInfo);
             log.info("authenticationInfo is {}", authenticationInfo.toString());
         } catch (Exception e) {
-            throw new AclPlugRuntimeException(String.format("Exception info %s  %s" ,e.getMessage() , accessControl.toString()), e);
+            throw new AclPlugRuntimeException(String.format("Exception info %s  %s", e.getMessage(), accessControl.toString()), e);
         }
     }
 
@@ -90,8 +91,8 @@ public abstract class AuthenticationInfoManagementAclPlugEngine implements AclPl
         } else {
             List<AuthenticationInfo> accessControlAddressList = accessControlMap.get(accessControl.getAccount());
             if (accessControlAddressList != null) {
-               for(AuthenticationInfo ai : accessControlAddressList) {
-            	   if(ai.getNetaddressStrategy().match(accessControl)&&ai.getAccessControl().getPassword().equals(accessControl.getPassword())) {
+                for (AuthenticationInfo ai : accessControlAddressList) {
+                    if (ai.getNetaddressStrategy().match(accessControl) && ai.getAccessControl().getPassword().equals(accessControl.getPassword())) {
                         return ai;
                     }
                 }
@@ -119,10 +120,11 @@ public abstract class AuthenticationInfoManagementAclPlugEngine implements AclPl
     public AuthenticationResult eachCheckAuthentication(AccessControl accessControl) {
         AuthenticationResult authenticationResult = new AuthenticationResult();
         AuthenticationInfo authenticationInfo = getAccessControl(accessControl);
-    	 if(authenticationInfo != null) {
+        if (authenticationInfo != null) {
             boolean boo = authentication.authentication(authenticationInfo, accessControl, authenticationResult);
             authenticationResult.setSucceed(boo);
-    	 }else {
+            authenticationResult.setAccessControl(authenticationInfo.getAccessControl());
+        } else {
             authenticationResult.setResultString("accessControl is null, Please check login, password, IP\"");
         }
 

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/LoginInfoAclPlugEngine.java

@@ -18,6 +18,7 @@ package org.apache.rocketmq.acl.plug.engine;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.rocketmq.acl.plug.entity.AccessControl;
 import org.apache.rocketmq.acl.plug.entity.AuthenticationInfo;
 import org.apache.rocketmq.acl.plug.entity.AuthenticationResult;

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngine.java

@@ -16,14 +16,15 @@
  */
 package org.apache.rocketmq.acl.plug.engine;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
 import org.apache.rocketmq.acl.plug.entity.BorkerAccessControlTransport;
 import org.apache.rocketmq.acl.plug.entity.ControllerParameters;
 import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
 import org.yaml.snakeyaml.Yaml;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
 public class PlainAclPlugEngine extends LoginInfoAclPlugEngine {
 
     public PlainAclPlugEngine(

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/AccessControl.java

@@ -18,7 +18,7 @@ package org.apache.rocketmq.acl.plug.entity;
 
 import org.apache.rocketmq.acl.AccessResource;
 
-public class AccessControl implements AccessResource{
+public class AccessControl implements AccessResource {
 
     private String account;
 

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/AuthenticationInfo.java

@@ -16,10 +16,11 @@
  */
 package org.apache.rocketmq.acl.plug.entity;
 
+import org.apache.rocketmq.acl.plug.strategy.NetaddressStrategy;
+
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
-import org.apache.rocketmq.acl.plug.strategy.NetaddressStrategy;
 
 public class AuthenticationInfo {
 

acl-plug/src/main/java/org/apache/rocketmq/acl/plug/strategy/NetaddressStrategyFactory.java

@@ -16,13 +16,14 @@
  */
 package org.apache.rocketmq.acl.plug.strategy;
 
-import java.util.HashSet;
-import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.acl.plug.AclUtils;
 import org.apache.rocketmq.acl.plug.entity.AccessControl;
 import org.apache.rocketmq.acl.plug.exception.AclPlugRuntimeException;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class NetaddressStrategyFactory {
 
     public static final NullNetaddressStrategy NULL_NET_ADDRESS_STRATEGY = new NullNetaddressStrategy();

acl-plug/src/test/java/org/apache/rocketmq/acl/plug/AclRemotingServiceTest.java

@@ -45,7 +45,6 @@ public class AclRemotingServiceTest {
     }
 
 
-	
     @Test
     public void defaultConstructorTest() {
         System.setProperty("rocketmq.home.dir", "src/test/resources");
@@ -56,14 +55,14 @@ public class AclRemotingServiceTest {
     @Test
     public void parseTest() {
         RemotingCommand remotingCommand = RemotingCommand.createResponseCommand(34, "");
-		HashMap<String ,String> map = new HashMap<>();
+        HashMap<String, String> map = new HashMap<>();
         map.put("account", "RocketMQ");
-		map.put("password","123456");
-		map.put("topic","test");
+        map.put("password", "123456");
+        map.put("topic", "test");
         remotingCommand.setExtFields(map);
 
         AccessResource accessResource = accessValidator.parse(remotingCommand, "127.0.0.1:123");
-		AccessControl accessControl = (AccessControl)accessResource;
+        AccessControl accessControl = (AccessControl) accessResource;
         AccessControl newAccessControl = new AccessControl();
         newAccessControl.setAccount("RocketMQ");
         newAccessControl.setPassword("123456");
@@ -81,21 +80,21 @@ public class AclRemotingServiceTest {
         Assert.assertTrue(authenticationResult.isSucceed());
     }
 
-	@Test(expected=AclPlugRuntimeException.class)
+    @Test(expected = AclPlugRuntimeException.class)
     public void checkAccessExceptionTest() {
         accessControl.setCode(34);
         accessControl.setAccount("Rocketmq");
         defaultAclService.check(accessControl);
     }
 
-	@Test(expected=AclPlugRuntimeException.class)
+    @Test(expected = AclPlugRuntimeException.class)
     public void checkPasswordTest() {
         accessControl.setCode(34);
         accessControl.setPassword("123123123");
         defaultAclService.check(accessControl);
     }
 
-	@Test(expected=AclPlugRuntimeException.class)
+    @Test(expected = AclPlugRuntimeException.class)
     public void checkCodeTest() {
         accessControl.setCode(14434);
         accessControl.setPassword("123123123");
@@ -109,21 +108,21 @@ public class AclRemotingServiceTest {
         accessValidator.validate(accessControl);
     }
 
-	@Test(expected=AclPlugRuntimeException.class)
+    @Test(expected = AclPlugRuntimeException.class)
     public void validateAccessExceptionTest() {
         accessControl.setCode(34);
         accessControl.setAccount("Rocketmq");
         accessValidator.validate(accessControl);
     }
 
-	@Test(expected=AclPlugRuntimeException.class)
+    @Test(expected = AclPlugRuntimeException.class)
     public void validatePasswordTest() {
         accessControl.setCode(34);
         accessControl.setPassword("123123123");
         accessValidator.validate(accessControl);
     }
 
-	@Test(expected=AclPlugRuntimeException.class)
+    @Test(expected = AclPlugRuntimeException.class)
     public void validateCodeTest() {
         accessControl.setCode(14434);
         accessControl.setPassword("123123123");

acl-plug/src/test/java/org/apache/rocketmq/acl/plug/AclUtilsTest.java

@@ -18,13 +18,12 @@ package org.apache.rocketmq.acl.plug;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 
-@RunWith(MockitoJUnitRunner.class)
+
 public class AclUtilsTest {
 
     @Test

acl-plug/src/test/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngineTest.java

@@ -57,46 +57,14 @@ public class PlainAclPlugEngineTest {
 
     @Before
     public void init() throws NoSuchFieldException, SecurityException, IOException {
+    	System.setProperty("rocketmq.home.dir", "src/test/resources");
+    	ControllerParameters controllerParametersEntity = new ControllerParameters();
         Yaml ymal = new Yaml();
-        String home = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV));
-        InputStream fis = null;
-        if (home == null) {
-            URL url = PlainAclPlugEngineTest.class.getResource("/");
-            home = url.toString();
-            home = home.substring(0, home.length() - 1).replace("file:/", "").replace("target/test-classes", "");
-            home = home + "src/test/resources";
-            if (!new File(home + "/conf/transport.yml").exists()) {
-                home = "/home/travis/build/githublaohu/rocketmq/acl-plug/src/test/resources";
-            }
-        }
-        String filePath = home + "/conf/transport.yml";
-        try {
-	        fis = new FileInputStream(new File(filePath));
-	        transport = ymal.loadAs(fis, BorkerAccessControlTransport.class);
-        }catch(Exception e) {
-        	AccessControl accessControl = new BorkerAccessControl();
-            accessControl.setAccount("onlyNetAddress");
-            accessControl.setPassword("aliyun11");
-            accessControl.setNetaddress("127.0.0.1");
-            accessControl.setRecognition("127.0.0.1:1");
+	    transport = ymal.loadAs(new FileInputStream(new File(controllerParametersEntity.getFileHome()+"/conf/transport.yml")), BorkerAccessControlTransport.class);
         
-            AccessControl accessControlTwo = new BorkerAccessControl();
-            accessControlTwo.setAccount("listTransport");
-            accessControlTwo.setPassword("aliyun1");
-            accessControlTwo.setNetaddress("127.0.0.1");
-            accessControlTwo.setRecognition("127.0.0.1:2");
-        	transport = new BorkerAccessControlTransport();
-        	transport.setOnlyNetAddress((BorkerAccessControl)accessControl);
-        	
-        }
-        ControllerParameters controllerParametersEntity = new ControllerParameters();
-        controllerParametersEntity.setFileHome(null);
-        try {
 	    plainAclPlugEngine = new PlainAclPlugEngine(controllerParametersEntity);
 	    plainAclPlugEngine.initialize();
-        } catch (Exception e) {
 
-        }
         
         accessControl = new BorkerAccessControl();
         accessControl.setAccount("rokcetmq");
@@ -142,6 +110,7 @@ public class PlainAclPlugEngineTest {
     @Test(expected = AclPlugRuntimeException.class)
     public void testPlainAclPlugEngineInit() {
         ControllerParameters controllerParametersEntity = new ControllerParameters();
+        controllerParametersEntity.setFileHome("");
         new PlainAclPlugEngine(controllerParametersEntity).initialize();
 
     }

broker/pom.xml

@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>rocketmq-acl-plug</artifactId>
+            <artifactId>rocketmq-acl</artifactId>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import org.apache.rocketmq.acl.AccessValidator;
-import org.apache.rocketmq.acl.plug.AclPlugController;
 import org.apache.rocketmq.broker.client.ClientHousekeepingService;
 import org.apache.rocketmq.broker.client.ConsumerIdsChangeListener;
 import org.apache.rocketmq.broker.client.ConsumerManager;

pom.xml

@@ -525,7 +525,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>rocketmq-acl-plug</artifactId>
+                <artifactId>rocketmq-acl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>