Xrddev 1711 - Central server backend part of the initialization functionality

src/build.gradle

@@ -109,7 +109,11 @@ configure(subprojects.findAll { !["frontend","shared-ui","admin-ui"].contains(it
     apply plugin: 'checkstyle'
     apply plugin: 'jacoco'
 
-    sourceCompatibility = 1.8
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(11)
+        }
+    }
 
     tasks.withType(JavaCompile) {
       options.encoding = 'UTF-8'

src/centralserver/admin-service/build.gradle

@@ -1,3 +1,5 @@
+import nl.javadude.gradle.plugins.license.License
+
 plugins {
     id 'io.spring.dependency-management'
     id 'org.springframework.boot'
@@ -8,9 +10,6 @@ apply plugin: 'com.github.hierynomus.license'
 
 archivesBaseName ='centralserver-admin-service'
 
-sourceCompatibility = 11
-targetCompatibility = 11
-
 configurations {
     dist {
         canBeConsumed = false
@@ -47,13 +46,14 @@ openApiGenerate {
         modelDocs: "false",
         apis     : "", // must use empty strings instead of "true":
         // https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-gradle-plugin
-        models   : ""
+        models   : "",
+        generateSupportingFiles: "false",
+        skipDefaultInterface: "true",
+        supportingFiles: 'ApiUtil.java'
     ]
     configOptions = [
         interfaceOnly: "true",
-        useTags      : "true",
-        generateSupportingFiles: "false",
-        skipDefaultInterface: "true"
+        useTags      : "true"
     ]
 }
 
@@ -72,11 +72,11 @@ processResources {
 compileJava.dependsOn tasks.openApiGenerate
 
 // set license format to ignore generated java sources
-task licenseFormatJava(type: nl.javadude.gradle.plugins.license.License) {
+task licenseFormatJava(type: License) {
     source = fileTree('src/main/java')
 }
 
-task licenseTestJava(type: nl.javadude.gradle.plugins.license.License) {
+task licenseTestJava(type: License) {
     source = fileTree('src/main/java')
     check = true
 }
@@ -112,16 +112,15 @@ dependencies {
     implementation project(':common-ui')
     implementation project(':common-rest-api')
 
-
     implementation('org.springframework.boot:spring-boot-starter-security')
-    implementation('org.springframework.boot:spring-boot-starter-web')
-    implementation('org.springframework.data:spring-data-commons');
+    implementation('org.springframework.boot:spring-boot-starter-web:2.5.0')
+    implementation('org.springframework.data:spring-data-commons')
     implementation('org.springframework.boot:spring-boot-starter-data-jpa')
     implementation("org.springframework.boot:spring-boot-starter-cache")
     implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation('org.springframework.cloud:spring-cloud-starter-sleuth')
     implementation('org.kohsuke:libpam4j:1.11')
-    implementation('org.apache.commons:commons-compress:1.20')
+    implementation('org.apache.commons:commons-compress:1.21')
     implementation('wsdl4j:wsdl4j:1.6.3')
     implementation('com.github.vladimir-bukhtoyarov:bucket4j-core:4.10.0')
     implementation("io.swagger.parser.v3:swagger-parser-v3:${swaggerParserVersion}")

src/centralserver/admin-service/src/main/java/org/niis/xroad/centralserver/restapi/Main.java

@@ -30,7 +30,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SuppressWarnings("checkstyle:HideUtilityClassConstructor")
-@SpringBootApplication(scanBasePackages = { "org.niis.xroad.centralserver.restapi", "org.niis.xroad.restapi" })
+@SpringBootApplication(scanBasePackages = {
+        "org.niis.xroad.centralserver.restapi",
+        "org.niis.xroad.restapi"
+})
 public class Main {
     public static void main(String[] args) {
         SpringApplication.run(Main.class, args);

src/centralserver/admin-service/src/main/java/org/niis/xroad/centralserver/restapi/config/CurrentHAConfigStatus.java

@@ -0,0 +1,56 @@
+/**
+ * The MIT License
+ * <p>
+ * Copyright (c) 2019- Nordic Institute for Interoperability Solutions (NIIS)
+ * Copyright (c) 2018 Estonian Information System Authority (RIA),
+ * Nordic Institute for Interoperability Solutions (NIIS), Population Register Centre (VRK)
+ * Copyright (c) 2015-2017 Estonian Information System Authority (RIA), Population Register Centre (VRK)
+ * <p>
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.niis.xroad.centralserver.restapi.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class CurrentHAConfigStatus {
+
+    private static final String XROAD_HA_NODE_NAME_PROPERTY = "xroad.center.ha-node-name";
+    private static final String XROAD_HA_NODE_NAME_DEFAULT = "node_0";
+
+    @Bean
+    HAConfigStatus currentHaConfigStatus() {
+        boolean isHaConfigured = true;
+        String haNodeName;
+
+        haNodeName = getHaNodeNameProperty();
+        if (haNodeName.isEmpty()) {
+            isHaConfigured = false;
+            haNodeName = XROAD_HA_NODE_NAME_DEFAULT;
+        }
+        return new HAConfigStatus(haNodeName, isHaConfigured);
+    }
+
+    private String getHaNodeNameProperty() {
+        return System.getProperty(XROAD_HA_NODE_NAME_PROPERTY, "");
+    }
+
+
+}

src/centralserver/admin-service/src/main/java/org/niis/xroad/centralserver/restapi/config/HAConfigStatus.java

@@ -0,0 +1,35 @@
+/**
+ * The MIT License
+ * <p>
+ * Copyright (c) 2019- Nordic Institute for Interoperability Solutions (NIIS)
+ * Copyright (c) 2018 Estonian Information System Authority (RIA),
+ * Nordic Institute for Interoperability Solutions (NIIS), Population Register Centre (VRK)
+ * Copyright (c) 2015-2017 Estonian Information System Authority (RIA), Population Register Centre (VRK)
+ * <p>
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * <p>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.niis.xroad.centralserver.restapi.config;
+
+import lombok.Value;
+
+@Value
+public class HAConfigStatus {
+    String currentHaNodeName;
+    boolean isHaConfigured;
+}

src/centralserver/admin-service/src/main/java/org/niis/xroad/centralserver/restapi/config/SignerIpAddressConfiguration.java

@@ -0,0 +1,56 @@
+/**
+ * The MIT License
+ * Copyright (c) 2019- Nordic Institute for Interoperability Solutions (NIIS)
+ * Copyright (c) 2018 Estonian Information System Authority (RIA),
+ * Nordic Institute for Interoperability Solutions (NIIS), Population Register Centre (VRK)
+ * Copyright (c) 2015-2017 Estonian Information System Authority (RIA), Population Register Centre (VRK)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.niis.xroad.centralserver.restapi.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+/**
+ * Enable customization of signer IP address when development profile is active.
+ * Otherwise use 127.0.0.1
+ */
+@Configuration
+public class SignerIpAddressConfiguration {
+
+    @Value("${custom.signer.ip:127.0.0.1}")
+    private String customIp;
+
+    @SuppressWarnings("SameReturnValue")
+    @Bean(name = "signer-ip")
+    @Profile("!development")
+    public String defaultBean() {
+        return "127.0.0.1";
+    }
+
+    @Bean(name = "signer-ip")
+    @Profile("development")
+    public String customBean() {
+        return customIp;
+    }
+
+}

src/centralserver/admin-service/src/main/java/org/niis/xroad/centralserver/restapi/converter/InitializationStatusConverter.java

@@ -0,0 +1,47 @@
+/**
+ * The MIT License
+ *
+ * Copyright (c) 2019- Nordic Institute for Interoperability Solutions (NIIS)
+ * Copyright (c) 2018 Estonian Information System Authority (RIA),
+ * Nordic Institute for Interoperability Solutions (NIIS), Population Register Centre (VRK)
+ * Copyright (c) 2015-2017 Estonian Information System Authority (RIA), Population Register Centre (VRK)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.niis.xroad.centralserver.restapi.converter;
+
+import org.niis.xroad.centralserver.openapi.model.InitializationStatus;
+import org.niis.xroad.centralserver.openapi.model.TokenInitStatus;
+import org.niis.xroad.centralserver.restapi.dto.InitializationStatusDto;
+import org.springframework.stereotype.Component;
+
+import static org.niis.xroad.centralserver.restapi.converter.TokenInitStatusMapping.map;
+
+@Component
+public class InitializationStatusConverter {
+
+    public InitializationStatus convert(InitializationStatusDto initializationStatusDto) {
+        InitializationStatus status = new InitializationStatus();
+        return status.centralServerAddress(initializationStatusDto.getCentralServerAddress())
+                .instanceIdentifier(initializationStatusDto.getInstanceIdentifier())
+                .softwareTokenInitStatus(map(initializationStatusDto.getTokenInitStatus())
+                        .orElse(TokenInitStatus.UNKNOWN)
+                );
+    }
+}

src/centralserver/admin-service/src/main/java/org/niis/xroad/centralserver/restapi/converter/TokenInitStatusMapping.java

@@ -0,0 +1,89 @@
+/**
+ * The MIT License
+ * Copyright (c) 2019- Nordic Institute for Interoperability Solutions (NIIS)
+ * Copyright (c) 2018 Estonian Information System Authority (RIA),
+ * Nordic Institute for Interoperability Solutions (NIIS), Population Register Centre (VRK)
+ * Copyright (c) 2015-2017 Estonian Information System Authority (RIA), Population Register Centre (VRK)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.niis.xroad.centralserver.restapi.converter;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.niis.xroad.centralserver.openapi.model.TokenInitStatus;
+import org.niis.xroad.centralserver.restapi.dto.TokenInitStatusInfo;
+
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * Mapping between {@link TokenInitStatus} in api (enum) and model {@link TokenInitStatusInfo}
+ */
+@Getter
+@RequiredArgsConstructor
+public enum TokenInitStatusMapping {
+    INITIALIZED(TokenInitStatusInfo.INITIALIZED, TokenInitStatus.INITIALIZED),
+    NOT_INITIALIZED(TokenInitStatusInfo.NOT_INITIALIZED, TokenInitStatus.NOT_INITIALIZED),
+    UNKNOWN(TokenInitStatusInfo.UNKNOWN, TokenInitStatus.UNKNOWN);
+
+    private final TokenInitStatusInfo tokenInitStatusInfo;
+    private final TokenInitStatus tokenInitStatus;
+
+    /**
+     * Return matching {@link TokenInitStatusInfo}, if any
+     *
+     * @param tokenInitStatus to be mapped
+     */
+    public static Optional<TokenInitStatusInfo> map(TokenInitStatus tokenInitStatus) {
+        return getFor(tokenInitStatus).map(TokenInitStatusMapping::getTokenInitStatusInfo);
+    }
+
+    /**
+     * Return matching {@link TokenInitStatus}, if any
+     *
+     * @param tokenInitStatusInfo to be mapped
+     */
+    public static Optional<TokenInitStatus> map(TokenInitStatusInfo tokenInitStatusInfo) {
+        return getFor(tokenInitStatusInfo).map(TokenInitStatusMapping::getTokenInitStatus);
+    }
+
+    /**
+     * Return matching {@link TokenInitStatusMapping}, if any
+     *
+     * @param tokenInitStatusInfo for what mapping is requested
+     */
+    public static Optional<TokenInitStatusMapping> getFor(TokenInitStatusInfo tokenInitStatusInfo) {
+        return Arrays.stream(values())
+                .filter(mapping -> mapping.tokenInitStatusInfo.equals(tokenInitStatusInfo))
+                .findFirst();
+    }
+
+    /**
+     * Return matching {@link TokenInitStatusMapping}, if any
+     *
+     * @param tokenInitStatus for what mapping is requested
+     */
+    public static Optional<TokenInitStatusMapping> getFor(TokenInitStatus tokenInitStatus) {
+        return Arrays.stream(values())
+                .filter(mapping -> mapping.tokenInitStatus.equals(tokenInitStatus))
+                .findFirst();
+    }
+}