Skip to content

Commit 94fa043

Browse files
committed
Use AuthorizationEventPublisher
Closes gh-14401
1 parent 9a4202e commit 94fa043

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MethodSecurityConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

config/src/main/java/org/springframework/security/config/annotation/method/configuration/SecuredMethodSecurityConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

config/src/test/java/org/springframework/security/config/annotation/method/configuration/PrePostMethodSecurityConfigurationTests.java

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -442,7 +442,6 @@ public void configureWhenAspectJThenRegistersAspects() {
442442
assertThat(this.spring.getContext().containsBean("annotationSecurityAspect$0")).isFalse();
443443
}
444444

445-
// gh-13572
446445
@Test
447446
public void configureWhenBeanOverridingDisallowedThenWorks() {
448447
this.spring.register(MethodSecurityServiceConfig.class, BusinessServiceConfig.class)
@@ -453,7 +452,7 @@ public void configureWhenBeanOverridingDisallowedThenWorks() {
453452
@WithMockUser(roles = "ADMIN")
454453
@Test
455454
public void methodSecurityAdminWhenRoleHierarchyBeanAvailableThenUses() {
456-
this.spring.register(RoleHierarchyConfig.class, MethodSecurityServiceConfig.class, AuthorizationEventPublisherConfig.class).autowire();
455+
this.spring.register(RoleHierarchyConfig.class, MethodSecurityServiceConfig.class).autowire();
457456
this.methodSecurityService.preAuthorizeUser();
458457
this.methodSecurityService.securedUser();
459458
this.methodSecurityService.jsr250RolesAllowedUser();
@@ -462,6 +461,24 @@ public void methodSecurityAdminWhenRoleHierarchyBeanAvailableThenUses() {
462461
@WithMockUser
463462
@Test
464463
public void methodSecurityUserWhenRoleHierarchyBeanAvailableThenUses() {
464+
this.spring.register(RoleHierarchyConfig.class, MethodSecurityServiceConfig.class).autowire();
465+
this.methodSecurityService.preAuthorizeUser();
466+
this.methodSecurityService.securedUser();
467+
this.methodSecurityService.jsr250RolesAllowedUser();
468+
}
469+
470+
@WithMockUser(roles = "ADMIN")
471+
@Test
472+
public void methodSecurityAdminWhenAuthorizationEventPublisherBeanAvailableThenUses() {
473+
this.spring.register(RoleHierarchyConfig.class, MethodSecurityServiceConfig.class, AuthorizationEventPublisherConfig.class).autowire();
474+
this.methodSecurityService.preAuthorizeUser();
475+
this.methodSecurityService.securedUser();
476+
this.methodSecurityService.jsr250RolesAllowedUser();
477+
}
478+
479+
@WithMockUser
480+
@Test
481+
public void methodSecurityUserWhenAuthorizationEventPublisherBeanAvailableThenUses() {
465482
this.spring.register(RoleHierarchyConfig.class, MethodSecurityServiceConfig.class, AuthorizationEventPublisherConfig.class).autowire();
466483
this.methodSecurityService.preAuthorizeUser();
467484
this.methodSecurityService.securedUser();

0 commit comments

Comments
 (0)