Skip to content

Commit 6c10822

Browse files
committed
Add Supplier Support
Issue gh-14597
1 parent 8fa3acf commit 6c10822

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

core/src/main/java/org/springframework/security/authorization/AuthorizationAdvisorProxyFactory.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@ public interface TargetVisitor {
254254
/**
255255
* The default {@link TargetVisitor}, which will proxy {@link Class} instances as
256256
* well as instances contained in reactive types (if reactor is present),
257-
* collection types, and other container types like {@link Optional}
257+
* collection types, and other container types like {@link Optional} and
258+
* {@link Supplier}
258259
*/
259260
static TargetVisitor defaults() {
260261
return AuthorizationAdvisorProxyFactory.DEFAULT_VISITOR;
@@ -351,6 +352,9 @@ public Object visit(AuthorizationAdvisorProxyFactory proxyFactory, Object target
351352
if (target instanceof Optional<?> optional) {
352353
return proxyOptional(proxyFactory, optional);
353354
}
355+
if (target instanceof Supplier<?> supplier) {
356+
return proxySupplier(proxyFactory, supplier);
357+
}
354358
return null;
355359
}
356360

@@ -483,6 +487,10 @@ private Optional<?> proxyOptional(AuthorizationProxyFactory proxyFactory, Option
483487
return optional.map(proxyFactory::proxy);
484488
}
485489

490+
private Supplier<?> proxySupplier(AuthorizationProxyFactory proxyFactory, Supplier<?> supplier) {
491+
return () -> proxyFactory.proxy(supplier.get());
492+
}
493+
486494
}
487495

488496
private static class ReactiveTypeVisitor implements TargetVisitor {

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

+12
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.SortedSet;
3232
import java.util.TreeMap;
3333
import java.util.TreeSet;
34+
import java.util.function.Supplier;
3435
import java.util.stream.Stream;
3536

3637
import org.jetbrains.annotations.NotNull;
@@ -242,6 +243,17 @@ public void proxyWhenPreAuthorizeForOptionalThenHonors() {
242243
SecurityContextHolder.clearContext();
243244
}
244245

246+
@Test
247+
public void proxyWhenPreAuthorizeForSupplierThenHonors() {
248+
SecurityContextHolder.getContext().setAuthentication(this.user);
249+
AuthorizationAdvisorProxyFactory factory = AuthorizationAdvisorProxyFactory.withDefaults();
250+
Supplier<Flight> flights = () -> this.flight;
251+
assertThat(flights.get().getAltitude()).isEqualTo(35000d);
252+
Supplier<Flight> secured = proxy(factory, flights);
253+
assertThatExceptionOfType(AccessDeniedException.class).isThrownBy(() -> secured.get().getAltitude());
254+
SecurityContextHolder.clearContext();
255+
}
256+
245257
@Test
246258
public void proxyWhenPreAuthorizeForStreamThenHonors() {
247259
SecurityContextHolder.getContext().setAuthentication(this.user);

0 commit comments

Comments
 (0)