Skip to content

Commit c91c761

Browse files
author
Greg Meyer
authored
Merge pull request #5 from DirectProjectJavaRI/develop
Releasing config-ui 6.0.1
2 parents 533f4e9 + 03f0f64 commit c91c761

3 files changed

Lines changed: 96 additions & 11 deletions

File tree

‎manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ applications:
33
- name: direct-config-ui
44
instances: 1
55
buildpack: java_buildpack
6-
path: target/config-ui-6.0-SNAPSHOT.war
6+
path: target/config-ui-6.0.1-SNAPSHOT.war
77
env:
88
spring.cloud.config.label: master
99
services:

‎pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>org.nhind</groupId>
55
<artifactId>config-ui</artifactId>
66
<packaging>war</packaging>
7-
<version>6.0</version>
7+
<version>6.0.1</version>
88
<name>NHIN Direct Java Configuration UI</name>
99
<description>NHIN Direct Java Configuration UI</description>
1010
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/config/config-ui/${project.version}</url>
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.springframework.boot</groupId>
1717
<artifactId>spring-boot-starter-parent</artifactId>
18-
<version>2.1.2.RELEASE</version>
18+
<version>2.1.3.RELEASE</version>
1919
<relativePath />
2020
</parent>
2121
<developers>
@@ -59,21 +59,21 @@
5959
<dependency>
6060
<groupId>org.springframework.boot</groupId>
6161
<artifactId>spring-boot-dependencies</artifactId>
62-
<version>2.1.2.RELEASE</version>
62+
<version>2.1.3.RELEASE</version>
6363
<type>pom</type>
6464
<scope>import</scope>
6565
</dependency>
6666
<dependency>
6767
<groupId>io.pivotal.spring.cloud</groupId>
6868
<artifactId>spring-cloud-services-dependencies</artifactId>
69-
<version>2.0.3.RELEASE</version>
69+
<version>2.1.1.RELEASE</version>
7070
<type>pom</type>
7171
<scope>import</scope>
7272
</dependency>
7373
<dependency>
7474
<groupId>org.springframework.cloud</groupId>
7575
<artifactId>spring-cloud-starter-parent</artifactId>
76-
<version>Greenwich.RELEASE</version>
76+
<version>Greenwich.SR1</version>
7777
<type>pom</type>
7878
<scope>import</scope>
7979
</dependency>
@@ -168,7 +168,7 @@
168168
<dependency>
169169
<groupId>${project.groupId}</groupId>
170170
<artifactId>direct-common</artifactId>
171-
<version>6.0</version>
171+
<version>6.0.1-SNAPSHOT</version>
172172
</dependency>
173173
<dependency>
174174
<groupId>${project.groupId}</groupId>
@@ -184,17 +184,17 @@
184184
<dependency>
185185
<groupId>${project.groupId}</groupId>
186186
<artifactId>config-service-client</artifactId>
187-
<version>6.0</version>
187+
<version>6.0.1-SNAPSHOT</version>
188188
</dependency>
189189
<dependency>
190190
<groupId>${project.groupId}</groupId>
191191
<artifactId>config-store</artifactId>
192-
<version>6.0</version>
192+
<version>6.0.1-SNAPSHOT</version>
193193
</dependency>
194194
<dependency>
195195
<groupId>${project.groupId}</groupId>
196196
<artifactId>config-service-jar</artifactId>
197-
<version>6.0</version>
197+
<version>6.0.2-SNAPSHOT</version>
198198
<scope>test</scope>
199199
</dependency>
200200
<dependency>
@@ -231,7 +231,7 @@
231231
<plugin>
232232
<groupId>org.apache.maven.plugins</groupId>
233233
<artifactId>maven-javadoc-plugin</artifactId>
234-
<version>2.6.1</version>
234+
<version>2.9.1</version>
235235
<configuration>
236236
<additionalparam>-Xdoclint:none</additionalparam>
237237
<charset>UTF-8</charset>

‎src/main/java/org/nhindirect/config/spring/config/KeyStoreConfig.java‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
package org.nhindirect.config.spring.config;
2+
3+
import org.nhindirect.common.crypto.KeyStoreProtectionManager;
4+
import org.nhindirect.common.crypto.impl.BootstrappedKeyStoreProtectionManager;
5+
import org.nhindirect.common.crypto.impl.BootstrappedPKCS11Credential;
6+
import org.nhindirect.common.crypto.impl.StaticCachedPKCS11TokenKeyStoreProtectionManager;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
9+
import org.springframework.beans.factory.annotation.Value;
10+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
11+
import org.springframework.context.annotation.Bean;
12+
import org.springframework.context.annotation.Configuration;
13+
14+
@Configuration
15+
public class KeyStoreConfig
16+
{
17+
private static final Logger LOGGER = LoggerFactory.getLogger(KeyStoreConfig.class);
18+
19+
@Value("${direct.config.keystore.keyStorePin:som3randomp!n}")
20+
private String keyStorePin;
21+
22+
@Value("${direct.config.keystore.keyStoreType:Luna}")
23+
private String keyStoreType;
24+
25+
@Value("${direct.config.keystore.keyStoreSourceAsString:slot:0}")
26+
private String keyStoreSourceAsString;
27+
28+
@Value("${direct.config.keystore.keyStoreProviderName:com.safenetinc.luna.provider.LunaProvider}")
29+
private String keyStoreProviderName;
30+
31+
@Value("${direct.config.keystore.keyStorePassPhraseAlias:keyStorePassPhrase}")
32+
private String keyStorePassPhraseAlias;
33+
34+
@Value("${direct.config.keystore.privateKeyPassPhraseAlias:privateKeyPassPhrase}")
35+
private String privateKeyPassPhraseAlias;
36+
37+
@Value("${direct.config.keystore.initOnStart:true}")
38+
private String initOnStart;
39+
40+
@Value("${direct.config.keystore.keyStorePassPhrase:H1TBr0s!}")
41+
private String keyStorePassPhrase;
42+
43+
@Value("${direct.config.keystore.privateKeyPassPhrase:H1TCh1ckS!}")
44+
private String privateKeyPassPhrase;
45+
46+
@Bean
47+
@ConditionalOnProperty(name="direct.config.keystore.hsmpresent", havingValue="true")
48+
public KeyStoreProtectionManager hsmKeyStoreProtectionManager()
49+
{
50+
LOGGER.info("HSM configured. Attempting to connect to device.");
51+
52+
try
53+
{
54+
final BootstrappedPKCS11Credential cred = new BootstrappedPKCS11Credential(keyStorePin);
55+
final StaticCachedPKCS11TokenKeyStoreProtectionManager mgr = new StaticCachedPKCS11TokenKeyStoreProtectionManager();
56+
mgr.setCredential(cred);
57+
mgr.setKeyStoreType(keyStoreType);
58+
mgr.setKeyStoreSourceAsString(keyStoreSourceAsString);
59+
mgr.setKeyStoreProviderName(keyStoreProviderName);
60+
mgr.setKeyStorePassPhraseAlias(keyStorePassPhraseAlias);
61+
mgr.setPrivateKeyPassPhraseAlias(privateKeyPassPhraseAlias);
62+
63+
if (Boolean.parseBoolean(initOnStart))
64+
mgr.initTokenStore();
65+
66+
return mgr;
67+
}
68+
catch (Exception e)
69+
{
70+
throw new RuntimeException(e);
71+
}
72+
}
73+
74+
@Bean
75+
@ConditionalOnProperty(name="direct.config.keystore.hsmpresent", havingValue="false", matchIfMissing=true)
76+
public KeyStoreProtectionManager nonHSMKeyStoreProtectionManager()
77+
{
78+
LOGGER.info("No HSM configured.");
79+
80+
final BootstrappedKeyStoreProtectionManager mgr = new BootstrappedKeyStoreProtectionManager(keyStorePassPhrase, privateKeyPassPhrase);
81+
82+
return mgr;
83+
}
84+
85+
}

0 commit comments

Comments
 (0)