undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
|
|
@ -0,0 +1,228 @@
|
|||
/*
|
||||
* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 6771432
|
||||
* @summary createSocket() - smpatch fails using 1.6.0_10 because of
|
||||
* "Unconnected sockets not implemented"
|
||||
* @modules jdk.httpserver
|
||||
* @library /test/lib
|
||||
* @run main/othervm HttpsCreateSockTest
|
||||
* @run main/othervm -Djava.net.preferIPv6Addresses=true HttpsCreateSockTest
|
||||
*
|
||||
* SunJSSE does not support dynamic system properties, no way to re-use
|
||||
* system properties in samevm/agentvm mode.
|
||||
*/
|
||||
|
||||
import javax.net.SocketFactory;
|
||||
import javax.net.ssl.HostnameVerifier;
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
import javax.net.ssl.SSLContext;
|
||||
import javax.net.ssl.SSLSession;
|
||||
import javax.net.ssl.SSLSocketFactory;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.net.InetAddress;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.Proxy;
|
||||
import java.net.Socket;
|
||||
import java.net.URL;
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStreamWriter;
|
||||
import com.sun.net.httpserver.HttpExchange;
|
||||
import com.sun.net.httpserver.HttpHandler;
|
||||
import com.sun.net.httpserver.HttpsConfigurator;
|
||||
|
||||
import jdk.test.lib.net.URIBuilder;
|
||||
|
||||
/*
|
||||
* This class tests that the HTTPS protocol handler is using its socket factory for
|
||||
* creating new Sockets. It does this by wrapping the default SSLSocketFactory with
|
||||
* its own socket factory, SimpleSSLSocketFactory, and verifying that when a https
|
||||
* connection is made one of the socket factories createSocket methods, that
|
||||
* actually creates a Socket, is being invoked by the protocol handler.
|
||||
*/
|
||||
|
||||
public class HttpsCreateSockTest
|
||||
{
|
||||
/*
|
||||
* Where do we find the keystores?
|
||||
*/
|
||||
static String pathToStores = "../../../../../../javax/net/ssl/etc";
|
||||
static String keyStoreFile = "keystore";
|
||||
static String trustStoreFile = "truststore";
|
||||
static String passwd = "passphrase";
|
||||
|
||||
com.sun.net.httpserver.HttpsServer httpsServer;
|
||||
MyHandler httpHandler;
|
||||
|
||||
public static void main(String[] args) {
|
||||
String keyFilename =
|
||||
System.getProperty("test.src", "./") + "/" + pathToStores +
|
||||
"/" + keyStoreFile;
|
||||
String trustFilename =
|
||||
System.getProperty("test.src", "./") + "/" + pathToStores +
|
||||
"/" + trustStoreFile;
|
||||
|
||||
System.setProperty("javax.net.ssl.keyStore", keyFilename);
|
||||
System.setProperty("javax.net.ssl.keyStorePassword", passwd);
|
||||
System.setProperty("javax.net.ssl.trustStore", trustFilename);
|
||||
System.setProperty("javax.net.ssl.trustStorePassword", passwd);
|
||||
|
||||
new HttpsCreateSockTest();
|
||||
}
|
||||
|
||||
public HttpsCreateSockTest() {
|
||||
try {
|
||||
startHttpsServer();
|
||||
doClient();
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IOException ioe) {
|
||||
ioe.printStackTrace();
|
||||
} finally {
|
||||
httpsServer.stop(1);
|
||||
}
|
||||
}
|
||||
|
||||
void doClient() throws IOException {
|
||||
InetSocketAddress address = httpsServer.getAddress();
|
||||
|
||||
URL url = URIBuilder.newBuilder()
|
||||
.scheme("https")
|
||||
.host(address.getAddress())
|
||||
.port(address.getPort())
|
||||
.path("/")
|
||||
.toURLUnchecked();
|
||||
System.out.println("trying to connect to " + url + "...");
|
||||
|
||||
HttpsURLConnection uc = (HttpsURLConnection) url.openConnection(Proxy.NO_PROXY);
|
||||
uc.setHostnameVerifier(new AllHostnameVerifier());
|
||||
if (uc instanceof javax.net.ssl.HttpsURLConnection) {
|
||||
((javax.net.ssl.HttpsURLConnection) uc).setSSLSocketFactory(new SimpleSSLSocketFactory());
|
||||
System.out.println("Using TestSocketFactory");
|
||||
}
|
||||
uc.connect();
|
||||
System.out.println("CONNECTED " + uc);
|
||||
System.out.println(uc.getResponseMessage());
|
||||
uc.disconnect();
|
||||
}
|
||||
|
||||
/**
|
||||
* Https Server
|
||||
*/
|
||||
public void startHttpsServer() throws IOException, NoSuchAlgorithmException {
|
||||
InetAddress loopback = InetAddress.getLoopbackAddress();
|
||||
InetSocketAddress address = new InetSocketAddress(loopback, 0);
|
||||
httpsServer = com.sun.net.httpserver.HttpsServer.create(address, 0);
|
||||
httpsServer.createContext("/", new MyHandler());
|
||||
httpsServer.setHttpsConfigurator(new HttpsConfigurator(SSLContext.getDefault()));
|
||||
httpsServer.start();
|
||||
}
|
||||
|
||||
class MyHandler implements HttpHandler {
|
||||
private String message = "This is a message!";
|
||||
|
||||
@Override
|
||||
public void handle(HttpExchange t) throws IOException {
|
||||
t.sendResponseHeaders(200, message.length());
|
||||
BufferedWriter writer = new BufferedWriter( new OutputStreamWriter(t.getResponseBody(), "ISO8859-1"));
|
||||
writer.write(message, 0, message.length());
|
||||
writer.close();
|
||||
t.close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Simple wrapper on default SSLSocketFactory
|
||||
*/
|
||||
class SimpleSSLSocketFactory extends SSLSocketFactory
|
||||
{
|
||||
/*
|
||||
* true if this factory has been used to create a new Socket, i.e.
|
||||
* one of the SocketFactory methods has been called.
|
||||
*/
|
||||
boolean socketCreated = false;
|
||||
|
||||
/*
|
||||
* true if this factory has been used to wrap a Socket, i.e.
|
||||
* the SSLSocketFactory method,
|
||||
* createSocket(Socket, String, int, boolean), has been called.
|
||||
*/
|
||||
boolean socketWrapped = false;
|
||||
|
||||
@Override
|
||||
public Socket createSocket(InetAddress host, int port) throws IOException {
|
||||
socketCreated = true;
|
||||
return SocketFactory.getDefault().createSocket(host, port);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Socket createSocket(InetAddress address, int port, InetAddress localAddress,
|
||||
int localPort) throws IOException {
|
||||
socketCreated = true;
|
||||
return SocketFactory.getDefault().createSocket(address, port, localAddress, localPort);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Socket createSocket(String host, int port) throws IOException {
|
||||
socketCreated = true;
|
||||
return SocketFactory.getDefault().createSocket(host, port);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Socket createSocket(String host, int port, InetAddress localHost,
|
||||
int localPort) throws IOException {
|
||||
socketCreated = true;
|
||||
return SocketFactory.getDefault().createSocket(host, port, localHost, localPort);
|
||||
}
|
||||
|
||||
// methods from SSLSocketFactory
|
||||
@Override
|
||||
public Socket createSocket(Socket s, String host, int port,
|
||||
boolean autoClose) throws IOException {
|
||||
socketWrapped = true;
|
||||
return ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket
|
||||
(s, host, port, autoClose);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getDefaultCipherSuites() {
|
||||
return ((SSLSocketFactory) SSLSocketFactory.getDefault()).getDefaultCipherSuites();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getSupportedCipherSuites() {
|
||||
return ((SSLSocketFactory) SSLSocketFactory.getDefault()).getSupportedCipherSuites();
|
||||
}
|
||||
}
|
||||
|
||||
class AllHostnameVerifier implements HostnameVerifier
|
||||
{
|
||||
@Override
|
||||
public boolean verify(String hostname, SSLSession session) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue