clean

tianchen92 · Nov 1, 2018 · c629700 · c629700
1 parent 74f4213
commit c629700
Show file tree

Hide file tree

Showing 22 changed files with 190 additions and 213 deletions.
diff --git a/acl-plug/pom.xml b/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>

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/AccessValidator.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/AccessValidator.java
@@ -22,14 +22,16 @@
 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);
 }
diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/DefaultAccessValidator.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/DefaultAccessValidator.java
@@ -21,11 +21,13 @@
 
 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) {
 
     }
 }
diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/AccessContralAnalysis.java b/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 {
 

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/Authentication.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/Authentication.java
@@ -24,7 +24,7 @@
 public class Authentication {
 
     public boolean authentication(AuthenticationInfo authenticationInfo,
-        AccessControl accessControl, AuthenticationResult authenticationResult) {
+                                  AccessControl accessControl, AuthenticationResult authenticationResult) {
         int code = accessControl.getCode();
         if (!authenticationInfo.getAuthority().get(code)) {
             authenticationResult.setResultString(String.format("code is %d Authentication failed", code));

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/DefaultAclRemotingServiceImpl.java b/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,16 +27,18 @@
 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;
 
     public DefaultAclRemotingServiceImpl() {
-    	ControllerParameters controllerParameters = new ControllerParameters();
-    	this.aclPlugEngine = new PlainAclPlugEngine(controllerParameters);
-    	this.aclPlugEngine.initialize();    	
+        ControllerParameters controllerParameters = new ControllerParameters();
+        this.aclPlugEngine = new PlainAclPlugEngine(controllerParameters);
+        this.aclPlugEngine.initialize();
     }
-    
+
     public DefaultAclRemotingServiceImpl(AclPlugEngine aclPlugEngine) {
         this.aclPlugEngine = aclPlugEngine;
     }
@@ -55,9 +55,9 @@ public AuthenticationResult check(AccessControl accessControl) {
         return authenticationResult;
     }
 
-	@Override
-	public AccessResource parse(RemotingCommand request ,String remoteAddr) {
-		HashMap<String, String> extFields = request.getExtFields();
+    @Override
+    public AccessResource parse(RemotingCommand request, String remoteAddr) {
+        HashMap<String, String> extFields = request.getExtFields();
         AccessControl accessControl = new AccessControl();
         accessControl.setCode(request.getCode());
         accessControl.setRecognition(remoteAddr);
@@ -66,19 +66,19 @@ public AccessResource parse(RemotingCommand request ,String remoteAddr) {
             accessControl.setPassword(extFields.get("password"));
             accessControl.setNetaddress(StringUtils.split(remoteAddr, ":")[0]);
             accessControl.setTopic(extFields.get("topic"));
-}
-		return accessControl;
-	}
+        }
+        return accessControl;
+    }
 
-	@Override
-	public void validate(AccessResource accessResource) {
-		AuthenticationResult authenticationResult = aclPlugEngine.eachCheckAuthentication((AccessControl)accessResource);
+    @Override
+    public void validate(AccessResource 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());
         }
         if (authenticationResult.getAccessControl() == null || !authenticationResult.isSucceed()) {
             throw new AclPlugRuntimeException(String.format("%s accessControl data is %s", authenticationResult.getResultString(), accessResource.toString()));
         }
-	}
+    }
 
 }
diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/AclPlugEngine.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/AclPlugEngine.java
@@ -30,8 +30,8 @@ public interface AclPlugEngine {
     public void deleteLoginInfo(String remoteAddr);
 
     public AuthenticationResult eachCheckLoginAndAuthentication(AccessControl accessControl);
-    
-    public AuthenticationResult  eachCheckAuthentication(AccessControl accessControl);
+
+    public AuthenticationResult eachCheckAuthentication(AccessControl accessControl);
 
     public void initialize();
 }
diff --git a/...n/java/org/apache/rocketmq/acl/plug/engine/AuthenticationInfoManagementAclPlugEngine.java b/...n/java/org/apache/rocketmq/acl/plug/engine/AuthenticationInfoManagementAclPlugEngine.java
@@ -20,6 +20,7 @@
 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 void setAccessControl(AccessControl accessControl) throws AclPlugRuntimeE
                 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,11 +91,11 @@ public AuthenticationInfo getAccessControl(AccessControl accessControl) {
         } 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())) {
-            		   return ai;
-            	   }
-               }
+                for (AuthenticationInfo ai : accessControlAddressList) {
+                    if (ai.getNetaddressStrategy().match(accessControl) && ai.getAccessControl().getPassword().equals(accessControl.getPassword())) {
+                        return ai;
+                    }
+                }
             }
         }
         return null;
@@ -115,19 +116,20 @@ public AuthenticationResult eachCheckLoginAndAuthentication(AccessControl access
         }
         return authenticationResult;
     }
-
-    public AuthenticationResult  eachCheckAuthentication(AccessControl accessControl) {
-    	 AuthenticationResult authenticationResult = new AuthenticationResult();
-    	 AuthenticationInfo authenticationInfo = getAccessControl(accessControl);
-    	 if(authenticationInfo != null) {
-    		 boolean boo = authentication.authentication(authenticationInfo, accessControl, authenticationResult);
-             authenticationResult.setSucceed(boo);
-    	 }else {
-    		 authenticationResult.setResultString("accessControl is null, Please check login, password, IP\"");
-    	 }
-
-
-    	 return authenticationResult;
+
+    public AuthenticationResult eachCheckAuthentication(AccessControl accessControl) {
+        AuthenticationResult authenticationResult = new AuthenticationResult();
+        AuthenticationInfo authenticationInfo = getAccessControl(accessControl);
+        if (authenticationInfo != null) {
+            boolean boo = authentication.authentication(authenticationInfo, accessControl, authenticationResult);
+            authenticationResult.setSucceed(boo);
+            authenticationResult.setAccessControl(authenticationInfo.getAccessControl());
+        } else {
+            authenticationResult.setResultString("accessControl is null, Please check login, password, IP\"");
+        }
+
+
+        return authenticationResult;
     }
 
     void setBorkerAccessControlTransport(BorkerAccessControlTransport transport) {
@@ -146,5 +148,5 @@ void setBorkerAccessControlTransport(BorkerAccessControlTransport transport) {
     }
 
     protected abstract AuthenticationInfo getAuthenticationInfo(AccessControl accessControl,
-        AuthenticationResult authenticationResult);
+                                                                AuthenticationResult authenticationResult);
 }
diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/LoginInfoAclPlugEngine.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/LoginInfoAclPlugEngine.java
@@ -18,6 +18,7 @@
 
 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;
@@ -53,7 +54,7 @@ public void deleteLoginInfo(String remoteAddr) {
     }
 
     protected AuthenticationInfo getAuthenticationInfo(AccessControl accessControl,
-        AuthenticationResult authenticationResult) {
+                                                       AuthenticationResult authenticationResult) {
         LoginInfo loginInfo = getLoginInfo(accessControl);
         if (loginInfo != null && loginInfo.getAuthenticationInfo() != null) {
             return loginInfo.getAuthenticationInfo();

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngine.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/engine/PlainAclPlugEngine.java
@@ -16,18 +16,19 @@
  */
 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(
-        ControllerParameters controllerParameters) throws AclPlugRuntimeException {
+            ControllerParameters controllerParameters) throws AclPlugRuntimeException {
         super(controllerParameters);
     }
 

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/AccessControl.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/AccessControl.java
@@ -18,7 +18,7 @@
 
 import org.apache.rocketmq.acl.AccessResource;
 
-public class AccessControl implements AccessResource{
+public class AccessControl implements AccessResource {
 
     private String account;
 
@@ -87,8 +87,8 @@ public void setTopic(String topic) {
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("AccessControl [account=").append(account).append(", password=").append(password)
-            .append(", netaddress=").append(netaddress).append(", recognition=").append(recognition)
-            .append(", code=").append(code).append(", topic=").append(topic).append("]");
+                .append(", netaddress=").append(netaddress).append(", recognition=").append(recognition)
+                .append(", code=").append(code).append(", topic=").append(topic).append("]");
         return builder.toString();
     }
 

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/AuthenticationInfo.java b/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 {
 
@@ -30,7 +31,7 @@ public class AuthenticationInfo {
     private Map<Integer, Boolean> authority;
 
     public AuthenticationInfo(Map<Integer, Boolean> authority, AccessControl accessControl,
-        NetaddressStrategy netaddressStrategy) {
+                              NetaddressStrategy netaddressStrategy) {
         super();
         this.authority = authority;
         this.accessControl = accessControl;
@@ -65,7 +66,7 @@ public void setAuthority(Map<Integer, Boolean> authority) {
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("AuthenticationInfo [accessControl=").append(accessControl).append(", netaddressStrategy=")
-            .append(netaddressStrategy).append(", authority={");
+                .append(netaddressStrategy).append(", authority={");
         Iterator<Entry<Integer, Boolean>> it = authority.entrySet().iterator();
         while (it.hasNext()) {
             Entry<Integer, Boolean> e = it.next();

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/BorkerAccessControl.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/BorkerAccessControl.java
@@ -556,8 +556,8 @@ public void setQueryConsumeQueue(boolean queryConsumeQueue) {
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("BorkerAccessControl [permitSendTopic=").append(permitSendTopic).append(", noPermitSendTopic=")
-            .append(noPermitSendTopic).append(", permitPullTopic=").append(permitPullTopic)
-            .append(", noPermitPullTopic=").append(noPermitPullTopic);
+                .append(noPermitSendTopic).append(", permitPullTopic=").append(permitPullTopic)
+                .append(", noPermitPullTopic=").append(noPermitPullTopic);
         if (!!sendMessage)
             builder.append(", sendMessage=").append(sendMessage);
         if (!!sendMessageV2)

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/ControllerParameters.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/ControllerParameters.java
@@ -45,7 +45,7 @@ public void setAccessContralAnalysisClass(Class<?> accessContralAnalysisClass) {
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("ControllerParametersEntity [fileHome=").append(fileHome).append(", accessContralAnalysisClass=")
-            .append(accessContralAnalysisClass).append("]");
+                .append(accessContralAnalysisClass).append("]");
         return builder.toString();
     }
 

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/LoginInfo.java b/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/entity/LoginInfo.java
@@ -74,8 +74,8 @@ public void setClear(AtomicBoolean clear) {
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("LoginInfo [recognition=").append(recognition).append(", loginTime=").append(loginTime)
-            .append(", operationTime=").append(operationTime).append(", clear=").append(clear)
-            .append(", authenticationInfo=").append(authenticationInfo).append("]");
+                .append(", operationTime=").append(operationTime).append(", clear=").append(clear)
+                .append(", authenticationInfo=").append(authenticationInfo).append("]");
         return builder.toString();
     }
 

diff --git a/acl-plug/src/main/java/org/apache/rocketmq/acl/plug/strategy/NetaddressStrategyFactory.java b/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();