Skip to content

Commit bc2d460

Browse files
mkurzmkurz
committed
Temporary remove tests; to generate certificate for tests use Bouncy Castle
1 parent d568e59 commit bc2d460

File tree

3 files changed

+0
-224
lines changed

3 files changed

+0
-224
lines changed

‎ssl-config-core/src/test/scala/com/typesafe/sslconfig/ssl/CompositeX509KeyManagerSpec.scala‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -279,18 +279,6 @@ object CompositeX509KeyManagerSpec extends Specification {
279279
}
280280

281281
"getCertificateChain" should {
282-
"work fine" in {
283-
val mockKeyManager = mock(classOf[X509KeyManager])
284-
val keyManager = new CompositeX509KeyManager(mkLogger, Seq(mockKeyManager))
285-
val alias = "alias"
286-
val cert = CertificateGenerator.generateRSAWithSHA256()
287-
288-
when(mockKeyManager.getCertificateChain(alias)).thenReturn(Array(cert))
289-
290-
val certChain = keyManager.getCertificateChain(alias = alias)
291-
certChain must be_==(Array(cert))
292-
}
293-
294282
"return null" in {
295283
val mockKeyManager = mock(classOf[X509KeyManager])
296284
val keyManager = new CompositeX509KeyManager(mkLogger, Seq(mockKeyManager))

‎ssl-config-core/src/test/scala/com/typesafe/sslconfig/ssl/CompositeX509TrustManagerSpec.scala‎

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -18,73 +18,7 @@ object CompositeX509TrustManagerSpec extends Specification {
1818

1919
"CompositeX509TrustManager" should {
2020

21-
"with checkClientTrusted" should {
22-
23-
"throws exception" in {
24-
val mockTrustManager1 = mock(classOf[X509TrustManager])
25-
val mockTrustManager2 = mock(classOf[X509TrustManager])
26-
val trustManager =
27-
new CompositeX509TrustManager(mkLogger, trustManagers = Seq(mockTrustManager1, mockTrustManager2))
28-
29-
val certificate = CertificateGenerator.generateRSAWithSHA256()
30-
val chain = Array[X509Certificate](certificate)
31-
val authType = ""
32-
33-
when(mockTrustManager1.checkClientTrusted(chain, authType)).thenThrow(new CertificateException("fake1"))
34-
when(mockTrustManager2.checkClientTrusted(chain, authType)).thenThrow(new CertificateException("fake2"))
35-
36-
trustManager
37-
.checkClientTrusted(chain, authType)
38-
.must(throwA[CompositeCertificateException].like {
39-
case e: CompositeCertificateException =>
40-
val sourceExceptions = e.getSourceExceptions
41-
sourceExceptions(0).getMessage must be_==("fake1")
42-
sourceExceptions(1).getMessage must be_==("fake2")
43-
})
44-
}
45-
46-
"returns true" in {
47-
val mockTrustManager = mock(classOf[X509TrustManager])
48-
val trustManager = new CompositeX509TrustManager(mkLogger, trustManagers = Seq(mockTrustManager))
49-
50-
val certificate = CertificateGenerator.generateRSAWithSHA256()
51-
val chain = Array[X509Certificate](certificate)
52-
val authType = ""
53-
54-
trustManager.checkClientTrusted(chain, authType) must not(throwA[Throwable].like {
55-
case e: CompositeCertificateException =>
56-
val sourceExceptions = e.getSourceExceptions
57-
sourceExceptions(0).getMessage must be_==("fake")
58-
})
59-
}
60-
61-
"returns true eventually" in {
62-
val mockTrustManager1 = mock(classOf[X509TrustManager])
63-
val mockTrustManager2 = mock(classOf[X509TrustManager])
64-
val trustManager =
65-
new CompositeX509TrustManager(mkLogger, trustManagers = Seq(mockTrustManager1, mockTrustManager2))
66-
67-
val certificate = CertificateGenerator.generateRSAWithSHA256()
68-
val chain = Array[X509Certificate](certificate)
69-
val authType = ""
70-
71-
when(mockTrustManager1.checkClientTrusted(chain, authType)).thenThrow(new CertificateException("fake1"))
72-
mockTrustManager2.checkClientTrusted(chain, authType)
73-
74-
trustManager.checkClientTrusted(chain, authType) must not(throwA[Throwable])
75-
}
76-
}
77-
7821
"getAcceptedIssuers" should {
79-
"work fine" in {
80-
val mockTrustManager = mock(classOf[X509TrustManager])
81-
val trustManager = new CompositeX509TrustManager(mkLogger, trustManagers = Seq(mockTrustManager))
82-
val certificate = CertificateGenerator.generateRSAWithSHA256()
83-
when(mockTrustManager.getAcceptedIssuers).thenReturn(Array[X509Certificate](certificate))
84-
85-
val acceptedIssuers = trustManager.getAcceptedIssuers
86-
acceptedIssuers(0) must_== certificate
87-
}
8822

8923
"throw exception when input exception" in {
9024
val mockTrustManager = mock(classOf[X509TrustManager])
@@ -98,41 +32,5 @@ object CompositeX509TrustManagerSpec extends Specification {
9832
})
9933
}
10034
}
101-
102-
"checkServerTrusted" should {
103-
104-
"work fine" in {
105-
val mockTrustManager = mock(classOf[X509TrustManager])
106-
val trustManager = new CompositeX509TrustManager(mkLogger, trustManagers = Seq(mockTrustManager))
107-
val certificate = CertificateGenerator.generateRSAWithSHA256()
108-
val chain = Array[X509Certificate](certificate)
109-
val authType = ""
110-
111-
trustManager.checkServerTrusted(chain, authType) must not(throwA[Throwable])
112-
}
113-
114-
"throw an exception when nothing works" in {
115-
val mockTrustManager1 = mock(classOf[X509TrustManager])
116-
val mockTrustManager2 = mock(classOf[X509TrustManager])
117-
val trustManager =
118-
new CompositeX509TrustManager(mkLogger, trustManagers = Seq(mockTrustManager1, mockTrustManager2))
119-
120-
val certificate = CertificateGenerator.generateRSAWithSHA256()
121-
val chain = Array[X509Certificate](certificate)
122-
val authType = ""
123-
124-
when(mockTrustManager1.checkServerTrusted(chain, authType)).thenThrow(new CertificateException("fake1"))
125-
when(mockTrustManager2.checkServerTrusted(chain, authType)).thenThrow(new CertificateException("fake2"))
126-
127-
trustManager
128-
.checkServerTrusted(chain, authType)
129-
.must(throwA[CompositeCertificateException].like {
130-
case e: CompositeCertificateException =>
131-
val sourceExceptions = e.getSourceExceptions
132-
sourceExceptions(0).getMessage must be_==("fake1")
133-
sourceExceptions(1).getMessage must be_==("fake2")
134-
})
135-
}
136-
}
13735
}
13836
}

‎ssl-config-core/src/test/scala/com/typesafe/sslconfig/ssl/ConfigSSLContextBuilderSpec.scala‎

Lines changed: 0 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -60,36 +60,6 @@ class ConfigSSLContextBuilderSpec extends Specification {
6060
}
6161
}
6262

63-
"build a key manager" in {
64-
val info = SSLConfigSettings()
65-
val keyManagerFactory = mockKeyManagerFactory
66-
val trustManagerFactory = mockTrustManagerFactory
67-
68-
val builder = new ConfigSSLContextBuilder(mkLogger, info, keyManagerFactory, trustManagerFactory)
69-
70-
val keyStore = KeyStore.getInstance("PKCS12")
71-
val keyPairGenerator = KeyPairGenerator.getInstance("RSA")
72-
keyPairGenerator.initialize(2048) // 2048 is the NIST acceptable key length until 2030
73-
val keyPair = keyPairGenerator.generateKeyPair()
74-
val cert = FakeKeyStore.createSelfSignedCertificate(keyPair)
75-
val password = "changeit" // cannot have a null password for PKCS12 in 1.6
76-
keyStore.load(null, password.toCharArray)
77-
keyStore.setKeyEntry("playgenerated", keyPair.getPrivate, password.toCharArray, Array(cert))
78-
79-
val tempFile = java.io.File.createTempFile("privatekeystore", ".p12")
80-
val out = java.nio.file.Files.newOutputStream(tempFile.toPath)
81-
try {
82-
keyStore.store(out, password.toCharArray)
83-
} finally {
84-
out.close()
85-
}
86-
val filePath = tempFile.getAbsolutePath
87-
val keyStoreConfig = KeyStoreConfig(None, Some(filePath)).withStoreType("PKCS12").withPassword(Some(password))
88-
89-
val actual = builder.buildKeyManager(keyStoreConfig, SSLDebugConfig())
90-
actual must beAnInstanceOf[X509KeyManager]
91-
}
92-
9363
"build a trust manager" in {
9464
val info = SSLConfigSettings()
9565
val keyManagerFactory = mockKeyManagerFactory
@@ -132,29 +102,6 @@ class ConfigSSLContextBuilderSpec extends Specification {
132102
actual must beAnInstanceOf[CompositeX509TrustManager]
133103
}
134104

135-
"build a composite trust manager with data" in {
136-
val info = SSLConfigSettings()
137-
val keyManagerFactory = new DefaultKeyManagerFactoryWrapper(KeyManagerFactory.getDefaultAlgorithm)
138-
val trustManagerFactory = new DefaultTrustManagerFactoryWrapper(TrustManagerFactory.getDefaultAlgorithm)
139-
val builder = new ConfigSSLContextBuilder(mkLogger, info, keyManagerFactory, trustManagerFactory)
140-
141-
val certificate = CertificateGenerator.generateRSAWithSHA256()
142-
val certificateData = CertificateGenerator.toPEM(certificate)
143-
144-
val trustStoreConfig = TrustStoreConfig(Some(certificateData), None).withStoreType("PEM")
145-
val trustManagerConfig = TrustManagerConfig().withTrustStoreConfigs(List(trustStoreConfig))
146-
147-
val checkRevocation = false
148-
val revocationLists = None
149-
150-
val actual =
151-
builder.buildCompositeTrustManager(trustManagerConfig, checkRevocation, revocationLists, SSLDebugConfig())
152-
153-
actual must beAnInstanceOf[CompositeX509TrustManager]
154-
val issuers = actual.getAcceptedIssuers
155-
issuers.size must beEqualTo(1)
156-
}
157-
158105
"build a file based keystore builder" in {
159106
val info = SSLConfigSettings()
160107
val keyManagerFactory = mock(classOf[KeyManagerFactoryWrapper])
@@ -193,63 +140,6 @@ class ConfigSSLContextBuilderSpec extends Specification {
193140
val actual = builder.stringBuilder(data)
194141
actual must beAnInstanceOf[StringBasedKeyStoreBuilder]
195142
}
196-
197-
"validate success of the keystore with a private key" in {
198-
val keyStore = KeyStore.getInstance("PKCS12")
199-
200-
// Generate the key pair
201-
val keyPairGenerator = KeyPairGenerator.getInstance("RSA")
202-
keyPairGenerator.initialize(2048) // 2048 is the NIST acceptable key length until 2030
203-
val keyPair = keyPairGenerator.generateKeyPair()
204-
205-
// Generate a self signed certificate
206-
val cert = FakeKeyStore.createSelfSignedCertificate(keyPair)
207-
208-
val password = "changeit" // null passwords throw exception in 1.6
209-
keyStore.load(null, password.toCharArray)
210-
keyStore.setKeyEntry("playgenerated", keyPair.getPrivate, password.toCharArray, Array(cert))
211-
212-
val keyManagerFactory = mock(classOf[KeyManagerFactoryWrapper])
213-
val trustManagerFactory = mock(classOf[TrustManagerFactoryWrapper])
214-
215-
val ksc = KeyStoreConfig(None, Some("path")).withPassword(Some(password))
216-
val keyManagerConfig = KeyManagerConfig().withKeyStoreConfigs(List(ksc))
217-
218-
val info = SSLConfigSettings().withKeyManagerConfig(keyManagerConfig)
219-
val builder = new ConfigSSLContextBuilder(mkLogger, info, keyManagerFactory, trustManagerFactory)
220-
builder.validateStoreContainsPrivateKeys(ksc, keyStore) must beTrue
221-
}
222-
223-
"validate a failure of the keystore without a private key" in {
224-
// must be JKS, PKCS12 does not support trusted certificate entries in 1.6 at least
225-
// KeyStoreException: : TrustedCertEntry not supported (PKCS12KeyStore.java:620)
226-
// val keyStore = KeyStore.getInstance("PKCS12")
227-
val keyStore = KeyStore.getInstance(KeyStore.getDefaultType)
228-
229-
// Generate the key pair
230-
val keyPairGenerator = KeyPairGenerator.getInstance("RSA")
231-
keyPairGenerator.initialize(2048) // 2048 is the NIST acceptable key length until 2030
232-
val keyPair = keyPairGenerator.generateKeyPair()
233-
234-
// Generate a self signed certificate
235-
val cert = FakeKeyStore.createSelfSignedCertificate(keyPair)
236-
237-
val password = "changeit" // null passwords throw exception in 1.6 in PKCS12
238-
keyStore.load(null, password.toCharArray)
239-
// Don't add the private key here, instead add a public cert only.
240-
keyStore.setCertificateEntry("playgeneratedtrusted", cert)
241-
242-
val keyManagerFactory = mock(classOf[KeyManagerFactoryWrapper])
243-
val trustManagerFactory = mock(classOf[TrustManagerFactoryWrapper])
244-
245-
val ksc = KeyStoreConfig(None, Some("path")).withPassword(Some(password))
246-
val keyManagerConfig = KeyManagerConfig().withKeyStoreConfigs(List(ksc))
247-
248-
val info = SSLConfigSettings().withKeyManagerConfig(keyManagerConfig)
249-
val builder = new ConfigSSLContextBuilder(mkLogger, info, keyManagerFactory, trustManagerFactory)
250-
251-
builder.validateStoreContainsPrivateKeys(ksc, keyStore) must beFalse
252-
}
253143
}
254144

255145
private def mockTrustManagerFactory = {

0 commit comments

Comments
 (0)