From 8c17c5f8d11395e546c22b344e2e45c151a0ce2a Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Tue, 22 Jun 2021 14:09:19 -0600 Subject: [PATCH 1/8] Native resource server with native hints --- spring-boot/pom.xml | 13 +++++++++++-- .../main/java/com/okta/rest/DemoApplication.java | 13 +++++++++++-- .../src/main/resources/application.properties | 4 +--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index f3d1912..b84f42a 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -20,8 +20,9 @@ - org.springframework.boot - spring-boot-starter-oauth2-resource-server + com.okta.spring + okta-spring-boot-starter + 2.1.1-SNAPSHOT org.springframework.boot @@ -40,6 +41,7 @@ + spring-boot:run org.springframework.boot @@ -58,6 +60,13 @@ org.springframework.experimental spring-aot-maven-plugin ${spring-native.version} + + + com.okta.spring.boot + native-hints + 0.0.1-SNAPSHOT + + test-generate diff --git a/spring-boot/src/main/java/com/okta/rest/DemoApplication.java b/spring-boot/src/main/java/com/okta/rest/DemoApplication.java index d159d86..89074d5 100644 --- a/spring-boot/src/main/java/com/okta/rest/DemoApplication.java +++ b/spring-boot/src/main/java/com/okta/rest/DemoApplication.java @@ -2,14 +2,23 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.nativex.hint.AccessBits; import org.springframework.nativex.hint.NativeHint; +import org.springframework.nativex.hint.ResourceHint; +import org.springframework.nativex.hint.TypeHint; @SpringBootApplication -@NativeHint(options = "--enable-url-protocols=https") +/*@NativeHint(options = "--enable-url-protocols=https") +@ResourceHint(patterns = "com/okta/commons/configcheck/configuration-validator", isBundle = true) +@TypeHint(typeNames = { + "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional", + "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional$ClientIdCondition", + "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional$ClientSecretCondition", + "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional$IntrospectionUriCondition" +}, access = AccessBits.ALL)*/ public class DemoApplication { public static void main(String[] args) { SpringApplication.run(DemoApplication.class, args); } - } diff --git a/spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties index 8c521f9..b2a4297 100644 --- a/spring-boot/src/main/resources/application.properties +++ b/spring-boot/src/main/resources/application.properties @@ -1,3 +1 @@ -#spring.security.oauth2.resourceserver.jwt.issuer-uri=https://dev-1309757.okta.com/oauth2/default -#spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:9080/auth/realms/jhipster/protocol/openid-connect/certs -spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://dev-1309757.okta.com/oauth2/default/v1/keys +okta.oauth2.issuer=https://dev-1309757.okta.com/oauth2/default From 3adbe2f4397d08680934ca29c72585624ddff6f6 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Tue, 22 Jun 2021 14:13:23 -0600 Subject: [PATCH 2/8] Use Okta Spring Boot starter with native annotations --- spring-boot/pom.xml | 7 ------- .../src/main/java/com/okta/rest/DemoApplication.java | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index b84f42a..7396f09 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -60,13 +60,6 @@ org.springframework.experimental spring-aot-maven-plugin ${spring-native.version} - - - com.okta.spring.boot - native-hints - 0.0.1-SNAPSHOT - - test-generate diff --git a/spring-boot/src/main/java/com/okta/rest/DemoApplication.java b/spring-boot/src/main/java/com/okta/rest/DemoApplication.java index 89074d5..bc7a2bf 100644 --- a/spring-boot/src/main/java/com/okta/rest/DemoApplication.java +++ b/spring-boot/src/main/java/com/okta/rest/DemoApplication.java @@ -8,14 +8,14 @@ import org.springframework.nativex.hint.TypeHint; @SpringBootApplication -/*@NativeHint(options = "--enable-url-protocols=https") +@NativeHint(options = "--enable-url-protocols=https") @ResourceHint(patterns = "com/okta/commons/configcheck/configuration-validator", isBundle = true) @TypeHint(typeNames = { "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional", "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional$ClientIdCondition", "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional$ClientSecretCondition", "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional$IntrospectionUriCondition" -}, access = AccessBits.ALL)*/ +}, access = AccessBits.ALL) public class DemoApplication { public static void main(String[] args) { From 70207ab0b644685b00fefc589a30daf3717cd4b3 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Mon, 13 Sep 2021 16:26:10 -0600 Subject: [PATCH 3/8] Upgrade to Spring Boot 2.5.4 and Spring Native 0.10.3 --- spring-boot/pom.xml | 6 +++--- .../src/main/java/com/okta/rest/DemoApplication.java | 12 +----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 7396f09..6b9d06c 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.1 + 2.5.4 com.example @@ -16,7 +16,7 @@ 11 - 0.10.0 + 0.10.3 @@ -103,7 +103,7 @@ native exec - 0.9.0 + 0.9.3 diff --git a/spring-boot/src/main/java/com/okta/rest/DemoApplication.java b/spring-boot/src/main/java/com/okta/rest/DemoApplication.java index bc7a2bf..bd3a8ca 100644 --- a/spring-boot/src/main/java/com/okta/rest/DemoApplication.java +++ b/spring-boot/src/main/java/com/okta/rest/DemoApplication.java @@ -2,20 +2,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.nativex.hint.AccessBits; import org.springframework.nativex.hint.NativeHint; -import org.springframework.nativex.hint.ResourceHint; -import org.springframework.nativex.hint.TypeHint; @SpringBootApplication -@NativeHint(options = "--enable-url-protocols=https") -@ResourceHint(patterns = "com/okta/commons/configcheck/configuration-validator", isBundle = true) -@TypeHint(typeNames = { - "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional", - "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional$ClientIdCondition", - "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional$ClientSecretCondition", - "com.okta.spring.boot.oauth.OktaOpaqueTokenIntrospectConditional$IntrospectionUriCondition" -}, access = AccessBits.ALL) +@NativeHint(options = "--enable-https") public class DemoApplication { public static void main(String[] args) { From 09546125edf26c375c6af45b0398da656f4fcb18 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Wed, 15 Sep 2021 14:31:57 -0600 Subject: [PATCH 4/8] Upgrade to Okta starter v2.1.1 --- spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 6b9d06c..b1c916b 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -22,7 +22,7 @@ com.okta.spring okta-spring-boot-starter - 2.1.1-SNAPSHOT + 2.1.1 org.springframework.boot From 00dee7c3def937f81266cd32a476a38b2485a8a6 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Thu, 7 Oct 2021 18:03:23 -0600 Subject: [PATCH 5/8] Upgrade to Okta Spring Boot 2.1.2 --- spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index f7e5dff..8f47fe1 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -22,7 +22,7 @@ com.okta.spring okta-spring-boot-starter - 2.1.1 + 2.1.2 org.springframework.boot From ec123b3f6b643dbf9c6717c4e818ed36de807ee9 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Thu, 9 Dec 2021 10:08:09 -0700 Subject: [PATCH 6/8] Use Spring property name instead of Okta property name --- spring-boot/src/main/resources/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties index 63bf0e2..7b1a2f5 100644 --- a/spring-boot/src/main/resources/application.properties +++ b/spring-boot/src/main/resources/application.properties @@ -1 +1,2 @@ -okta.oauth2.issuer=https://dev-2530788.okta.com/oauth2/default +#okta.oauth2.issuer=https://dev-2530788.okta.com/oauth2/default +spring.security.oauth2.resourceserver.jwt.issuer-uri=https://dev-2530788.okta.com/oauth2/default From fdcd5c25a2d3dc8617fddd1b66647322493b0d44 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Thu, 31 Mar 2022 18:15:29 -0600 Subject: [PATCH 7/8] Update to use Spring Boot 2.6.6 --- spring-boot/pom.xml | 2 +- spring-boot/src/main/resources/application.properties | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 2834784..0e7a27a 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -22,7 +22,7 @@ com.okta.spring okta-spring-boot-starter - 2.1.3 + 2.1.5 org.springframework.boot diff --git a/spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties index 4ca668b..241e081 100644 --- a/spring-boot/src/main/resources/application.properties +++ b/spring-boot/src/main/resources/application.properties @@ -1,3 +1 @@ -spring.security.oauth2.resourceserver.jwt.issuer-uri=https://dev-17700857.okta.com/oauth2/default -#okta.oauth2.issuer=https://dev-2530788.okta.com/oauth2/default -spring.security.oauth2.resourceserver.jwt.issuer-uri=https://dev-2530788.okta.com/oauth2/default +okta.oauth2.issuer=https://dev-17700857.okta.com/oauth2/default From c4768697c08ee5d2194240160dff682ed1063d13 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Wed, 26 Oct 2022 12:07:35 +0100 Subject: [PATCH 8/8] Upgrade to Okta Spring Boot 2.1.6 --- spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index efa460a..4d7ce81 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -22,7 +22,7 @@ com.okta.spring okta-spring-boot-starter - 2.1.5 + 2.1.6 org.springframework.boot