Merge pull request #113 from RADAR-base/release-0.7.4

Release 0.7.4

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 @Suppress("ConstPropertyName")
 object Versions {
-    const val project = "0.7.2"
+    const val project = "0.7.4"
 
     const val java = 17
     const val kotlin = "1.9.22"

gateway.yml

@@ -53,3 +53,5 @@ auth:
         #ecdsa: []
         # RSA public keys
         #rsa: []
+    # jwks URLs to fetch public keys from
+    #publicKeyUrls: []

radar-gateway/src/main/kotlin/org/radarbase/gateway/config/AuthConfig.kt

@@ -21,11 +21,13 @@ data class AuthConfig(
     val keyStore: KeyStoreConfig = KeyStoreConfig(),
     /** Public keys for checking the digital signature of OAuth 2.0 JWTs. */
     val publicKeys: KeyConfig = KeyConfig(),
+    /** Public key URLs for checking the digital signature of OAuth 2.0 JWTs. */
+    val publicKeyUrls: List<String>? = null,
 ) {
     fun validate() {
         keyStore.validate()
-        check(managementPortalUrl != null || keyStore.isConfigured || publicKeys.isConfigured) {
-            "At least one of auth.keyStore, auth.publicKeys or auth.managementPortalUrl must be configured"
+        check(managementPortalUrl != null || keyStore.isConfigured || publicKeys.isConfigured || !publicKeyUrls.isNullOrEmpty()) {
+            "At least one of auth.keyStore, auth.publicKeys, auth.publicKeyUrls or auth.managementPortalUrl must be configured"
         }
     }
 }

radar-gateway/src/main/kotlin/org/radarbase/gateway/inject/EcdsaJwtEnhancerFactory.kt

@@ -19,6 +19,7 @@ class EcdsaJwtEnhancerFactory(private val config: GatewayConfig) : EnhancerFacto
             jwtKeystoreAlias = config.auth.keyStore.alias,
             jwtKeystorePassword = config.auth.keyStore.password,
             jwtKeystorePath = config.auth.keyStore.path.toString(),
+            jwksUrls = config.auth.publicKeyUrls ?: emptyList(),
         )
         return listOf(
             GatewayResourceEnhancer(config),

radar-gateway/src/main/kotlin/org/radarbase/gateway/inject/ManagementPortalEnhancerFactory.kt

@@ -16,6 +16,7 @@ class ManagementPortalEnhancerFactory(private val config: GatewayConfig) : Enhan
             ),
             jwtResourceName = config.auth.resourceName,
             jwtIssuer = config.auth.issuer,
+            jwksUrls = config.auth.publicKeyUrls ?: emptyList(),
         )
         return listOf(
             GatewayResourceEnhancer(config),