author | clanger |
Fri, 25 Jan 2019 10:59:07 +0000 | |
changeset 53503 | 1ffc0fa0e98b |
parent 51356 | 88d9be7f52c5 |
permissions | -rw-r--r-- |
50722
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
1 |
/* |
53503
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
2 |
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. |
50722
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
4 |
* |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
8 |
* |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
13 |
* accompanied this code). |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
14 |
* |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
18 |
* |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
21 |
* questions. |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
22 |
*/ |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
23 |
|
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
24 |
/* |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
25 |
* @test |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
26 |
* @library /test/lib |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
27 |
* @build jdk.test.lib.Utils |
53503
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
28 |
* @bug 8204233 |
50722
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
29 |
* @summary Add configurable option for enhanced socket IOException messages |
51236
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
30 |
* @run main/othervm |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
31 |
* ExceptionText |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
32 |
* WITHOUT_Enhanced_Text |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
33 |
* @run main/othervm |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
34 |
* -Djdk.includeInExceptions= |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
35 |
* ExceptionText |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
36 |
* WITHOUT_Enhanced_Text |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
37 |
* @run main/othervm |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
38 |
* -Djdk.includeInExceptions=somethingElse |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
39 |
* ExceptionText |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
40 |
* WITHOUT_Enhanced_Text |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
41 |
* @run main/othervm |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
42 |
* -Djdk.includeInExceptions=blah,blah,blah, |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
43 |
* ExceptionText |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
44 |
* WITHOUT_Enhanced_Text |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
45 |
* @run main/othervm |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
46 |
* -Djdk.includeInExceptions=hostInfo |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
47 |
* ExceptionText |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
48 |
* expectEnhancedText |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
49 |
* @run main/othervm |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
50 |
* -Djdk.includeInExceptions=foo,hostinfo,bar |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
51 |
* ExceptionText |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
52 |
* expectEnhancedText |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
53 |
* @run main/othervm |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
54 |
* -Djdk.includeInExceptions=",HOSTINFO," |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
55 |
* ExceptionText |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
56 |
* expectEnhancedText |
50722
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
57 |
*/ |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
58 |
|
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
59 |
import java.io.IOException; |
51236
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
60 |
import java.net.InetSocketAddress; |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
61 |
import java.net.Socket; |
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
62 |
import java.nio.channels.AsynchronousSocketChannel; |
50722
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
63 |
import java.nio.channels.ClosedChannelException; |
51236
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
64 |
import java.nio.channels.SocketChannel; |
50722
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
65 |
import java.util.concurrent.ExecutionException; |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
66 |
import jdk.test.lib.Utils; |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
67 |
|
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
68 |
public class ExceptionText { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
69 |
|
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
70 |
enum TestTarget {SOCKET, CHANNEL, ASYNC_CHANNEL}; |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
71 |
|
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
72 |
public static void main(String args[]) throws Exception { |
53503
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
73 |
String passOrFail = args[0]; |
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
74 |
boolean expectEnhancedText; |
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
75 |
if (passOrFail.equals("expectEnhancedText")) { |
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
76 |
expectEnhancedText = true; |
51236
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
77 |
} else { |
53503
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
78 |
expectEnhancedText = false; |
51236
a90d8198d7e4
8207846: Generalize the jdk.net.includeInExceptions security property
chegar
parents:
50722
diff
changeset
|
79 |
} |
53503
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
80 |
test(expectEnhancedText); |
50722
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
81 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
82 |
|
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
83 |
static final InetSocketAddress dest = Utils.refusingEndpoint(); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
84 |
static final String PORT = ":" + Integer.toString(dest.getPort()); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
85 |
static final String HOST = dest.getHostString(); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
86 |
|
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
87 |
static void test(boolean withProperty) { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
88 |
// Socket |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
89 |
IOException e = getException(TestTarget.SOCKET); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
90 |
checkResult(e, withProperty); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
91 |
// SocketChannel |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
92 |
e = getException(TestTarget.CHANNEL); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
93 |
checkResult(e, withProperty); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
94 |
// AsyncSocketChannel |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
95 |
e = getException(TestTarget.ASYNC_CHANNEL); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
96 |
checkResult(e, withProperty); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
97 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
98 |
|
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
99 |
static void checkResult(IOException e, boolean withProperty) { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
100 |
String msg = e.getMessage(); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
101 |
if (!withProperty) { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
102 |
if (msg.contains(HOST) || msg.contains(PORT)) { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
103 |
System.err.println("msg = " + msg); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
104 |
throw new RuntimeException("Test failed: exception contains address info"); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
105 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
106 |
} else { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
107 |
if (!msg.contains(HOST) || !msg.contains(PORT)) { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
108 |
if (e instanceof ClosedChannelException) |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
109 |
return; // has no detail msg |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
110 |
System.err.println("msg = " + msg); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
111 |
throw new RuntimeException("Test failed: exception does not contain address info"); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
112 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
113 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
114 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
115 |
|
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
116 |
static IOException getException(TestTarget target) { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
117 |
try { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
118 |
if (target == TestTarget.SOCKET) { |
53503
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
119 |
try (Socket s = new Socket()) { |
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
120 |
s.connect(dest); |
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
121 |
} |
50722
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
122 |
} else if (target == TestTarget.CHANNEL) { |
53503
1ffc0fa0e98b
8217657: Move the test for default value of jdk.includeInExceptions into own test
clanger
parents:
51356
diff
changeset
|
123 |
SocketChannel.open(dest); |
50722
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
124 |
} else if (target == TestTarget.ASYNC_CHANNEL) { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
125 |
AsynchronousSocketChannel c = AsynchronousSocketChannel.open(); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
126 |
try { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
127 |
c.connect(dest).get(); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
128 |
} catch (InterruptedException | ExecutionException ee) { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
129 |
if (ee.getCause() instanceof IOException) |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
130 |
throw (IOException)ee.getCause(); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
131 |
throw new RuntimeException(ee.getCause()); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
132 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
133 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
134 |
return null; |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
135 |
} catch (IOException e) { |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
136 |
e.printStackTrace(); |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
137 |
return e; |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
138 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
139 |
} |
bc104aaf24e9
8204233: Add configurable option for enhanced socket IOException messages
michaelm
parents:
diff
changeset
|
140 |
} |