chore: revert rpc tls is enabled by default

Refs: XRDDEV-2839
nordic-institute · Feb 26, 2025 · 6c3d679 · 6c3d679
1 parent 20111e1
commit 6c3d679
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 22 deletions.
diff --git a/src/central-server/admin-service/core/build.gradle.kts b/src/central-server/admin-service/core/build.gradle.kts
@@ -26,6 +26,7 @@ dependencies {
 
   implementation(libs.apache.commonsCompress)
   implementation(libs.mapstruct)
+  implementation(project(":common:common-rpc-spring"))
 
   testImplementation(project(":common:common-test"))
   testImplementation("org.springframework.boot:spring-boot-starter-test")

diff --git a/...ervice/core/src/main/java/org/niis/xroad/cs/admin/core/config/BootstrapConfiguration.java b/...ervice/core/src/main/java/org/niis/xroad/cs/admin/core/config/BootstrapConfiguration.java
@@ -30,6 +30,7 @@
 
 import jakarta.servlet.Filter;
 import org.niis.xroad.common.api.throttle.IpThrottlingFilter;
+import org.niis.xroad.common.rpc.spring.SpringRpcConfig;
 import org.niis.xroad.globalconf.spring.SpringGlobalConfConfig;
 import org.niis.xroad.restapi.config.AddCorrelationIdFilter;
 import org.niis.xroad.restapi.config.AllowedFilesConfig;
@@ -42,7 +43,8 @@
 import org.springframework.core.annotation.Order;
 
 @Import({SpringGlobalConfConfig.class,
-        SpringSignerClientConfiguration.class})
+        SpringSignerClientConfiguration.class,
+        SpringRpcConfig.class})
 @Configuration
 public class BootstrapConfiguration {
 

diff --git a/...ain/java/org/niis/xroad/common/properties/spring/SpringCommonPropertiesConfiguration.java b/...ain/java/org/niis/xroad/common/properties/spring/SpringCommonPropertiesConfiguration.java
@@ -26,20 +26,13 @@
  */
 package org.niis.xroad.common.properties.spring;
 
-import org.springframework.context.annotation.Bean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-//@EnableConfigurationProperties({
-//        SpringCommonGlobalConfProperties.class,
-//        SpringCommonRpcProperties.class
-//})
+@EnableConfigurationProperties({
+        SpringCommonRpcProperties.class
+})
 public class SpringCommonPropertiesConfiguration {
 
-    @Bean
-    SpringCommonRpcProperties springCommonRpcProperties() {
-        //TODO hardcoded as spring boot is not present in most modules
-        return new SpringCommonRpcProperties(false, null);
-    }
-
 }
diff --git a/...ring/src/main/java/org/niis/xroad/common/properties/spring/SpringCommonRpcProperties.java b/...ring/src/main/java/org/niis/xroad/common/properties/spring/SpringCommonRpcProperties.java
@@ -27,21 +27,18 @@
 
 package org.niis.xroad.common.properties.spring;
 
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.niis.xroad.common.properties.CommonRpcProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import java.util.List;
 
 
-@NoArgsConstructor
-@AllArgsConstructor
+@Setter
 @ConfigurationProperties(prefix = "xroad.common.rpc")
 public class SpringCommonRpcProperties implements CommonRpcProperties {
 
-    private boolean useTls;
+    private boolean useTls = Boolean.parseBoolean(DEFAULT_USE_TLS);
     private SpringCertificateProvisionProperties certificateProvisioning;
 
     @Override
@@ -55,9 +52,7 @@ public CertificateProvisionProperties certificateProvisioning() {
     }
 
     @Setter
-    @ConfigurationProperties(prefix = "xroad.common.rpc.certificate-provisioning")
-    public class SpringCertificateProvisionProperties
-            implements CertificateProvisionProperties {
+    static class SpringCertificateProvisionProperties implements CertificateProvisionProperties {
 
         private String issuanceRoleName;
         private String commonName;

diff --git a/...common-properties/src/main/java/org/niis/xroad/common/properties/CommonRpcProperties.java b/...common-properties/src/main/java/org/niis/xroad/common/properties/CommonRpcProperties.java
@@ -35,9 +35,10 @@
 
 @ConfigMapping(prefix = "xroad.common.rpc")
 public interface CommonRpcProperties {
+    String DEFAULT_USE_TLS = "false";
 
     @WithName("use-tls")
-    @WithDefault("false")
+    @WithDefault(DEFAULT_USE_TLS)
     boolean useTls();
 
     @WithName("certificate-provisioning")

diff --git a/src/common/common-properties/src/main/resources/xroad-common.yaml b/src/common/common-properties/src/main/resources/xroad-common.yaml
@@ -36,7 +36,6 @@ logging:
 xroad:
   common:
     rpc:
-      use-tls: false #TODO disabled until all components are ready
       certificate-provisioning:
         secret-store-pki-path: xrd-pki
         issuance-role-name: xrd-rpc-internal