From 62d77ec97ea3335abd065138e6da76a3223f36d3 Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Thu, 8 Apr 2021 07:47:54 -0600
Subject: [PATCH] Add GrantedAuthorityDefaults to Expression Handler

Issue gh-9289
---
 .../method/configuration/MethodSecurityConfiguration.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfiguration.java
index dda256507d..98b0495a5c 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfiguration.java
@@ -107,7 +107,11 @@ final class MethodSecurityConfiguration implements ImportAware, InitializingBean
 
 	private MethodSecurityExpressionHandler getMethodSecurityExpressionHandler() {
 		if (this.methodSecurityExpressionHandler == null) {
-			this.methodSecurityExpressionHandler = new DefaultMethodSecurityExpressionHandler();
+			DefaultMethodSecurityExpressionHandler methodSecurityExpressionHandler = new DefaultMethodSecurityExpressionHandler();
+			if (this.grantedAuthorityDefaults != null) {
+				methodSecurityExpressionHandler.setDefaultRolePrefix(this.grantedAuthorityDefaults.getRolePrefix());
+			}
+			this.methodSecurityExpressionHandler = methodSecurityExpressionHandler;
 		}
 		return this.methodSecurityExpressionHandler;
 	}