pcvolkmer/etl-processor
1
0
Fork 0
mirror of https://github.com/pcvolkmer/etl-processor.git synced 2025-04-19 17:26:51 +00:00
Code Issues Releases Activity

Merge pull request #35 from CCC-MF/issue_33

Browse Source 
Deprecate usage of ...SSL_CA_LOCATION config param
This commit is contained in:
Paul-Christian Volkmer 2024-02-09 08:19:07 +01:00 committed by GitHub
commit d3a4500568
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java
View File

@ -1,7 +1,7 @@
/* /*
* This file is part of ETL-Processor * This file is part of ETL-Processor
* *
* Copyright (c) 2023 Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors * Copyright (c) 2024 Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published * it under the terms of the GNU Affero General Public License as published
@ -91,7 +91,7 @@ public class GpasPseudonymGenerator implements Generator {
try { try {
if (StringUtils.isNotBlank(gpasCfg.getSslCaLocation())) { if (StringUtils.isNotBlank(gpasCfg.getSslCaLocation())) {
customSslContext = getSslContext(gpasCfg.getSslCaLocation()); customSslContext = getSslContext(gpasCfg.getSslCaLocation());
log.debug(String.format("%s has been initialized with SSL certificate %s", log.warn(String.format("%s has been initialized with SSL certificate %s. This is deprecated in favor of including Root CA.",
this.getClass().getName(), gpasCfg.getSslCaLocation())); this.getClass().getName(), gpasCfg.getSslCaLocation()));
} }
} catch (IOException | KeyManagementException | KeyStoreException | CertificateException | } catch (IOException | KeyManagementException | KeyStoreException | CertificateException |

6
src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt
View File

@ -53,8 +53,10 @@ data class GPasConfigProperties(
val target: String = "etl-processor", val target: String = "etl-processor",
val username: String?, val username: String?,
val password: String?, val password: String?,
val sslCaLocation: String?, @get:DeprecatedConfigurationProperty(
reason = "Deprecated in favor of including Root CA"
)
val sslCaLocation: String?
) { ) {
companion object { companion object {
const val NAME = "app.pseudonymize.gpas" const val NAME = "app.pseudonymize.gpas"