Additional cautious finally block

dsyer · dsyer · commit 84d45e8b685e · 2025-08-19T07:31:09.000+01:00
diff --git a/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/AuthenticationProcessInterceptor.java b/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/AuthenticationProcessInterceptor.java
@@ -93,7 +93,12 @@ else if (user == null || !user.isAuthenticated()) {
 		}
 
 		SecurityContext currentContext = SecurityContextHolder.getContext();
-		return new SecurityContextClearingListener<>(next.startCall(call, headers), currentContext);
+		try {
+			return new SecurityContextClearingListener<>(next.startCall(call, headers), currentContext);
+		}
+		finally {
+			SecurityContextHolder.clearContext();
+		}
 	}
 
 	static class SecurityContextClearingListener<ReqT> extends SimpleForwardingServerCallListener<ReqT> {

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,12 @@ else if (user == null \|\| !user.isAuthenticated()) {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`SecurityContext currentContext = SecurityContextHolder.getContext();`
`96`		`- return new SecurityContextClearingListener<>(next.startCall(call, headers), currentContext);`
	`96`	`+ try {`
	`97`	`+ return new SecurityContextClearingListener<>(next.startCall(call, headers), currentContext);`
	`98`	`+ }`
	`99`	`+ finally {`
	`100`	`+ SecurityContextHolder.clearContext();`
	`101`	`+ }`
`97`	`102`	`}`
`98`	`103`
`99`	`104`	`static class SecurityContextClearingListener<ReqT> extends SimpleForwardingServerCallListener<ReqT> {`