✨ Introducing new features. #1995 支持 Nacos 1.4

✨ Introducing new features. #1995 支持 Nacos 1.4

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

@@ -16,7 +16,7 @@
 
 package com.alibaba.nacos;
 
-import com.alibaba.nacos.config.ConfigConstants;
+import com.alibaba.nacos.utils.StartUpEnvInitUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -31,8 +31,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 public class PigxNacosApplication {
 
 	public static void main(String[] args) {
-		System.setProperty(ConfigConstants.STANDALONE_MODE, "true");
-		System.setProperty(ConfigConstants.AUTH_ENABLED, "false");
+		StartUpEnvInitUtil.init();
 		SpringApplication.run(PigxNacosApplication.class, args);
 	}
 

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

@@ -35,4 +35,14 @@ public interface ConfigConstants {
 	 */
 	String AUTH_ENABLED = "nacos.core.auth.enabled";
 
+	/**
+	 * 开启 MCP server
+	 */
+	String MCP_SERVER_ENABLED = "nacos.istio.mcp.server.enabled";
+
+	/**
+	 * nacos tomcat basedir
+	 */
+	String NACOS_TOMCAT_BASEDIR = "server.tomcat.basedir";
+
 }

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

@@ -16,14 +16,14 @@
 
 package com.alibaba.nacos.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.model.Namespace;
 import com.alibaba.nacos.model.NamespaceAllInfo;
 import com.alibaba.nacos.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;

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

@@ -16,19 +16,14 @@
 
 package com.alibaba.nacos.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.security.nacos.NacosAuthConfig;
 import com.alibaba.nacos.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;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * Permission operation controller.

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

@@ -16,19 +16,16 @@
 
 package com.alibaba.nacos.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.security.nacos.NacosAuthConfig;
 import com.alibaba.nacos.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;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * Role operation controller.
@@ -57,6 +54,17 @@ public class RoleController {
 		return roleService.getRolesFromDatabase(username, pageNo, pageSize);
 	}
 
+	/**
+	 * Fuzzy matching role name .
+	 * @param role role id
+	 * @return role list
+	 */
+	@GetMapping("/search")
+	@Secured(resource = NacosAuthConfig.CONSOLE_RESOURCE_NAME_PREFIX + "roles", action = ActionTypes.READ)
+	public List<String> searchRoles(@RequestParam String role) {
+		return roleService.findRolesLikeRoleName(role);
+	}
+
 	/**
 	 * Add a role to a user
 	 *

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

@@ -17,7 +17,7 @@
 package com.alibaba.nacos.controller;
 
 import com.alibaba.nacos.common.utils.VersionUtils;
-import com.alibaba.nacos.core.utils.ApplicationUtils;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -17,6 +17,11 @@
 package com.alibaba.nacos.controller;
 
 import com.alibaba.nacos.api.common.Constants;
+import com.alibaba.nacos.auth.annotation.Secured;
+import com.alibaba.nacos.auth.common.ActionTypes;
+import com.alibaba.nacos.auth.common.AuthConfigs;
+import com.alibaba.nacos.auth.common.AuthSystemTypes;
+import com.alibaba.nacos.auth.exception.AccessException;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.common.utils.JacksonUtils;
 import com.alibaba.nacos.config.server.auth.RoleInfo;
@@ -28,11 +33,6 @@ import com.alibaba.nacos.security.nacos.users.NacosUser;
 import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl;
 import com.alibaba.nacos.utils.JwtTokenUtils;
 import com.alibaba.nacos.utils.PasswordEncoderUtil;
-import com.alibaba.nacos.core.auth.AccessException;
-import com.alibaba.nacos.core.auth.ActionTypes;
-import com.alibaba.nacos.core.auth.AuthConfigs;
-import com.alibaba.nacos.core.auth.AuthSystemTypes;
-import com.alibaba.nacos.core.auth.Secured;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -249,4 +249,15 @@ public class UserController {
 		return rr;
 	}
 
+	/**
+	 * Fuzzy matching username.
+	 * @param username username
+	 * @return Matched username
+	 */
+	@GetMapping("/search")
+	@Secured(resource = NacosAuthConfig.CONSOLE_RESOURCE_NAME_PREFIX + "users", action = ActionTypes.WRITE)
+	public List<String> searchUsersLikeUsername(@RequestParam String username) {
+		return userDetailsService.findUserLikeUsername(username);
+	}
+
 }

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

@@ -16,8 +16,8 @@
 
 package com.alibaba.nacos.exception;
 
+import com.alibaba.nacos.auth.exception.AccessException;
 import com.alibaba.nacos.common.utils.ExceptionUtil;
-import com.alibaba.nacos.core.auth.AccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;

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

@@ -16,10 +16,11 @@
 
 package com.alibaba.nacos.security.nacos;
 
-import com.alibaba.nacos.core.auth.AuthConfigs;
+import com.alibaba.nacos.auth.common.AuthConfigs;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.security.Keys;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -67,9 +68,8 @@ public class JwtTokenManager {
 		validity = new Date(now + authConfigs.getTokenValidityInSeconds() * 1000L);
 
 		Claims claims = Jwts.claims().setSubject(userName);
-
 		return Jwts.builder().setClaims(claims).setExpiration(validity)
-				.signWith(SignatureAlgorithm.HS256, authConfigs.getSecretKey()).compact();
+				.signWith(Keys.hmacShaKeyFor(authConfigs.getSecretKeyBytes()), SignatureAlgorithm.HS256).compact();
 	}
 
 	/**
@@ -78,8 +78,8 @@ public class JwtTokenManager {
 	 * @return auth info
 	 */
 	public Authentication getAuthentication(String token) {
-
-		Claims claims = Jwts.parser().setSigningKey(authConfigs.getSecretKey()).parseClaimsJws(token).getBody();
+		Claims claims = Jwts.parserBuilder().setSigningKey(authConfigs.getSecretKeyBytes()).build()
+				.parseClaimsJws(token).getBody();
 
 		List<GrantedAuthority> authorities = AuthorityUtils
 				.commaSeparatedStringToAuthorityList((String) claims.get(AUTHORITIES_KEY));
@@ -93,7 +93,7 @@ public class JwtTokenManager {
 	 * @param token token
 	 */
 	public void validateToken(String token) {
-		Jwts.parser().setSigningKey(authConfigs.getSecretKey()).parseClaimsJws(token);
+		Jwts.parserBuilder().setSigningKey(authConfigs.getSecretKeyBytes()).build().parseClaimsJws(token);
 	}
 
 }

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

@@ -16,10 +16,10 @@
 
 package com.alibaba.nacos.security.nacos;
 
+import com.alibaba.nacos.auth.common.AuthConfigs;
+import com.alibaba.nacos.auth.common.AuthSystemTypes;
 import com.alibaba.nacos.filter.JwtAuthenticationTokenFilter;
 import com.alibaba.nacos.security.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.context.annotation.Bean;

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

@@ -17,13 +17,14 @@
 package com.alibaba.nacos.security.nacos;
 
 import com.alibaba.nacos.api.common.Constants;
+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;
 import com.alibaba.nacos.config.server.auth.RoleInfo;
+import com.alibaba.nacos.config.server.utils.RequestUtil;
 import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl;
 import com.alibaba.nacos.security.nacos.users.NacosUser;
-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.core.utils.Loggers;
 import io.jsonwebtoken.ExpiredJwtException;
 import org.apache.commons.lang3.StringUtils;
@@ -92,7 +93,7 @@ public class NacosAuthManager implements AuthManager {
 				}
 			}
 		}
-
+		req.setAttribute(RequestUtil.NACOS_USER_KEY, user);
 		return user;
 	}
 

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

@@ -16,6 +16,8 @@
 
 package com.alibaba.nacos.security.nacos.roles;
 
+import com.alibaba.nacos.auth.common.AuthConfigs;
+import com.alibaba.nacos.auth.model.Permission;
 import com.alibaba.nacos.config.server.auth.PermissionInfo;
 import com.alibaba.nacos.config.server.auth.PermissionPersistService;
 import com.alibaba.nacos.config.server.auth.RoleInfo;
@@ -23,8 +25,6 @@ import com.alibaba.nacos.config.server.auth.RolePersistService;
 import com.alibaba.nacos.config.server.model.Page;
 import com.alibaba.nacos.security.nacos.NacosAuthConfig;
 import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl;
-import com.alibaba.nacos.core.auth.AuthConfigs;
-import com.alibaba.nacos.core.auth.Permission;
 import com.alibaba.nacos.core.utils.Loggers;
 import io.jsonwebtoken.lang.Collections;
 import org.apache.commons.lang3.StringUtils;
@@ -235,4 +235,8 @@ public class NacosRoleServiceImpl {
 		permissionPersistService.deletePermission(role, resource, action);
 	}
 
+	public List<String> findRolesLikeRoleName(String role) {
+		return rolePersistService.findRolesLikeRoleName(role);
+	}
+
 }

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

@@ -16,7 +16,7 @@
 
 package com.alibaba.nacos.security.nacos.users;
 
-import com.alibaba.nacos.core.auth.User;
+import com.alibaba.nacos.auth.model.User;
 
 /**
  * Nacos User.

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

@@ -16,10 +16,10 @@
 
 package com.alibaba.nacos.security.nacos.users;
 
+import com.alibaba.nacos.auth.common.AuthConfigs;
 import com.alibaba.nacos.config.server.auth.UserPersistService;
 import com.alibaba.nacos.config.server.model.Page;
 import com.alibaba.nacos.config.server.model.User;
-import com.alibaba.nacos.core.auth.AuthConfigs;
 import com.alibaba.nacos.core.utils.Loggers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -28,6 +28,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -101,6 +102,10 @@ public class NacosUserDetailsServiceImpl implements UserDetailsService {
 		return userPersistService.findUserByUsername(username);
 	}
 
+	public List<String> findUserLikeUsername(String username) {
+		return userPersistService.findUserLikeUsername(username);
+	}
+
 	public void createUser(String username, String password) {
 		userPersistService.createUser(username, password);
 	}

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

@@ -21,9 +21,9 @@ import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.MalformedJwtException;
 import io.jsonwebtoken.SignatureAlgorithm;
-import io.jsonwebtoken.SignatureException;
 import io.jsonwebtoken.UnsupportedJwtException;
 import io.jsonwebtoken.security.Keys;
+import io.jsonwebtoken.security.SecurityException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -126,9 +126,7 @@ public class JwtTokenUtils {
 	 * @return auth info
 	 */
 	public Authentication getAuthentication(String token) {
-
-		Claims claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody();
-
+		Claims claims = Jwts.parserBuilder().setSigningKey(secretKey).build().parseClaimsJws(token).getBody();
 		List<GrantedAuthority> authorities = AuthorityUtils
 				.commaSeparatedStringToAuthorityList((String) claims.get(AUTHORITIES_KEY));
 
@@ -143,10 +141,10 @@ public class JwtTokenUtils {
 	 */
 	public boolean validateToken(String token) {
 		try {
-			Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
+			Jwts.parserBuilder().setSigningKey(secretKey).build().parseClaimsJws(token);
 			return true;
 		}
-		catch (SignatureException e) {
+		catch (SecurityException e) {
 			log.info("Invalid JWT signature.");
 			log.trace("Invalid JWT signature trace: {}", e);
 		}

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

@@ -0,0 +1,33 @@
+package com.alibaba.nacos.utils;
+
+import com.alibaba.nacos.config.ConfigConstants;
+import com.alibaba.nacos.sys.utils.ApplicationUtils;
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+
+/**
+ * @author lengleng
+ * @date 2020/11/7
+ * <p>
+ * 初始化启动配置
+ */
+@UtilityClass
+public class StartUpEnvInitUtil {
+
+	@SneakyThrows
+	public void init() {
+		// 启动时候， 创建对应目录. 避免 1.4.0 启动失败
+		String confFilePath = ApplicationUtils.getConfFilePath();
+		FileUtils.forceMkdir(new File(confFilePath));
+
+		// 设置环境变量，Nacos 读取这部分配置
+		System.setProperty(ConfigConstants.NACOS_TOMCAT_BASEDIR, ApplicationUtils.getNacosTmpDir());
+		System.setProperty(ConfigConstants.STANDALONE_MODE, Boolean.TRUE.toString());
+		System.setProperty(ConfigConstants.AUTH_ENABLED, Boolean.FALSE.toString());
+		System.setProperty(ConfigConstants.MCP_SERVER_ENABLED, Boolean.FALSE.toString());
+	}
+
+}