Check if jackson2 security dependency existed

AlbumenJ · Jun 19, 2023 · c2e2757 · c2e2757
1 parent 5f39404
commit c2e2757
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/...java/org/apache/dubbo/spring/security/filter/AuthenticationExceptionTranslatorFilter.java b/...java/org/apache/dubbo/spring/security/filter/AuthenticationExceptionTranslatorFilter.java
@@ -24,12 +24,16 @@
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Result;
 import org.apache.dubbo.rpc.RpcException;
+
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.core.AuthenticationException;
+
 import static org.apache.dubbo.rpc.RpcException.AUTHORIZATION_EXCEPTION;
+import static org.apache.dubbo.spring.security.utils.SecurityNames.CORE_JACKSON_2_MODULE_CLASS_NAME;
+import static org.apache.dubbo.spring.security.utils.SecurityNames.OBJECT_MAPPER_CLASS_NAME;
 import static org.apache.dubbo.spring.security.utils.SecurityNames.SECURITY_CONTEXT_HOLDER_CLASS_NAME;
 
-@Activate(group = CommonConstants.PROVIDER, order =Integer.MAX_VALUE,onClass = SECURITY_CONTEXT_HOLDER_CLASS_NAME)
+@Activate(group = CommonConstants.PROVIDER, order = Integer.MAX_VALUE, onClass = {SECURITY_CONTEXT_HOLDER_CLASS_NAME, CORE_JACKSON_2_MODULE_CLASS_NAME, OBJECT_MAPPER_CLASS_NAME})
 public class AuthenticationExceptionTranslatorFilter implements Filter, Filter.Listener {
 
 

diff --git a/...ava/org/apache/dubbo/spring/security/filter/ContextHolderAuthenticationPrepareFilter.java b/...ava/org/apache/dubbo/spring/security/filter/ContextHolderAuthenticationPrepareFilter.java
@@ -27,13 +27,17 @@
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.spring.security.jackson.ObjectMapperCodec;
 import org.apache.dubbo.spring.security.utils.SecurityNames;
+
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
+
+import static org.apache.dubbo.spring.security.utils.SecurityNames.CORE_JACKSON_2_MODULE_CLASS_NAME;
+import static org.apache.dubbo.spring.security.utils.SecurityNames.OBJECT_MAPPER_CLASS_NAME;
 import static org.apache.dubbo.spring.security.utils.SecurityNames.SECURITY_CONTEXT_HOLDER_CLASS_NAME;
 
-@Activate(group = CommonConstants.CONSUMER, order = -10000,onClass = SECURITY_CONTEXT_HOLDER_CLASS_NAME)
-public class ContextHolderAuthenticationPrepareFilter implements ClusterFilter{
+@Activate(group = CommonConstants.CONSUMER, order = -10000, onClass = {SECURITY_CONTEXT_HOLDER_CLASS_NAME, CORE_JACKSON_2_MODULE_CLASS_NAME, OBJECT_MAPPER_CLASS_NAME})
+public class ContextHolderAuthenticationPrepareFilter implements ClusterFilter {
 
     private final ObjectMapperCodec mapper;
 

diff --git a/...va/org/apache/dubbo/spring/security/filter/ContextHolderAuthenticationResolverFilter.java b/...va/org/apache/dubbo/spring/security/filter/ContextHolderAuthenticationResolverFilter.java
@@ -27,11 +27,15 @@
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.spring.security.jackson.ObjectMapperCodec;
 import org.apache.dubbo.spring.security.utils.SecurityNames;
+
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+
+import static org.apache.dubbo.spring.security.utils.SecurityNames.CORE_JACKSON_2_MODULE_CLASS_NAME;
+import static org.apache.dubbo.spring.security.utils.SecurityNames.OBJECT_MAPPER_CLASS_NAME;
 import static org.apache.dubbo.spring.security.utils.SecurityNames.SECURITY_CONTEXT_HOLDER_CLASS_NAME;
 
-@Activate(group = CommonConstants.PROVIDER, order = -10000,onClass = SECURITY_CONTEXT_HOLDER_CLASS_NAME)
+@Activate(group = CommonConstants.PROVIDER, order = -10000, onClass = {SECURITY_CONTEXT_HOLDER_CLASS_NAME, CORE_JACKSON_2_MODULE_CLASS_NAME, OBJECT_MAPPER_CLASS_NAME})
 public class ContextHolderAuthenticationResolverFilter implements Filter {
 
     private final ObjectMapperCodec mapper;

diff --git a/...y/src/main/java/org/apache/dubbo/spring/security/model/SecurityScopeModelInitializer.java b/...y/src/main/java/org/apache/dubbo/spring/security/model/SecurityScopeModelInitializer.java
@@ -25,10 +25,14 @@
 import org.apache.dubbo.rpc.model.ScopeModelInitializer;
 import org.apache.dubbo.spring.security.jackson.ObjectMapperCodec;
 import org.apache.dubbo.spring.security.jackson.ObjectMapperCodecCustomer;
+
 import java.util.Set;
+
+import static org.apache.dubbo.spring.security.utils.SecurityNames.CORE_JACKSON_2_MODULE_CLASS_NAME;
+import static org.apache.dubbo.spring.security.utils.SecurityNames.OBJECT_MAPPER_CLASS_NAME;
 import static org.apache.dubbo.spring.security.utils.SecurityNames.SECURITY_CONTEXT_HOLDER_CLASS_NAME;
 
-@Activate(onClass = SECURITY_CONTEXT_HOLDER_CLASS_NAME)
+@Activate(onClass = {SECURITY_CONTEXT_HOLDER_CLASS_NAME, CORE_JACKSON_2_MODULE_CLASS_NAME, OBJECT_MAPPER_CLASS_NAME})
 public class SecurityScopeModelInitializer implements ScopeModelInitializer {
 
     @Override

diff --git a/...o-spring-security/src/main/java/org/apache/dubbo/spring/security/utils/SecurityNames.java b/...o-spring-security/src/main/java/org/apache/dubbo/spring/security/utils/SecurityNames.java
@@ -22,6 +22,8 @@ final public class SecurityNames {
     public static final String SECURITY_AUTHENTICATION_CONTEXT_KEY = "security_authentication_context";
 
     public static final String SECURITY_CONTEXT_HOLDER_CLASS_NAME = "org.springframework.security.core.context.SecurityContextHolder";
+    public static final String CORE_JACKSON_2_MODULE_CLASS_NAME = "org.springframework.security.jackson2.CoreJackson2Module";
+    public static final String OBJECT_MAPPER_CLASS_NAME = "com.fasterxml.jackson.databind.ObjectMapper";
 
     private SecurityNames() {}