[ISSUE #3566] move the permission code of nacos-core module to nacos-auth module

address/src/main/java/com/alibaba/nacos/address/auth/AddressServerAuthManager.java

@@ -16,10 +16,10 @@
 
 package com.alibaba.nacos.address.auth;
 
-import com.alibaba.nacos.core.auth.AccessException;
-import com.alibaba.nacos.core.auth.AuthManager;
-import com.alibaba.nacos.core.auth.Permission;
-import com.alibaba.nacos.core.auth.User;
+import com.alibaba.nacos.auth.AuthManager;
+import com.alibaba.nacos.auth.exception.AccessException;
+import com.alibaba.nacos.auth.model.Permission;
+import com.alibaba.nacos.auth.model.User;
 
 /**
  * Address server auth manager.

address/src/main/java/com/alibaba/nacos/address/configuration/AddressServerSpringConfiguration.java

@@ -17,7 +17,7 @@
 package com.alibaba.nacos.address.configuration;
 
 import com.alibaba.nacos.address.auth.AddressServerAuthManager;
-import com.alibaba.nacos.core.auth.AuthManager;
+import com.alibaba.nacos.auth.AuthManager;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

auth/pom.xml

@@ -36,7 +36,21 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>nacos-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <optional>true</optional>
+        </dependency>
 
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

core/src/main/java/com/alibaba/nacos/core/auth/AuthManager.java → auth/src/main/java/com/alibaba/nacos/auth/AuthManager.java

@@ -14,12 +14,17 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth;
+
+import com.alibaba.nacos.auth.exception.AccessException;
+import com.alibaba.nacos.auth.model.Permission;
+import com.alibaba.nacos.auth.model.User;
 
 /**
  * Access control entry. Can be extended by 3rd party implementations.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 public interface AuthManager {

core/src/main/java/com/alibaba/nacos/core/auth/Secured.java → auth/src/main/java/com/alibaba/nacos/auth/annotation/Secured.java

@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.annotation;
 
+import com.alibaba.nacos.auth.common.ActionTypes;
+import com.alibaba.nacos.auth.parser.DefaultResourceParser;
+import com.alibaba.nacos.auth.parser.ResourceParser;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.annotation.Retention;
@@ -25,6 +28,7 @@
  * Annotation indicating that the annotated request should be authorized.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 @Retention(RetentionPolicy.RUNTIME)

core/src/main/java/com/alibaba/nacos/core/auth/ActionTypes.java → auth/src/main/java/com/alibaba/nacos/auth/common/ActionTypes.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.common;
 
 /**
  * Resource action type definitions.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 public enum ActionTypes {

core/src/main/java/com/alibaba/nacos/core/auth/AuthConfigs.java → auth/src/main/java/com/alibaba/nacos/auth/common/AuthConfigs.java

@@ -14,28 +14,25 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.common;
 
+import com.alibaba.nacos.auth.common.env.ReloadableConfigs;
 import com.alibaba.nacos.common.JustForTest;
-import com.alibaba.nacos.core.env.ReloadableConfigs;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
 
 import java.util.Objects;
 
 /**
  * Auth related configurations.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
-@Component
 @Configuration
 public class AuthConfigs {
 
@@ -107,21 +104,4 @@ public boolean isCachingEnabled() {
     public static void setCachingEnabled(boolean cachingEnabled) {
         AuthConfigs.cachingEnabled = cachingEnabled;
     }
-
-    @Bean
-    public FilterRegistrationBean authFilterRegistration() {
-        FilterRegistrationBean<AuthFilter> registration = new FilterRegistrationBean<>();
-        registration.setFilter(authFilter());
-        registration.addUrlPatterns("/*");
-        registration.setName("authFilter");
-        registration.setOrder(6);
-
-        return registration;
-    }
-
-    @Bean
-    public AuthFilter authFilter() {
-        return new AuthFilter();
-    }
-
 }

core/src/main/java/com/alibaba/nacos/core/auth/AuthSystemTypes.java → auth/src/main/java/com/alibaba/nacos/auth/common/AuthSystemTypes.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.common;
 
 /**
  * Types of all auth implementations.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 public enum AuthSystemTypes {

core/src/main/java/com/alibaba/nacos/core/env/ReloadableConfigs.java → auth/src/main/java/com/alibaba/nacos/auth/common/env/ReloadableConfigs.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.env;
+package com.alibaba.nacos.auth.common.env;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,6 +31,7 @@
  * Reload application.properties.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 @Component

core/src/main/java/com/alibaba/nacos/core/auth/AccessException.java → auth/src/main/java/com/alibaba/nacos/auth/exception/AccessException.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.exception;
 
 import com.alibaba.nacos.api.exception.NacosException;
 
 /**
  * Exception to be thrown if authorization is failed.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 public class AccessException extends NacosException {

core/src/main/java/com/alibaba/nacos/core/auth/Permission.java → auth/src/main/java/com/alibaba/nacos/auth/model/Permission.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.model;
 
 import java.io.Serializable;
 
 /**
  * Permission to auth.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 public class Permission implements Serializable {

core/src/main/java/com/alibaba/nacos/core/auth/Resource.java → auth/src/main/java/com/alibaba/nacos/auth/model/Resource.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.model;
 
 import java.io.Serializable;
 
 /**
  * Resource used in authorization.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 public class Resource implements Serializable {

core/src/main/java/com/alibaba/nacos/core/auth/User.java → auth/src/main/java/com/alibaba/nacos/auth/model/User.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.model;
 
 import java.io.Serializable;
 
 /**
  * User information in authorization.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 public class User implements Serializable {

core/src/main/java/com/alibaba/nacos/core/auth/DefaultResourceParser.java → auth/src/main/java/com/alibaba/nacos/auth/parser/DefaultResourceParser.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.parser;
 
 import org.apache.commons.lang3.StringUtils;
 
 /**
  * Default resource parser.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 public class DefaultResourceParser implements ResourceParser {

core/src/main/java/com/alibaba/nacos/core/auth/ResourceParser.java → auth/src/main/java/com/alibaba/nacos/auth/parser/ResourceParser.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.core.auth;
+package com.alibaba.nacos.auth.parser;
 
 /**
  * Resource parser.
  *
  * @author nkorange
+ * @author mai.jh
  * @since 1.2.0
  */
 public interface ResourceParser {

config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java

@@ -16,11 +16,10 @@
 
 package com.alibaba.nacos.config.server.auth;
 
-import com.alibaba.nacos.core.auth.Resource;
-import com.alibaba.nacos.core.auth.ResourceParser;
-
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.nacos.auth.model.Resource;
+import com.alibaba.nacos.auth.parser.ResourceParser;
 import org.apache.commons.lang3.StringUtils;
 
 /**

config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java

@@ -17,6 +17,8 @@
 package com.alibaba.nacos.config.server.controller;
 
 import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.auth.annotation.Secured;
+import com.alibaba.nacos.auth.common.ActionTypes;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.common.utils.MapUtils;
 import com.alibaba.nacos.config.server.auth.ConfigResourceParser;
@@ -43,8 +45,6 @@
 import com.alibaba.nacos.config.server.utils.RequestUtil;
 import com.alibaba.nacos.config.server.utils.TimeUtils;
 import com.alibaba.nacos.config.server.utils.ZipUtils;
-import com.alibaba.nacos.core.auth.ActionTypes;
-import com.alibaba.nacos.core.auth.Secured;
 import com.alibaba.nacos.core.utils.InetUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;

config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigOpsController.java

@@ -16,6 +16,8 @@
 
 package com.alibaba.nacos.config.server.controller;
 
+import com.alibaba.nacos.auth.annotation.Secured;
+import com.alibaba.nacos.auth.common.ActionTypes;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.common.model.RestResultUtils;
 import com.alibaba.nacos.common.utils.Objects;
@@ -29,8 +31,6 @@
 import com.alibaba.nacos.config.server.service.repository.embedded.DatabaseOperate;
 import com.alibaba.nacos.config.server.utils.LogUtil;
 import com.alibaba.nacos.config.server.utils.PropertyUtil;
-import com.alibaba.nacos.core.auth.ActionTypes;
-import com.alibaba.nacos.core.auth.Secured;
 import com.alibaba.nacos.core.utils.ApplicationUtils;
 import com.alibaba.nacos.core.utils.WebUtils;
 import org.apache.commons.lang3.StringUtils;

config/src/main/java/com/alibaba/nacos/config/server/utils/RequestUtil.java

@@ -16,7 +16,7 @@
 
 package com.alibaba.nacos.config.server.utils;
 
-import com.alibaba.nacos.core.auth.User;
+import com.alibaba.nacos.auth.model.User;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;

console/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java

@@ -16,14 +16,14 @@
 
 package com.alibaba.nacos.console.controller;
 
+import com.alibaba.nacos.auth.annotation.Secured;
+import com.alibaba.nacos.auth.common.ActionTypes;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.config.server.model.TenantInfo;
 import com.alibaba.nacos.config.server.service.repository.PersistService;
 import com.alibaba.nacos.console.model.Namespace;
 import com.alibaba.nacos.console.model.NamespaceAllInfo;
 import com.alibaba.nacos.console.security.nacos.NacosAuthConfig;
-import com.alibaba.nacos.core.auth.ActionTypes;
-import com.alibaba.nacos.core.auth.Secured;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;

console/src/main/java/com/alibaba/nacos/console/controller/PermissionController.java

@@ -16,11 +16,11 @@
 
 package com.alibaba.nacos.console.controller;
 
+import com.alibaba.nacos.auth.annotation.Secured;
+import com.alibaba.nacos.auth.common.ActionTypes;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.console.security.nacos.NacosAuthConfig;
 import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl;
-import com.alibaba.nacos.core.auth.ActionTypes;
-import com.alibaba.nacos.core.auth.Secured;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;

console/src/main/java/com/alibaba/nacos/console/controller/RoleController.java

@@ -16,11 +16,11 @@
 
 package com.alibaba.nacos.console.controller;
 
+import com.alibaba.nacos.auth.annotation.Secured;
+import com.alibaba.nacos.auth.common.ActionTypes;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.console.security.nacos.NacosAuthConfig;
 import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl;
-import com.alibaba.nacos.core.auth.ActionTypes;
-import com.alibaba.nacos.core.auth.Secured;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;