Compare commits

...
3 Commits
Author SHA1 Message Date
2martens 64faaa3c4a fix: Remove policy checker
continuous-integration/drone/tag Build is passing
2025-07-26 14:25:15 +02:00
2martens 32581e9cc8 fix: Make sure application starts up again
continuous-integration/drone/tag Build is passing
2025-07-26 14:14:06 +02:00
2martens 93016dabfa fix: Align ServiceProperties with rest of properties 2025-07-26 13:37:52 +02:00
5 changed files with 9 additions and 17 deletions
@@ -15,9 +15,9 @@ import org.springframework.context.annotation.Configuration
name = "oauth2",
type = SecuritySchemeType.OAUTH2,
flows = OAuthFlows(
implicit = OAuthFlow(
authorizationUrl = "https://id.2martens.de/realms/2martens/protocol/openid-connect/auth",
tokenUrl = "https://id.2martens.de/realms/2martens/protocol/openid-connect/token"
authorizationCode = OAuthFlow(
authorizationUrl = "https://id.2martens.de/realms/twomartens/protocol/openid-connect/auth",
tokenUrl = "https://id.2martens.de/realms/twomartens/protocol/openid-connect/token"
)
)
)
@@ -11,13 +11,10 @@ import org.springframework.beans.factory.annotation.Value
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.http.HttpMethod
import org.springframework.security.config.Customizer
import org.springframework.security.config.annotation.web.builders.HttpSecurity
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer
import org.springframework.security.oauth2.jwt.JwtDecoder
import org.springframework.security.oauth2.jwt.NimbusJwtDecoder
import org.springframework.security.oauth2.server.resource.web.authentication.BearerTokenAuthenticationFilter
import org.springframework.security.web.SecurityFilterChain
import java.io.IOException
@@ -38,8 +35,6 @@ open class WebSecurityConfiguration {
.authorizeHttpRequests { it.requestMatchers(*PERMITTED_PATHS.toTypedArray<String>()).permitAll() }
.authorizeHttpRequests { it.requestMatchers(HttpMethod.OPTIONS).permitAll() }
.authorizeHttpRequests { it.anyRequest().authenticated() }
.oauth2ResourceServer { obj: OAuth2ResourceServerConfigurer<HttpSecurity?> -> obj.jwt(Customizer.withDefaults()) }
.addFilterAfter(createPolicyEnforcerFilter(), BearerTokenAuthenticationFilter::class.java)
return http.build()
}
@@ -2,13 +2,12 @@ package de.twomartens.wahlrecht.property
import io.swagger.v3.oas.annotations.media.Schema
import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.cloud.context.config.annotation.RefreshScope
import org.springframework.boot.context.properties.bind.ConstructorBinding
import java.time.ZoneId
@RefreshScope
@ConfigurationProperties(prefix = "de.twomartens.wahlrecht")
@Schema(description = "Properties, to configure this Application")
open class ServiceProperties {
lateinit var defaultTimeZone: ZoneId
lateinit var greeting: String
}
data class ServiceProperties @ConstructorBinding constructor(
val defaultTimeZone: ZoneId,
val greeting: String
)
@@ -4,11 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema
import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.boot.context.properties.bind.ConstructorBinding
import org.springframework.boot.convert.DurationUnit
import org.springframework.cloud.context.config.annotation.RefreshScope
import java.time.Duration
import java.time.temporal.ChronoUnit
@RefreshScope
@ConfigurationProperties(prefix = "de.twomartens.wahlrecht.statusprobe")
@Schema(description = "Properties, to configure this Application")
data class StatusProbeProperties @ConstructorBinding constructor(
@@ -1,5 +1,5 @@
{
"realm": "2martens",
"realm": "twomartens",
"auth-server-url": "https://id.2martens.de",
"resource": "wahlrecht",
"http-method-as-scope": true