Add @AuthenticationPrincipal/@CurrentSecurityContext Interface Support for Expression Templates

[kse-music]

Closes gh-16248

[jzheaux]

Thanks for the PR, @kse-music! I've left some feedback inline.

In addition, let's please change the argument resolvers to fall back to MethodParameter#findParameterAnnotation (the previous behavior) if they haven't supplied an AnnotationTemplateExpressionDefaults.

The reason for this is historically the argument resolvers have simply picked the first annotation they find instead of enforcing Security's no-duplicate policy and we don't want to change that expectation in a minor release.

[kse-music]

@jzheaux All feedback is done.But if fall back to MethodParameter#findParameterAnnotation when they haven't supplied an AnnotationTemplateExpressionDefaults, then use @AuthenticationPrincipal as meta-annotations is not working .

For example #15286.

@Retention(RetentionPolicy.RUNTIME)
@AuthenticationPrincipal
public @interface CurrentUser {
	@AliasFor(annotation = AuthenticationPrincipal.class)
	String expression() default "";
}

Unless support meta-annotations also need to provide an AnnotationTemplateExpressionDefaults?

[jzheaux]

Unless support meta-annotations also need to provide an AnnotationTemplateExpressionDefaults?

That's correct. Please see this section of the reference for more details.

[kse-music]

That's correct. Please see this section of the reference for more details.

Thanks, @jzheaux . Now all checks have now passed

[jzheaux]

Thanks for the PR, @kse-music, great job. I've left some feedback inline.

[jzheaux]

@kse-music, one more thing. I'm not comfortable releasing this big of a change on a maintenance release. So let's split this PR into two: One for the additional support in SecurityAnnotationScanners and one for the fallback logic in the argument resolvers. The fallback logic will be merged and released in 6.4 and the rest will release in 6.5.

[kse-music]

@jzheaux If use fallback logic, it may not be easy to support aliasFor , as comment said, or you write a search for parameter annotation inheritance?

[jzheaux]

I've opened #16248. Would you please change the commit message to point to that ticket instead?

[kse-music]

I've opened #16248. Would you please change the commit message to point to that ticket instead?

Done

[jzheaux]

@kse-music, thanks for your patience while I got back to this. After some testing, I have some additional feedback; are you able to address it?

[kse-music]

@jzheaux All feedback is done.

[jzheaux]

Lovely, @kse-music. All merged and thank you again.