stawros/http-mock-server
1
0
Fork 0
Code Releases Packages Activity

Change keystore type to JKS

Browse source 
Change-Id: I8cdb7a22d9bec61906b6a9acd409079cd6dd2dcf
This commit is contained in:
Piotr Fus 2018-01-30 11:09:21 +01:00
parent 0b7d0b52bc
commit 4d4d303d58
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy
View file

@ -27,6 +27,7 @@ import pl.touk.mockserver.client.MockDoesNotExist
import pl.touk.mockserver.client.RemoteMockServer import pl.touk.mockserver.client.RemoteMockServer
import pl.touk.mockserver.client.Util import pl.touk.mockserver.client.Util
import pl.touk.mockserver.server.HttpMockServer import pl.touk.mockserver.server.HttpMockServer
import spock.lang.AutoCleanup
import spock.lang.Shared import spock.lang.Shared
import spock.lang.Specification import spock.lang.Specification
@ -34,6 +35,7 @@ class MockServerIntegrationTest extends Specification {
RemoteMockServer remoteMockServer RemoteMockServer remoteMockServer
@AutoCleanup('stop')
HttpMockServer httpMockServer HttpMockServer httpMockServer
@Shared @Shared
@ -44,10 +46,6 @@ class MockServerIntegrationTest extends Specification {
remoteMockServer = new RemoteMockServer('localhost', 9000) remoteMockServer = new RemoteMockServer('localhost', 9000)
} }
def cleanup() {
httpMockServer.stop()
}
def "should add working rest mock on endpoint"() { def "should add working rest mock on endpoint"() {
expect: expect:
remoteMockServer.addMock(new AddMock( remoteMockServer.addMock(new AddMock(

4
mockserver/src/main/groovy/pl/touk/mockserver/server/HttpServerWrapper.groovy
View file

@ -54,7 +54,7 @@ class HttpServerWrapper {
} }
private KeyManager[] buildKeyManager(Https https) { private KeyManager[] buildKeyManager(Https https) {
KeyStore keyStore = KeyStore.getInstance(KeyStore.defaultType) KeyStore keyStore = KeyStore.getInstance('jks')
keyStore.load(new FileInputStream(https.keystorePath), https.keystorePassword.toCharArray()) keyStore.load(new FileInputStream(https.keystorePath), https.keystorePassword.toCharArray())
KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.defaultAlgorithm) KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.defaultAlgorithm)
kmf.init(keyStore, https.keyPassword.toCharArray()) kmf.init(keyStore, https.keyPassword.toCharArray())
@ -63,7 +63,7 @@ class HttpServerWrapper {
private TrustManager[] buildTrustManager(Https https) { private TrustManager[] buildTrustManager(Https https) {
if (https.requireClientAuth) { if (https.requireClientAuth) {
KeyStore trustStore = KeyStore.getInstance(KeyStore.defaultType) KeyStore trustStore = KeyStore.getInstance('jks')
trustStore.load(new FileInputStream(https.truststorePath), https.truststorePassword.toCharArray()) trustStore.load(new FileInputStream(https.truststorePath), https.truststorePassword.toCharArray())
TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.defaultAlgorithm) TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.defaultAlgorithm)
tmf.init(trustStore) tmf.init(trustStore)