Skip to content

Commit 2e8280a

Browse files
committed
Fix SSL-testing bug
Client SSLContext options for testing didn't include ALPN config
1 parent c96f8f1 commit 2e8280a

File tree

1 file changed

+23
-9
lines changed

1 file changed

+23
-9
lines changed

test/aleph/ssl.clj

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
(ns aleph.ssl
22
(:require
3-
[aleph.netty :as netty])
3+
[aleph.netty :as netty])
44
(:import
5-
(java.io ByteArrayInputStream)
6-
(java.security KeyFactory PrivateKey)
7-
(java.security.cert CertificateFactory X509Certificate)
8-
(java.security.spec RSAPrivateCrtKeySpec)
9-
(org.apache.commons.codec.binary Base64)))
5+
(io.netty.handler.ssl
6+
ApplicationProtocolConfig
7+
ApplicationProtocolConfig$Protocol
8+
ApplicationProtocolConfig$SelectedListenerFailureBehavior
9+
ApplicationProtocolConfig$SelectorFailureBehavior
10+
ApplicationProtocolNames)
11+
(java.io ByteArrayInputStream)
12+
(java.security KeyFactory PrivateKey)
13+
(java.security.cert CertificateFactory X509Certificate)
14+
(java.security.spec RSAPrivateCrtKeySpec)
15+
(org.apache.commons.codec.binary Base64)))
1016

1117
(set! *warn-on-reflection* false)
1218

@@ -55,9 +61,17 @@
5561
(netty/ssl-server-context server-ssl-context-opts))
5662

5763
(def client-ssl-context-opts
58-
{:private-key client-key
59-
:certificate-chain [client-cert]
60-
:trust-store [ca-cert]})
64+
{:private-key client-key
65+
:certificate-chain [client-cert]
66+
:trust-store [ca-cert]
67+
:application-protocol-config (ApplicationProtocolConfig.
68+
ApplicationProtocolConfig$Protocol/ALPN
69+
;; NO_ADVERTISE is currently the only mode supported by both OpenSsl and JDK providers.
70+
ApplicationProtocolConfig$SelectorFailureBehavior/NO_ADVERTISE
71+
;; ACCEPT is currently the only mode supported by both OpenSsl and JDK providers.
72+
ApplicationProtocolConfig$SelectedListenerFailureBehavior/ACCEPT
73+
^"[Ljava.lang.String;"
74+
(into-array String [ApplicationProtocolNames/HTTP_1_1 ApplicationProtocolNames/HTTP_2]))})
6175

6276
(def client-ssl-context
6377
(netty/ssl-client-context client-ssl-context-opts))

0 commit comments

Comments
 (0)