Move client spi to nacos-auth-plugin module

client/pom.xml

@@ -66,6 +66,12 @@
             <artifactId>nacos-common</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>nacos-auth-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>

client/src/main/java/com/alibaba/nacos/client/auth/impl/NacosClientAuthServiceImpl.java

@@ -18,10 +18,10 @@
 
 import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.api.exception.NacosException;
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.client.auth.impl.process.HttpLoginProcessor;
-import com.alibaba.nacos.client.auth.spi.AbstractClientAuthService;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.spi.client.AbstractClientAuthService;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.common.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

client/src/main/java/com/alibaba/nacos/client/auth/impl/process/HttpLoginProcessor.java

@@ -19,7 +19,7 @@
 import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.client.auth.impl.NacosAuthLoginConstant;
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.client.utils.ContextPathUtil;
 import com.alibaba.nacos.common.http.HttpRestResult;
 import com.alibaba.nacos.common.http.client.NacosRestTemplate;

client/src/main/java/com/alibaba/nacos/client/auth/impl/process/LoginProcessor.java

@@ -16,7 +16,7 @@
 
 package com.alibaba.nacos.client.auth.impl.process;
 
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import java.util.Properties;
 
 /**

client/src/main/java/com/alibaba/nacos/client/auth/ram/RamClientAuthServiceImpl.java

@@ -18,15 +18,16 @@
 
 import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.api.exception.NacosException;
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.client.auth.ram.identify.StsConfig;
 import com.alibaba.nacos.client.auth.ram.injector.AbstractResourceInjector;
 import com.alibaba.nacos.client.auth.ram.injector.ConfigResourceInjector;
 import com.alibaba.nacos.client.auth.ram.injector.NamingResourceInjector;
-import com.alibaba.nacos.client.auth.spi.AbstractClientAuthService;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
 import com.alibaba.nacos.client.auth.ram.utils.SpasAdapter;
-import com.alibaba.nacos.client.auth.ram.identify.StsConfig;
 import com.alibaba.nacos.common.utils.StringUtils;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
+import com.alibaba.nacos.plugin.auth.constant.SignType;
+import com.alibaba.nacos.plugin.auth.spi.client.AbstractClientAuthService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,8 +51,8 @@ public class RamClientAuthServiceImpl extends AbstractClientAuthService {
     public RamClientAuthServiceImpl() {
         ramContext = new RamContext();
         resourceInjectors = new HashMap<>();
-        resourceInjectors.put(RequestResource.NAMING, new NamingResourceInjector());
-        resourceInjectors.put(RequestResource.CONFIG, new ConfigResourceInjector());
+        resourceInjectors.put(SignType.NAMING, new NamingResourceInjector());
+        resourceInjectors.put(SignType.CONFIG, new ConfigResourceInjector());
     }
 
     @Override

client/src/main/java/com/alibaba/nacos/client/auth/ram/injector/AbstractResourceInjector.java

@@ -16,9 +16,9 @@
 
 package com.alibaba.nacos.client.auth.ram.injector;
 
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.client.auth.ram.RamContext;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 
 /**
  * Abstract aliyun RAM resource injector.

client/src/main/java/com/alibaba/nacos/client/auth/ram/injector/ConfigResourceInjector.java

@@ -18,9 +18,9 @@
 
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.exception.runtime.NacosRuntimeException;
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.client.auth.ram.RamContext;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.client.config.impl.ConfigHttpClientManager;
 import com.alibaba.nacos.client.auth.ram.utils.SpasAdapter;
 import com.alibaba.nacos.client.auth.ram.identify.StsConfig;

client/src/main/java/com/alibaba/nacos/client/auth/ram/injector/NamingResourceInjector.java

@@ -18,9 +18,9 @@
 
 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.api.naming.utils.NamingUtils;
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.client.auth.ram.RamContext;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.client.auth.ram.utils.SignUtil;
 import com.alibaba.nacos.common.utils.StringUtils;
 

client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java

@@ -37,7 +37,7 @@
 import com.alibaba.nacos.api.remote.RemoteConstants;
 import com.alibaba.nacos.api.remote.request.Request;
 import com.alibaba.nacos.api.remote.response.Response;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.client.config.common.GroupKey;
 import com.alibaba.nacos.client.config.filter.impl.ConfigFilterChainManager;
 import com.alibaba.nacos.client.config.filter.impl.ConfigResponse;

client/src/main/java/com/alibaba/nacos/client/config/impl/ConfigTransportClient.java

@@ -19,7 +19,7 @@
 import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.api.exception.NacosException;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.client.config.filter.impl.ConfigResponse;
 import com.alibaba.nacos.client.security.SecurityProxy;
 import com.alibaba.nacos.client.utils.ParamUtil;

client/src/main/java/com/alibaba/nacos/client/naming/remote/AbstractNamingClientProxy.java

@@ -16,7 +16,7 @@
 
 package com.alibaba.nacos.client.naming.remote;
 
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.client.naming.event.ServerListChangedEvent;
 import com.alibaba.nacos.client.security.SecurityProxy;
 import com.alibaba.nacos.client.utils.AppNameUtils;

client/src/main/java/com/alibaba/nacos/client/security/SecurityProxy.java

@@ -17,10 +17,10 @@
 package com.alibaba.nacos.client.security;
 
 import com.alibaba.nacos.api.exception.NacosException;
-import com.alibaba.nacos.client.auth.ClientAuthPluginManager;
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
-import com.alibaba.nacos.client.auth.spi.ClientAuthService;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.spi.client.ClientAuthPluginManager;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.spi.client.ClientAuthService;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.common.http.client.NacosRestTemplate;
 import com.alibaba.nacos.common.lifecycle.Closeable;
 

client/src/test/java/com/alibaba/nacos/client/auth/ram/RamClientAuthServiceImplTest.java

@@ -17,9 +17,9 @@
 package com.alibaba.nacos.client.auth.ram;
 
 import com.alibaba.nacos.api.PropertyKeyConst;
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.client.auth.ram.injector.AbstractResourceInjector;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.common.utils.ReflectUtils;
 import org.junit.Before;
 import org.junit.Test;

client/src/test/java/com/alibaba/nacos/client/auth/ram/injector/ConfigResourceInjectorTest.java

@@ -17,10 +17,11 @@
 package com.alibaba.nacos.client.auth.ram.injector;
 
 import com.alibaba.nacos.api.PropertyKeyConst;
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.client.auth.ram.RamContext;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.client.auth.ram.identify.StsConfig;
+import com.alibaba.nacos.plugin.auth.constant.SignType;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -45,7 +46,7 @@ public void setUp() throws Exception {
         ramContext.setAccessKey(PropertyKeyConst.ACCESS_KEY);
         ramContext.setSecretKey(PropertyKeyConst.SECRET_KEY);
         resource = new RequestResource();
-        resource.setType(RequestResource.CONFIG);
+        resource.setType(SignType.CONFIG);
         resource.setNamespace("tenant");
         resource.setGroup("group");
         cachedSecurityCredentialsUrl = StsConfig.getInstance().getSecurityCredentialsUrl();

client/src/test/java/com/alibaba/nacos/client/auth/ram/injector/NamingResourceInjectorTest.java

@@ -17,9 +17,9 @@
 package com.alibaba.nacos.client.auth.ram.injector;
 
 import com.alibaba.nacos.api.PropertyKeyConst;
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.client.auth.ram.RamContext;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.client.auth.ram.utils.SignUtil;
 import org.junit.Assert;
 import org.junit.Before;

client/src/test/java/com/alibaba/nacos/client/naming/remote/AbstractNamingClientProxyTest.java

@@ -26,7 +26,7 @@
 import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
 import com.alibaba.nacos.api.selector.AbstractSelector;
 import com.alibaba.nacos.client.auth.ram.utils.SignUtil;
-import com.alibaba.nacos.client.auth.spi.RequestResource;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 import com.alibaba.nacos.client.naming.event.ServerListChangedEvent;
 import com.alibaba.nacos.client.security.SecurityProxy;
 import com.alibaba.nacos.client.utils.AppNameUtils;

distribution/conf/application.properties

@@ -146,9 +146,6 @@ nacos.core.auth.system.type=nacos
 ### If turn on auth system:
 nacos.core.auth.enabled=false
 
-### authority key in request:
-nacos.core.auth.authorityKey=authority,username,password
-
 ### worked when nacos.core.auth.system.type=ldap，{0} is Placeholder,replace login username
 # nacos.core.auth.ldap.url=ldap://localhost:389
 # nacos.core.auth.ldap.userdn=cn={0},ou=user,dc=company,dc=com

client/src/main/java/com/alibaba/nacos/client/auth/LoginIdentityContext.java → plugin/auth/src/main/java/com/alibaba/nacos/plugin/auth/api/LoginIdentityContext.java

@@ -5,7 +5,7 @@
  * 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
+ *      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,
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.client.auth;
+package com.alibaba.nacos.plugin.auth.api;
 
 import java.util.HashMap;
 import java.util.Map;

client/src/main/java/com/alibaba/nacos/client/auth/spi/RequestResource.java → plugin/auth/src/main/java/com/alibaba/nacos/plugin/auth/api/RequestResource.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.client.auth.spi;
+package com.alibaba.nacos.plugin.auth.api;
+
+import com.alibaba.nacos.plugin.auth.constant.SignType;
 
 /**
  * Request resources.
@@ -23,10 +25,6 @@
  */
 public class RequestResource {
 
-    public static final String NAMING = "naming";
-
-    public static final String CONFIG = "config";
-
     /**
      * Request type: naming or config.
      */
@@ -81,7 +79,7 @@ public void setResource(String resource) {
      */
     public static Builder namingBuilder() {
         Builder result = new Builder();
-        result.setType(NAMING);
+        result.setType(SignType.NAMING);
         return result;
     }
 
@@ -92,7 +90,7 @@ public static Builder namingBuilder() {
      */
     public static Builder configBuilder() {
         Builder result = new Builder();
-        result.setType(CONFIG);
+        result.setType(SignType.CONFIG);
         return result;
     }
 

client/src/main/java/com/alibaba/nacos/client/auth/spi/AbstractClientAuthService.java → plugin/auth/src/main/java/com/alibaba/nacos/plugin/auth/spi/client/AbstractClientAuthService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.client.auth.spi;
+package com.alibaba.nacos.plugin.auth.spi.client;
 
 import com.alibaba.nacos.common.http.client.NacosRestTemplate;
 

client/src/main/java/com/alibaba/nacos/client/auth/ClientAuthPluginManager.java → plugin/auth/src/main/java/com/alibaba/nacos/plugin/auth/spi/client/ClientAuthPluginManager.java

@@ -5,7 +5,7 @@
  * 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
+ *      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,
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.client.auth;
+package com.alibaba.nacos.plugin.auth.spi.client;
 
 import com.alibaba.nacos.api.exception.NacosException;
-import com.alibaba.nacos.client.auth.spi.AbstractClientAuthService;
-import com.alibaba.nacos.client.auth.spi.ClientAuthService;
 import com.alibaba.nacos.common.http.client.NacosRestTemplate;
 import com.alibaba.nacos.common.lifecycle.Closeable;
 import com.alibaba.nacos.common.spi.NacosServiceLoader;

client/src/main/java/com/alibaba/nacos/client/auth/spi/ClientAuthService.java → plugin/auth/src/main/java/com/alibaba/nacos/plugin/auth/spi/client/ClientAuthService.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.client.auth.spi;
+package com.alibaba.nacos.plugin.auth.spi.client;
 
-import com.alibaba.nacos.client.auth.LoginIdentityContext;
+import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext;
 import com.alibaba.nacos.common.http.client.NacosRestTemplate;
 import com.alibaba.nacos.common.lifecycle.Closeable;
+import com.alibaba.nacos.plugin.auth.api.RequestResource;
 
 import java.util.List;
 import java.util.Properties;

client/src/test/java/com/alibaba/nacos/client/auth/ClientAuthPluginManagerTest.java → plugin/auth/src/test/java/com/alibaba/nacos/plugin/auth/spi/client/ClientAuthPluginManagerTest.java

@@ -5,7 +5,7 @@
  * 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
+ *      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,
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.client.auth;
+package com.alibaba.nacos.plugin.auth.spi.client;
 
-import com.alibaba.nacos.client.auth.spi.ClientAuthService;
 import com.alibaba.nacos.common.http.client.NacosRestTemplate;
 import org.junit.Assert;
 import org.junit.Before;
@@ -29,7 +28,7 @@
 import java.util.Set;
 
 /**
- * {@link com.alibaba.nacos.client.auth.ClientAuthPluginManager} unit test.
+ * {@link ClientAuthPluginManager} unit test.
  *
  * @author wuyfee
  * @date 2021-08-12 12:56
@@ -39,7 +38,7 @@
 public class ClientAuthPluginManagerTest {
 
     private ClientAuthPluginManager clientAuthPluginManager;
-
+    
     @Mock
     private List<String> serverlist;