From ce6b1ba4ad8d4063ad46aa105a63f7dc313e3c50 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Thu, 17 Dec 2020 09:31:38 -0500 Subject: [PATCH 1/3] Add ip link show to CI Maybe this will help debug the timeout failures. Signed-off-by: Alexander Scheel --- tools/Dockerfiles/centos_8 | 2 ++ tools/Dockerfiles/debian_jdk11 | 2 ++ tools/Dockerfiles/ubuntu_jdk8 | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tools/Dockerfiles/centos_8 b/tools/Dockerfiles/centos_8 index 2140a6537..e4c40d1ab 100644 --- a/tools/Dockerfiles/centos_8 +++ b/tools/Dockerfiles/centos_8 @@ -8,6 +8,8 @@ RUN true \ && dnf module enable -y pki-deps maven javapackages-tools \ && dnf build-dep -y jss \ && mkdir -p /home/sandbox \ + && dnf install -y net-tools \ + && ip link show \ && dnf clean -y all \ && rm -rf /usr/share/doc /usr/share/doc-base \ /usr/share/man /usr/share/locale /usr/share/zoneinfo \ diff --git a/tools/Dockerfiles/debian_jdk11 b/tools/Dockerfiles/debian_jdk11 index 175980006..54dc5763e 100644 --- a/tools/Dockerfiles/debian_jdk11 +++ b/tools/Dockerfiles/debian_jdk11 @@ -11,6 +11,8 @@ RUN true \ libcommons-lang3-java libjaxb-api-java cmake \ zip unzip junit4 \ && mkdir -p /home/sandbox \ + && apt-get install -y iproute2 \ + && ip link show \ && apt-get autoremove -y \ && apt-get clean -y \ && apt-get autoclean -y \ diff --git a/tools/Dockerfiles/ubuntu_jdk8 b/tools/Dockerfiles/ubuntu_jdk8 index 48cc37203..10b271a5f 100644 --- a/tools/Dockerfiles/ubuntu_jdk8 +++ b/tools/Dockerfiles/ubuntu_jdk8 @@ -11,6 +11,8 @@ RUN true \ libcommons-lang3-java libjaxb-api-java cmake \ zip unzip junit4 \ && mkdir -p /home/sandbox \ + && apt-get install -y iproute2 \ + && ip link show \ && apt-get autoremove -y \ && apt-get clean -y \ && apt-get autoclean -y \ From bdcd904050b81762182fd85718575094a93374ad Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Thu, 17 Dec 2020 09:35:34 -0500 Subject: [PATCH 2/3] Testing. Signed-off-by: Alexander Scheel --- org/mozilla/jss/tests/SSLClientAuth.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org/mozilla/jss/tests/SSLClientAuth.java b/org/mozilla/jss/tests/SSLClientAuth.java index bf270a634..acd19d674 100644 --- a/org/mozilla/jss/tests/SSLClientAuth.java +++ b/org/mozilla/jss/tests/SSLClientAuth.java @@ -193,7 +193,7 @@ private void generateCerts(CryptoManager cm, int serialNum) { // generate server cert kpg.initialize(keyLength); KeyPair serverPair = kpg.genKeyPair(); - Certificate serverCert = makeCert("CACert", "localhost", + Certificate serverCert = makeCert("CACert", "127.0.0.1", serialNum+1, caPair.getPrivate(), serverPair.getPublic(), serialNum, null); nssServerCert = cm.importCertPackage( @@ -329,7 +329,7 @@ private void testConnection() throws Exception { // connect to the server System.out.println("client about to connect"); - SSLSocket sock = new SSLSocket("localhost", port); + SSLSocket sock = new SSLSocket("127.0.0.1", port); if( useNickname ) { sock.setClientCertNickname(clientCertNick); System.out.println("Client specified cert by nickname"); From 155d223af51857c596db7be9f46cdae6e92f7b21 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Thu, 17 Dec 2020 10:06:05 -0500 Subject: [PATCH 3/3] ip link show -> ip addr show Maybe this'll be more useful Signed-off-by: Alexander Scheel --- tools/Dockerfiles/centos_8 | 2 +- tools/Dockerfiles/debian_jdk11 | 2 +- tools/Dockerfiles/ubuntu_jdk8 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Dockerfiles/centos_8 b/tools/Dockerfiles/centos_8 index e4c40d1ab..493bf0e04 100644 --- a/tools/Dockerfiles/centos_8 +++ b/tools/Dockerfiles/centos_8 @@ -9,7 +9,7 @@ RUN true \ && dnf build-dep -y jss \ && mkdir -p /home/sandbox \ && dnf install -y net-tools \ - && ip link show \ + && ip addr show \ && dnf clean -y all \ && rm -rf /usr/share/doc /usr/share/doc-base \ /usr/share/man /usr/share/locale /usr/share/zoneinfo \ diff --git a/tools/Dockerfiles/debian_jdk11 b/tools/Dockerfiles/debian_jdk11 index 54dc5763e..d65f91a30 100644 --- a/tools/Dockerfiles/debian_jdk11 +++ b/tools/Dockerfiles/debian_jdk11 @@ -12,7 +12,7 @@ RUN true \ zip unzip junit4 \ && mkdir -p /home/sandbox \ && apt-get install -y iproute2 \ - && ip link show \ + && ip addr show \ && apt-get autoremove -y \ && apt-get clean -y \ && apt-get autoclean -y \ diff --git a/tools/Dockerfiles/ubuntu_jdk8 b/tools/Dockerfiles/ubuntu_jdk8 index 10b271a5f..ca917194b 100644 --- a/tools/Dockerfiles/ubuntu_jdk8 +++ b/tools/Dockerfiles/ubuntu_jdk8 @@ -12,7 +12,7 @@ RUN true \ zip unzip junit4 \ && mkdir -p /home/sandbox \ && apt-get install -y iproute2 \ - && ip link show \ + && ip addr show \ && apt-get autoremove -y \ && apt-get clean -y \ && apt-get autoclean -y \