From 9a29faf9cbba2faee8dc63a67a387123531e542f Mon Sep 17 00:00:00 2001
From: Gabriel Landais <glandais@kereval.com>
Date: Wed, 15 Feb 2012 10:31:46 +0000
Subject: [PATCH] Syslog test
git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@26339 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
---
.../java/net/ihe/gazelle/proxy/netty/App.java | 51 +++++++++---------
.../src/test/resources/keys/185.jks | Bin 0 -> 2839 bytes
.../src/test/resources/keys/186.jks | Bin 0 -> 2838 bytes
3 files changed, 24 insertions(+), 27 deletions(-)
create mode 100644 gazelle-proxy-netty/src/test/resources/keys/185.jks
create mode 100644 gazelle-proxy-netty/src/test/resources/keys/186.jks
diff --git a/gazelle-proxy-netty/src/test/java/net/ihe/gazelle/proxy/netty/App.java b/gazelle-proxy-netty/src/test/java/net/ihe/gazelle/proxy/netty/App.java
index 4eb227a8..2e2d0e3a 100644
--- a/gazelle-proxy-netty/src/test/java/net/ihe/gazelle/proxy/netty/App.java
+++ b/gazelle-proxy-netty/src/test/java/net/ihe/gazelle/proxy/netty/App.java
@@ -67,12 +67,14 @@ public class App {
}
private static void startSyslogProxyTLS() {
- // Syslog Client -TLS> Proxy1 -> Proxy Web app -> Proxy3 -TLS> Syslog
+ // Syslog Client 9443-TLS> Proxy1 10000-> Proxy Web app 8442-> Proxy3
+ // 8443-TLS> Syslog
// Server
// Starts a Syslog server (8443)
try {
- AuthSSLSocketFactory serverSocketFactory = getSyslogServerSocketFactory();
+ AuthSSLSocketFactory serverSocketFactory = new AuthSSLSocketFactory(getKeyStoreServer(),
+ getKeyStoreClient());
org.openhealthtools.openatna.syslog.mina.tls.TlsConfig serverConfig = new org.openhealthtools.openatna.syslog.mina.tls.TlsConfig();
serverConfig.setSSLContext(serverSocketFactory.getSSLContext());
serverConfig.setHost("localhost");
@@ -87,20 +89,20 @@ public class App {
RawEventListenerSimple listener = new RawEventListenerSimple(System.out);
- // Starts proxy3
- InputStream clientKeyStoreStream = listener.getClass().getResourceAsStream("/keys/clientKeyStore");
- TlsCredentials clientCredentials = new TlsCredentials(clientKeyStoreStream, "clientStorePass".toCharArray(),
- "myClientCert", "password".toCharArray());
+ // Starts proxy3 (provider not TLS - 8442, connects to a TLS server - 8443)
+ InputStream clientKeyStoreStream = listener.getClass().getResourceAsStream("/keys/185.jks");
+ TlsCredentials clientCredentials = new TlsCredentials(clientKeyStoreStream, "password".toCharArray(), "tomcat",
+ "password".toCharArray());
TlsConfig tlsConfigClient = new TlsConfig(null, true, clientCredentials);
ConnectionConfig connectionConfigClient = new ConnectionConfigSimpleTls(8442, "127.0.0.1", 8443,
ChannelType.SYSLOG, tlsConfigClient);
RawProxy proxy3 = new RawProxy(listener, connectionConfigClient);
proxy3.start();
- // Starts proxy2
- InputStream serverKeyStoreStream = listener.getClass().getResourceAsStream("/keys/serverKeyStore");
- TlsCredentials serverCredentials = new TlsCredentials(serverKeyStoreStream, "serverStorePass".toCharArray(),
- "myServerCert", "password".toCharArray());
+ // Starts proxy1 (provider TLS - 9443, connects to a not TLS server - 10000)
+ InputStream serverKeyStoreStream = listener.getClass().getResourceAsStream("/keys/186.jks");
+ TlsCredentials serverCredentials = new TlsCredentials(serverKeyStoreStream, "password".toCharArray(), "tomcat",
+ "password".toCharArray());
TlsConfig tlsConfigServer = new TlsConfig(serverCredentials, false, null);
ConnectionConfig connectionConfigServer = new ConnectionConfigSimpleTls(9443, "127.0.0.1", 10000,
ChannelType.SYSLOG, tlsConfigServer);
@@ -109,8 +111,8 @@ public class App {
// Ping!
try {
- AuthSSLSocketFactory clientSocketFactory = getSyslogClientSocketFactory();
-
+ AuthSSLSocketFactory clientSocketFactory = new AuthSSLSocketFactory(getKeyStoreClient(),
+ getKeyStoreServer());
ProtocolMessage sl = new ProtocolMessage(10, 5, "2009-08-14T14:12:23.115Z", "localhost",
new StringLogMessage("<atna></atna>"), "IHE_XDS", "ATNALOG", "1234");
List<SdParam> params = new ArrayList<SdParam>();
@@ -121,7 +123,8 @@ public class App {
StructuredElement se = new StructuredElement("exampleSDID@1234", params);
sl.addStructuredElement(se);
- Socket s = clientSocketFactory.createSecureSocket("localhost", 9443);
+// Socket s = clientSocketFactory.createSecureSocket("localhost", 8443);
+ Socket s = clientSocketFactory.createSecureSocket("jumbo.irisa.fr", 6514);
OutputStream out = s.getOutputStream();
byte[] bytes = sl.toByteArray();
for (int i = 0; i < 5; i++) {
@@ -140,22 +143,16 @@ public class App {
}
- private static AuthSSLSocketFactory getSyslogServerSocketFactory() throws IOException {
- URL u = Thread.currentThread().getContextClassLoader().getResource("keys/serverKeyStore");
- KeystoreDetails key = new KeystoreDetails(u.toString(), "serverStorePass", "myServerCert", "password");
- URL uu = Thread.currentThread().getContextClassLoader().getResource("keys/clientKeyStore");
- KeystoreDetails trust = new KeystoreDetails(uu.toString(), "clientStorePass", "myClientCert");
- AuthSSLSocketFactory f = new AuthSSLSocketFactory(key, trust);
- return f;
+ private static KeystoreDetails getKeyStoreServer() {
+ URL u = Thread.currentThread().getContextClassLoader().getResource("keys/186.jks");
+ KeystoreDetails key = new KeystoreDetails(u.toString(), "password", "tomcat", "password");
+ return key;
}
- private static AuthSSLSocketFactory getSyslogClientSocketFactory() throws IOException {
- URL u = Thread.currentThread().getContextClassLoader().getResource("keys/serverKeyStore");
- KeystoreDetails trust = new KeystoreDetails(u.toString(), "serverStorePass", "myServerCert");
- URL uu = Thread.currentThread().getContextClassLoader().getResource("keys/clientKeyStore");
- KeystoreDetails key = new KeystoreDetails(uu.toString(), "clientStorePass", "myClientCert", "password");
- AuthSSLSocketFactory f = new AuthSSLSocketFactory(key, trust);
- return f;
+ private static KeystoreDetails getKeyStoreClient() {
+ URL uu = Thread.currentThread().getContextClassLoader().getResource("keys/185.jks");
+ KeystoreDetails key = new KeystoreDetails(uu.toString(), "password", "tomcat", "password");
+ return key;
}
private static void startDicomProxyTLS(int port) {
diff --git a/gazelle-proxy-netty/src/test/resources/keys/185.jks b/gazelle-proxy-netty/src/test/resources/keys/185.jks
new file mode 100644
index 0000000000000000000000000000000000000000..482f714e2f0ca03b9d1e1d0f14ee15c1cedfbce2
GIT binary patch
literal 2839
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
literal 0
HcmV?d00001
diff --git a/gazelle-proxy-netty/src/test/resources/keys/186.jks b/gazelle-proxy-netty/src/test/resources/keys/186.jks
new file mode 100644
index 0000000000000000000000000000000000000000..bc00bf5439435e176e95b2298d23ddbc89410f07
GIT binary patch
literal 2838
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
literal 0
HcmV?d00001
--
GitLab