⬆️ Upgrading dependencies. nacos 1.3.0

pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java

@@ -16,7 +16,7 @@
 
 package com.alibaba.nacos;
 
-import com.alibaba.nacos.console.config.ConfigConstants;
+import com.alibaba.nacos.config.ConfigConstants;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;

pigx-register/src/main/java/com/alibaba/nacos/config/ConfigConstants.java

@@ -15,7 +15,7 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package com.alibaba.nacos.console.config;
+package com.alibaba.nacos.config;
 
 /**
  * @author lengleng

pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.config;
+package com.alibaba.nacos.config;
 
 import com.alibaba.nacos.core.code.ControllerMethodsCache;
 import org.springframework.beans.factory.annotation.Autowired;

pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.controller;
+package com.alibaba.nacos.controller;
 
-import com.alibaba.nacos.config.server.service.PersistService;
+import com.alibaba.nacos.config.server.service.repository.PersistService;
 import com.alibaba.nacos.naming.controllers.OperatorController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.controller;
+package com.alibaba.nacos.controller;
 
-import com.alibaba.nacos.config.server.model.RestResult;
+import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.config.server.model.TenantInfo;
-import com.alibaba.nacos.config.server.service.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.config.server.service.repository.PersistService;
+import com.alibaba.nacos.model.Namespace;
+import com.alibaba.nacos.model.NamespaceAllInfo;
+import com.alibaba.nacos.nacos.NacosAuthConfig;
 import com.alibaba.nacos.core.auth.ActionTypes;
 import com.alibaba.nacos.core.auth.Secured;
 import org.apache.commons.lang3.StringUtils;

pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.controller;
+package com.alibaba.nacos.controller;
 
-import com.alibaba.nacos.config.server.model.RestResult;
-import com.alibaba.nacos.console.security.nacos.NacosAuthConfig;
-import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl;
+import com.alibaba.nacos.common.model.RestResult;
+import com.alibaba.nacos.nacos.NacosAuthConfig;
+import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl;
 import com.alibaba.nacos.core.auth.ActionTypes;
 import com.alibaba.nacos.core.auth.Secured;
 import org.apache.commons.lang3.StringUtils;

pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.controller;
+package com.alibaba.nacos.controller;
 
-import com.alibaba.nacos.config.server.model.RestResult;
-import com.alibaba.nacos.console.security.nacos.NacosAuthConfig;
-import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl;
+import com.alibaba.nacos.common.model.RestResult;
+import com.alibaba.nacos.nacos.NacosAuthConfig;
+import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl;
 import com.alibaba.nacos.core.auth.ActionTypes;
 import com.alibaba.nacos.core.auth.Secured;
 import org.apache.commons.lang3.StringUtils;

pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.controller;
+package com.alibaba.nacos.controller;
 
 import com.alibaba.nacos.common.utils.VersionUtils;
-import com.alibaba.nacos.core.utils.SystemUtils;
+import com.alibaba.nacos.core.utils.ApplicationUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,10 +35,10 @@ public class ServerStateController {
 	@GetMapping("/state")
 	public ResponseEntity serverState() {
 		Map<String, String> serverState = new HashMap<>(3);
-		serverState.put("standalone_mode",
-				SystemUtils.STANDALONE_MODE ? SystemUtils.STANDALONE_MODE_ALONE : SystemUtils.STANDALONE_MODE_CLUSTER);
+		serverState.put("standalone_mode", ApplicationUtils.getStandaloneMode() ? ApplicationUtils.STANDALONE_MODE_ALONE
+				: ApplicationUtils.STANDALONE_MODE_CLUSTER);
 
-		serverState.put("function_mode", SystemUtils.FUNCTION_MODE);
+		serverState.put("function_mode", ApplicationUtils.getFunctionMode());
 		serverState.put("version", VersionUtils.VERSION);
 
 		return ResponseEntity.ok().body(serverState);

pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java

@@ -13,21 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.controller;
+package com.alibaba.nacos.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.api.common.Constants;
+import com.alibaba.nacos.common.model.RestResult;
+import com.alibaba.nacos.common.utils.JacksonUtils;
 import com.alibaba.nacos.config.server.auth.RoleInfo;
-import com.alibaba.nacos.config.server.model.RestResult;
 import com.alibaba.nacos.config.server.model.User;
-import com.alibaba.nacos.console.security.nacos.NacosAuthConfig;
-import com.alibaba.nacos.console.security.nacos.NacosAuthManager;
-import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl;
-import com.alibaba.nacos.console.security.nacos.users.NacosUser;
-import com.alibaba.nacos.console.security.nacos.users.NacosUserDetailsServiceImpl;
-import com.alibaba.nacos.console.utils.JwtTokenUtils;
-import com.alibaba.nacos.console.utils.PasswordEncoderUtil;
+import com.alibaba.nacos.nacos.NacosAuthConfig;
+import com.alibaba.nacos.nacos.NacosAuthManager;
+import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl;
+import com.alibaba.nacos.nacos.users.NacosUser;
+import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl;
+import com.alibaba.nacos.utils.JwtTokenUtils;
+import com.alibaba.nacos.utils.PasswordEncoderUtil;
 import com.alibaba.nacos.core.auth.*;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -165,7 +167,8 @@ public class UserController {
 
 			response.addHeader(NacosAuthConfig.AUTHORIZATION_HEADER, NacosAuthConfig.TOKEN_PREFIX + user.getToken());
 
-			JSONObject result = new JSONObject();
+			ObjectNode result = JacksonUtils.createEmptyJsonNode();
+			// JSONObject result = new JSONObject();
 			result.put(Constants.ACCESS_TOKEN, user.getToken());
 			result.put(Constants.TOKEN_TTL, authConfigs.getTokenValidityInSeconds());
 			result.put(Constants.GLOBAL_ADMIN, user.isGlobalAdmin());

pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.exception;
+package com.alibaba.nacos.exception;
 
+import com.alibaba.nacos.common.utils.ExceptionUtil;
 import com.alibaba.nacos.core.auth.AccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,13 +42,13 @@ public class ConsoleExceptionHandler {
 
 	@ExceptionHandler(IllegalArgumentException.class)
 	private ResponseEntity<String> handleIllegalArgumentException(IllegalArgumentException e) {
-		return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.toString());
+		return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ExceptionUtil.getAllExceptionMsg(e));
 	}
 
 	@ExceptionHandler(Exception.class)
 	private ResponseEntity<String> handleException(Exception e) {
 		logger.error("CONSOLE", e);
-		return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.toString());
+		return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ExceptionUtil.getAllExceptionMsg(e));
 	}
 
 }

pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.filter;
+package com.alibaba.nacos.filter;
 
 import com.alibaba.nacos.api.common.Constants;
-import com.alibaba.nacos.console.security.nacos.JwtTokenManager;
-import com.alibaba.nacos.console.security.nacos.NacosAuthConfig;
+import com.alibaba.nacos.nacos.JwtTokenManager;
+import com.alibaba.nacos.nacos.NacosAuthConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.model;
+package com.alibaba.nacos.model;
 
 /**
  * Namespace

pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.model;
+package com.alibaba.nacos.model;
 
 /**
  * all namespace info

pigx-register/src/main/java/com/alibaba/nacos/nacos/CustomAuthenticationProvider.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.security.nacos;
+package com.alibaba.nacos.nacos;
 
-import com.alibaba.nacos.console.security.nacos.users.NacosUserDetailsServiceImpl;
+import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

pigx-register/src/main/java/com/alibaba/nacos/nacos/JwtAuthenticationEntryPoint.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.security.nacos;
+package com.alibaba.nacos.nacos;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

pigx-register/src/main/java/com/alibaba/nacos/nacos/JwtTokenManager.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.security.nacos;
+package com.alibaba.nacos.nacos;
 
 import com.alibaba.nacos.core.auth.AuthConfigs;
 import io.jsonwebtoken.Claims;
@@ -27,7 +27,6 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.stereotype.Component;
 
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 

pigx-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthConfig.java

@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.security.nacos;
+package com.alibaba.nacos.nacos;
 
-import com.alibaba.nacos.console.filter.JwtAuthenticationTokenFilter;
-import com.alibaba.nacos.console.security.nacos.users.NacosUserDetailsServiceImpl;
+import com.alibaba.nacos.filter.JwtAuthenticationTokenFilter;
+import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl;
 import com.alibaba.nacos.core.auth.AuthConfigs;
 import com.alibaba.nacos.core.auth.AuthSystemTypes;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
@@ -71,9 +70,6 @@ public class NacosAuthConfig extends WebSecurityConfigurerAdapter {
 	@Autowired
 	private NacosUserDetailsServiceImpl userDetailsService;
 
-	@Value("${nacos.security.ignore.urls}")
-	private String ignoreURLs;
-
 	@Bean(name = BeanIds.AUTHENTICATION_MANAGER)
 	@Override
 	public AuthenticationManager authenticationManagerBean() throws Exception {
@@ -83,6 +79,8 @@ public class NacosAuthConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	public void configure(WebSecurity web) {
 
+		String ignoreURLs = null;
+		//
 		if (AuthSystemTypes.NACOS.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())) {
 			ignoreURLs = "/**";
 		}

pigx-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthManager.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.security.nacos;
+package com.alibaba.nacos.nacos;
 
 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.config.server.auth.RoleInfo;
-import com.alibaba.nacos.console.security.nacos.roles.NacosRoleServiceImpl;
-import com.alibaba.nacos.console.security.nacos.users.NacosUser;
+import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl;
+import com.alibaba.nacos.nacos.users.NacosUser;
 import com.alibaba.nacos.core.auth.AccessException;
 import com.alibaba.nacos.core.auth.AuthManager;
 import com.alibaba.nacos.core.auth.Permission;

pigx-register/src/main/java/com/alibaba/nacos/nacos/roles/NacosRoleServiceImpl.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.security.nacos.roles;
+package com.alibaba.nacos.nacos.roles;
 
 import com.alibaba.nacos.config.server.auth.PermissionInfo;
 import com.alibaba.nacos.config.server.auth.PermissionPersistService;
 import com.alibaba.nacos.config.server.auth.RoleInfo;
 import com.alibaba.nacos.config.server.auth.RolePersistService;
 import com.alibaba.nacos.config.server.model.Page;
-import com.alibaba.nacos.console.security.nacos.NacosAuthConfig;
-import com.alibaba.nacos.console.security.nacos.users.NacosUserDetailsServiceImpl;
+import com.alibaba.nacos.nacos.NacosAuthConfig;
+import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl;
 import com.alibaba.nacos.core.auth.AuthConfigs;
 import com.alibaba.nacos.core.auth.Permission;
 import com.alibaba.nacos.core.utils.Loggers;
@@ -90,9 +90,9 @@ public class NacosRoleServiceImpl {
 				tmpPermissionInfoMap.put(role, permissionInfoPage.getPageItems());
 			}
 
-			roleSet = tmpRoleSet;
-			roleInfoMap = tmpRoleInfoMap;
-			permissionInfoMap = tmpPermissionInfoMap;
+			roleSet.addAll(tmpRoleSet);
+			roleInfoMap.putAll(tmpRoleInfoMap);
+			permissionInfoMap.putAll(tmpPermissionInfoMap);
 		}
 		catch (Exception e) {
 			Loggers.AUTH.warn("[LOAD-ROLES] load failed", e);
@@ -180,7 +180,7 @@ public class NacosRoleServiceImpl {
 	}
 
 	public void addRole(String role, String username) {
-		if (userDetailsService.getUser(username) == null) {
+		if (userDetailsService.getUserFromDatabase(username) == null) {
 			throw new IllegalArgumentException("user '" + username + "' not found!");
 		}
 		if (GLOBAL_ADMIN_ROLE.equals(role)) {

pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUser.java

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.console.security.nacos.users;
+package com.alibaba.nacos.nacos.users;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.core.auth.User;
 
 /**
@@ -47,7 +46,7 @@ public class NacosUser extends User {
 
 	@Override
 	public String toString() {
-		return JSON.toJSONString(this);
+		return "NacosUser{" + "token='" + token + '\'' + ", globalAdmin=" + globalAdmin + '}';
 	}
 
 }

pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetails.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.security.nacos.users;
+package com.alibaba.nacos.nacos.users;
 
 import com.alibaba.nacos.config.server.model.User;
 import org.springframework.security.core.GrantedAuthority;

pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetailsServiceImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.security.nacos.users;
+package com.alibaba.nacos.nacos.users;
 
 import com.alibaba.nacos.config.server.auth.UserPersistService;
 import com.alibaba.nacos.config.server.model.Page;

pigx-register/src/main/java/com/alibaba/nacos/utils/JwtTokenUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.utils;
+package com.alibaba.nacos.utils;
 
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.Keys;

pigx-register/src/main/java/com/alibaba/nacos/utils/PasswordEncoderUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.console.utils;
+package com.alibaba.nacos.utils;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;