Skip to content

Commit 3a84894

Browse files
committed
Revert "Add AuthorizationProxyMixin"
This reverts commit 743817f.
1 parent 90855aa commit 3a84894

File tree

3 files changed

+5
-38
lines changed

3 files changed

+5
-38
lines changed

core/src/main/java/org/springframework/security/jackson/AuthorizationProxyMixin.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

core/src/main/java/org/springframework/security/jackson/CoreJacksonModule.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.security.authentication.RememberMeAuthenticationToken;
3030
import org.springframework.security.authentication.TestingAuthenticationToken;
3131
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
32-
import org.springframework.security.authorization.method.AuthorizationProxy;
3332
import org.springframework.security.core.authority.FactorGrantedAuthority;
3433
import org.springframework.security.core.authority.SimpleGrantedAuthority;
3534
import org.springframework.security.core.context.SecurityContextImpl;
@@ -109,7 +108,6 @@ public void setupModule(SetupContext context) {
109108
context.setMixIn(UsernamePasswordAuthenticationToken.class, UsernamePasswordAuthenticationTokenMixin.class);
110109
context.setMixIn(TestingAuthenticationToken.class, TestingAuthenticationTokenMixin.class);
111110
context.setMixIn(BadCredentialsException.class, BadCredentialsExceptionMixin.class);
112-
context.setMixIn(AuthorizationProxy.class, AuthorizationProxyMixin.class);
113111
}
114112

115113
}

core/src/test/java/org/springframework/security/authorization/AuthorizationAdvisorProxyFactoryTests.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.function.Supplier;
3535
import java.util.stream.Stream;
3636

37+
import org.junit.jupiter.api.Disabled;
3738
import org.junit.jupiter.api.Test;
3839
import tools.jackson.databind.json.JsonMapper;
3940

@@ -49,7 +50,6 @@
4950
import org.springframework.security.authorization.method.AuthorizationProxy;
5051
import org.springframework.security.core.Authentication;
5152
import org.springframework.security.core.context.SecurityContextHolder;
52-
import org.springframework.security.jackson.CoreJacksonModule;
5353

5454
import static org.assertj.core.api.Assertions.assertThat;
5555
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -340,13 +340,15 @@ public void setTargetVisitorIgnoreValueTypesThenIgnores() {
340340
assertThat(factory.proxy(35)).isEqualTo(35);
341341
}
342342

343+
// TODO Find why callbacks property is serialized with Jackson 3, not with Jackson 2
344+
// FIXME: https://github.com/spring-projects/spring-security/issues/18077
345+
@Disabled("callbacks property is serialized with Jackson 3, not with Jackson 2")
343346
@Test
344347
public void serializeWhenAuthorizationProxyObjectThenOnlyIncludesProxiedProperties() {
345348
SecurityContextHolder.getContext().setAuthentication(this.admin);
346349
AuthorizationAdvisorProxyFactory factory = AuthorizationAdvisorProxyFactory.withDefaults();
347350
User user = proxy(factory, this.alan);
348-
// gh-18077
349-
JsonMapper mapper = JsonMapper.builder().addModule(new CoreJacksonModule()).build();
351+
JsonMapper mapper = new JsonMapper();
350352
String serialized = mapper.writeValueAsString(user);
351353
Map<String, Object> properties = mapper.readValue(serialized, Map.class);
352354
assertThat(properties).hasSize(3).containsKeys("id", "firstName", "lastName");

0 commit comments

Comments
 (0)