Fix CSRF filter auto-configuration round 2

README.MD

@@ -1,6 +1,6 @@
 7.0.0 is a break through in usability: all 6 `spring-addons` Boot starters are merged into a single one: [`com.c4-soft.springaddons:spring-addons-starter-oidc`](https://repo1.maven.org/maven2/com/c4-soft/springaddons/spring-addons-starter-oidc/), and so are 4 of the test libs: [`com.c4-soft.springaddons:spring-addons-starter-oidc-test`](https://repo1.maven.org/maven2/com/c4-soft/springaddons/spring-addons-starter-oidc-test/). To use the test annotations without the starter, the dependency id unchanged: [`com.c4-soft.springaddons:spring-addons-oauth2-test`](https://repo1.maven.org/maven2/com/c4-soft/springaddons/spring-addons-oauth2-test/).
 
-Please follow the [migration guide](https://github.com/ch4mpy/spring-addons/blob/master/7.0.0-migration-guide.md) to move from `6.x` to `7.0.1`. There is no urge to do so on existing projects as 6.2.x patches should be published untill the end of 2023.
+Please follow the [migration guide](https://github.com/ch4mpy/spring-addons/blob/master/7.0.0-migration-guide.md) to move from `6.x` to `7.0.2`. There is no urge to do so on existing projects as 6.2.x patches should be published untill the end of 2023.
 
 All samples and tutorials sources are migrated to latest starter and test annotations, but some READMEs might still need a refresh. Please make sure you refer to source code for up to date configuration.
 
@@ -395,7 +395,7 @@ In case your access-control uses more than just name and authorities, you'll pro
 I could forget to update README before releasing, so please refer to [maven central](https://repo1.maven.org/maven2/com/c4-soft/springaddons/spring-addons/) to pick latest available release
 ```xml
     <properties>
-        <springaddons.version>7.0.1</springaddons.version>
+        <springaddons.version>7.0.2</springaddons.version>
     </properties>
     <dependencies>
 
@@ -447,7 +447,7 @@ Using such libs is dead simple: just declare depedency on one of those libs and
 
 2.0 comes with a noticeable amount of breaking changes. So lets start tracking features.
 
-### 7.0.1
+### 7.0.2
 - Fix the condition to add a filter inserting CSRF protection cookie to responses
 
 ### 7.0.0

spring-addons-starter-oidc/src/main/java/com/c4_soft/springaddons/security/oidc/starter/SpringAddonsOAuth2LogoutRequestUriBuilder.java

@@ -8,8 +8,8 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import com.c4_soft.springaddons.security.oidc.starter.properties.OAuth2LogoutProperties;
 import com.c4_soft.springaddons.security.oidc.starter.properties.SpringAddonsOidcClientProperties;
+import com.c4_soft.springaddons.security.oidc.starter.properties.SpringAddonsOidcClientProperties.OAuth2LogoutProperties;
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;

spring-addons-starter-oidc/src/main/java/com/c4_soft/springaddons/security/oidc/starter/properties/CorsProperties.java

@@ -1,7 +1,10 @@
 package com.c4_soft.springaddons.security.oidc.starter.properties;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
 import lombok.Data;
 
+@ConfigurationProperties
 @Data
 public class CorsProperties {
 	/**

spring-addons-starter-oidc/src/main/java/com/c4_soft/springaddons/security/oidc/starter/properties/OpenidProviderProperties.java

@@ -2,6 +2,7 @@
 
 import java.net.URI;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
 
@@ -14,6 +15,7 @@
  *
  * @author Jerome Wacongne ch4mp@c4-soft.com
  */
+@ConfigurationProperties
 @Data
 public class OpenidProviderProperties {
 	/**

spring-addons-starter-oidc/src/main/java/com/c4_soft/springaddons/security/oidc/starter/properties/SimpleAuthoritiesMappingProperties.java

@@ -1,5 +1,7 @@
 package com.c4_soft.springaddons.security.oidc.starter.properties;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
 import com.c4_soft.springaddons.security.oidc.starter.ConfigurableClaimSetAuthoritiesConverter;
 
 import lombok.AllArgsConstructor;
@@ -11,6 +13,7 @@
  *
  * @author ch4mp
  */
+@ConfigurationProperties
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

spring-addons-starter-oidc/src/main/java/com/c4_soft/springaddons/security/oidc/starter/properties/SpringAddonsOidcClientProperties.java

@@ -5,6 +5,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -18,6 +19,7 @@
  *
  * @author Jerome Wacongne ch4mp@c4-soft.com
  */
+@ConfigurationProperties
 @Data
 public class SpringAddonsOidcClientProperties {
 
@@ -93,11 +95,42 @@ public class SpringAddonsOidcClientProperties {
 	 */
 	private Map<String, RequestParam[]> authorizationRequestParams = new HashMap<>();
 
+	/**
+	 * Logout properties for OpenID Providers which do not implement the RP-Initiated Logout spec
+	 *
+	 * @author Jerome Wacongne ch4mp&#64;c4-soft.com
+	 */
+	@ConfigurationProperties
+	@Data
+	public static class OAuth2LogoutProperties {
+
+		/**
+		 * URI on the authorization server where to redirect the user for logout
+		 */
+		private URI uri;
+
+		/**
+		 * request param name for client-id
+		 */
+		private Optional<String> clientIdRequestParam = Optional.empty();
+
+		/**
+		 * request param name for post-logout redirect URI (where the user should be redirected after his session is closed on the authorization server)
+		 */
+		private Optional<String> postLogoutUriRequestParam = Optional.empty();
+
+		/**
+		 * request param name for setting an ID-Token hint
+		 */
+		private Optional<String> idTokenHintRequestParam = Optional.empty();
+	}
+
 	/**
 	 * Request parameter
 	 *
 	 * @author Jerome Wacongne ch4mp&#64;c4-soft.com
 	 */
+	@ConfigurationProperties
 	@Data
 	public static class RequestParam {
 		/**

spring-addons-starter-oidc/src/main/java/com/c4_soft/springaddons/security/oidc/starter/properties/SpringAddonsOidcResourceServerProperties.java

@@ -1,5 +1,6 @@
 package com.c4_soft.springaddons.security.oidc.starter.properties;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 import lombok.Data;
@@ -11,6 +12,7 @@
  *
  * @author Jerome Wacongne ch4mp@c4-soft.com
  */
+@ConfigurationProperties
 @Data
 public class SpringAddonsOidcResourceServerProperties {
 

spring-addons-starter-oidc/src/main/java/com/c4_soft/springaddons/security/oidc/starter/properties/condition/bean/CookieCsrfCondition.java

@@ -10,13 +10,19 @@ public CookieCsrfCondition() {
 	}
 
 	@ConditionalOnProperty(name = "com.c4-soft.springaddons.oidc.client.csrf", havingValue = "cookie-accessible-from-js")
-	static class CookieAccessibleToJsCondition {
+	static class ClientCookieAccessibleFromJsCondition {
+	}
 
+	@ConditionalOnProperty(name = "com.c4-soft.springaddons.oidc.client.csrf", havingValue = "cookie-http-only")
+	static class clientHttpOnlyCookieCondition {
 	}
 
 	@ConditionalOnProperty(name = "com.c4-soft.springaddons.oidc.resourceserver.csrf", havingValue = "cookie-http-only")
-	static class HttpOnlyCookieCondition {
+	static class ResourceServerHttpOnlyCookieCondition {
+	}
 
+	@ConditionalOnProperty(name = "com.c4-soft.springaddons.oidc.resourceserver.csrf", havingValue = "cookie-accessible-from-js")
+	static class ResourceServerCookieAccessibleFromJsCondition {
 	}
 
 }