From 04caef4a0a6b14288ea7de1aaf3be55b2b05283d Mon Sep 17 00:00:00 2001 From: Tamas Bordi Date: Wed, 1 Sep 2021 13:13:49 +0200 Subject: [PATCH 1/2] check configuration (cherry picked from commit 02d55234ce67cf0f4a5f1db64e83b1726af82578) --- .../provider/ProviderApplicationInitListener.java | 11 ++++++++++- .../publisher/PublisherApplicationInitListener.java | 11 ++++++++++- .../subscriber/SubscriberApplicationInitListener.java | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/application-skeleton-provider/src/main/java/eu/arrowhead/application/skeleton/provider/ProviderApplicationInitListener.java b/application-skeleton-provider/src/main/java/eu/arrowhead/application/skeleton/provider/ProviderApplicationInitListener.java index 1f5e0f5..e6cd326 100644 --- a/application-skeleton-provider/src/main/java/eu/arrowhead/application/skeleton/provider/ProviderApplicationInitListener.java +++ b/application-skeleton-provider/src/main/java/eu/arrowhead/application/skeleton/provider/ProviderApplicationInitListener.java @@ -50,7 +50,8 @@ public class ProviderApplicationInitListener extends ApplicationInitListener { //------------------------------------------------------------------------------------------------- @Override protected void customInit(final ContextRefreshedEvent event) { - + checkConfiguration(); + //Checking the availability of necessary core systems checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); if (sslEnabled && tokenSecurityFilterEnabled) { @@ -76,6 +77,14 @@ public void customDestroy() { //================================================================================================= // assistant methods + + //------------------------------------------------------------------------------------------------- + private void checkConfiguration() { + if (!sslEnabled && tokenSecurityFilterEnabled) { + logger.info("Contradictory configuration:"); + logger.info("token.security.filter.enabled=true while server.ssl.enabled=false"); + } + } //------------------------------------------------------------------------------------------------- private void setTokenSecurityFilter() { diff --git a/application-skeleton-publisher/src/main/java/eu/arrowhead/application/skeleton/publisher/PublisherApplicationInitListener.java b/application-skeleton-publisher/src/main/java/eu/arrowhead/application/skeleton/publisher/PublisherApplicationInitListener.java index e1ca8f3..f77e795 100644 --- a/application-skeleton-publisher/src/main/java/eu/arrowhead/application/skeleton/publisher/PublisherApplicationInitListener.java +++ b/application-skeleton-publisher/src/main/java/eu/arrowhead/application/skeleton/publisher/PublisherApplicationInitListener.java @@ -66,7 +66,8 @@ public class PublisherApplicationInitListener extends ApplicationInitListener { //------------------------------------------------------------------------------------------------- @Override protected void customInit(final ContextRefreshedEvent event) { - + checkConfiguration(); + //Checking the availability of necessary core systems checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); @@ -99,6 +100,14 @@ public void customDestroy() { //================================================================================================= // assistant methods + + //------------------------------------------------------------------------------------------------- + private void checkConfiguration() { + if (!sslEnabled && tokenSecurityFilterEnabled) { + logger.info("Contradictory configuration:"); + logger.info("token.security.filter.enabled=true while server.ssl.enabled=false"); + } + } //------------------------------------------------------------------------------------------------- private void setTokenSecurityFilter() { diff --git a/application-skeleton-subscriber/src/main/java/eu/arrowhead/application/skeleton/subscriber/SubscriberApplicationInitListener.java b/application-skeleton-subscriber/src/main/java/eu/arrowhead/application/skeleton/subscriber/SubscriberApplicationInitListener.java index 493a71f..aa7a533 100644 --- a/application-skeleton-subscriber/src/main/java/eu/arrowhead/application/skeleton/subscriber/SubscriberApplicationInitListener.java +++ b/application-skeleton-subscriber/src/main/java/eu/arrowhead/application/skeleton/subscriber/SubscriberApplicationInitListener.java @@ -66,7 +66,8 @@ public class SubscriberApplicationInitListener extends ApplicationInitListener { //------------------------------------------------------------------------------------------------- @Override protected void customInit(final ContextRefreshedEvent event) { - + checkConfiguration(); + //Checking the availability of necessary core systems checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); @@ -116,6 +117,14 @@ public void customDestroy() { //================================================================================================= // assistant methods + + //------------------------------------------------------------------------------------------------- + private void checkConfiguration() { + if (!sslEnabled && tokenSecurityFilterEnabled) { + logger.info("Contradictory configuration:"); + logger.info("token.security.filter.enabled=true while server.ssl.enabled=false"); + } + } //------------------------------------------------------------------------------------------------- private void setTokenSecurityFilter() { From b9b3893a71071860956eec84f1f1256fa17efe3a Mon Sep 17 00:00:00 2001 From: Tamas Bordi Date: Wed, 1 Sep 2021 13:31:18 +0200 Subject: [PATCH 2/2] check configuration change log level to warn --- .../skeleton/provider/ProviderApplicationInitListener.java | 4 ++-- .../skeleton/publisher/PublisherApplicationInitListener.java | 4 ++-- .../subscriber/SubscriberApplicationInitListener.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application-skeleton-provider/src/main/java/eu/arrowhead/application/skeleton/provider/ProviderApplicationInitListener.java b/application-skeleton-provider/src/main/java/eu/arrowhead/application/skeleton/provider/ProviderApplicationInitListener.java index e6cd326..3ebf2d0 100644 --- a/application-skeleton-provider/src/main/java/eu/arrowhead/application/skeleton/provider/ProviderApplicationInitListener.java +++ b/application-skeleton-provider/src/main/java/eu/arrowhead/application/skeleton/provider/ProviderApplicationInitListener.java @@ -81,8 +81,8 @@ public void customDestroy() { //------------------------------------------------------------------------------------------------- private void checkConfiguration() { if (!sslEnabled && tokenSecurityFilterEnabled) { - logger.info("Contradictory configuration:"); - logger.info("token.security.filter.enabled=true while server.ssl.enabled=false"); + logger.warn("Contradictory configuration:"); + logger.warn("token.security.filter.enabled=true while server.ssl.enabled=false"); } } diff --git a/application-skeleton-publisher/src/main/java/eu/arrowhead/application/skeleton/publisher/PublisherApplicationInitListener.java b/application-skeleton-publisher/src/main/java/eu/arrowhead/application/skeleton/publisher/PublisherApplicationInitListener.java index f77e795..e8b0de3 100644 --- a/application-skeleton-publisher/src/main/java/eu/arrowhead/application/skeleton/publisher/PublisherApplicationInitListener.java +++ b/application-skeleton-publisher/src/main/java/eu/arrowhead/application/skeleton/publisher/PublisherApplicationInitListener.java @@ -104,8 +104,8 @@ public void customDestroy() { //------------------------------------------------------------------------------------------------- private void checkConfiguration() { if (!sslEnabled && tokenSecurityFilterEnabled) { - logger.info("Contradictory configuration:"); - logger.info("token.security.filter.enabled=true while server.ssl.enabled=false"); + logger.warn("Contradictory configuration:"); + logger.warn("token.security.filter.enabled=true while server.ssl.enabled=false"); } } diff --git a/application-skeleton-subscriber/src/main/java/eu/arrowhead/application/skeleton/subscriber/SubscriberApplicationInitListener.java b/application-skeleton-subscriber/src/main/java/eu/arrowhead/application/skeleton/subscriber/SubscriberApplicationInitListener.java index aa7a533..b2a3f8a 100644 --- a/application-skeleton-subscriber/src/main/java/eu/arrowhead/application/skeleton/subscriber/SubscriberApplicationInitListener.java +++ b/application-skeleton-subscriber/src/main/java/eu/arrowhead/application/skeleton/subscriber/SubscriberApplicationInitListener.java @@ -121,8 +121,8 @@ public void customDestroy() { //------------------------------------------------------------------------------------------------- private void checkConfiguration() { if (!sslEnabled && tokenSecurityFilterEnabled) { - logger.info("Contradictory configuration:"); - logger.info("token.security.filter.enabled=true while server.ssl.enabled=false"); + logger.warn("Contradictory configuration:"); + logger.warn("token.security.filter.enabled=true while server.ssl.enabled=false"); } }