rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

found a bug in java6, fixed removing a https protocol from the list

Browse Source 
see http://stackoverflow.com/questions/15589880/how-to-make-java-6-which-fails-ssl-connection-with-ssl-peer-shut-down-incorrec
This commit is contained in:
Federico Fissore 2013-06-05 18:09:07 +02:00
parent 306e079ef0
commit 137da0326d
2 changed files with 144 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/cc/arduino/packages/uploaders/HttpUploader.java
View File

@ -1,41 +1,35 @@
package cc.arduino.packages.uploaders; package cc.arduino.packages.uploaders;
import static processing.app.I18n._; import cc.arduino.packages.Uploader;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.regex.Matcher;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.protocol.Protocol;
import processing.app.Base; import processing.app.Base;
import processing.app.Constants; import processing.app.Constants;
import processing.app.Preferences; import processing.app.Preferences;
import processing.app.debug.EasySSLProtocolSocketFactory;
import processing.app.debug.RunnerException; import processing.app.debug.RunnerException;
import processing.app.debug.TargetPlatform; import processing.app.debug.TargetPlatform;
import processing.app.helpers.PreferencesMap; import processing.app.helpers.PreferencesMap;
import cc.arduino.packages.Uploader;
import java.io.*;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.regex.Matcher;
import static processing.app.I18n._;
public class HttpUploader extends Uploader { public class HttpUploader extends Uploader {
private static final String PROTOCOL = "http://"; private static final String PROTOCOL = "https://";
/*
static { static {
Protocol.registerProtocol("https", new Protocol("https", new EasySSLProtocolSocketFactory(), 443)); Protocol.registerProtocol("https", new Protocol("https", new EasySSLProtocolSocketFactory(), 443));
} }
*/
private final HttpClient client; private final HttpClient client;
private final String ipAddress; private final String ipAddress;

251
app/src/processing/app/debug/EasySSLProtocolSocketFactory.java
View File

@ -30,17 +30,6 @@
package processing.app.debug; package processing.app.debug;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.UnknownHostException;
import javax.net.SocketFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import org.apache.commons.httpclient.ConnectTimeoutException; import org.apache.commons.httpclient.ConnectTimeoutException;
import org.apache.commons.httpclient.HttpClientError; import org.apache.commons.httpclient.HttpClientError;
import org.apache.commons.httpclient.params.HttpConnectionParams; import org.apache.commons.httpclient.params.HttpConnectionParams;
@ -48,6 +37,13 @@ import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import javax.net.SocketFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManager;
import java.io.IOException;
import java.net.*;
/** /**
* <p> * <p>
* EasySSLProtocolSocketFactory can be used to creats SSL {@link Socket}s * EasySSLProtocolSocketFactory can be used to creats SSL {@link Socket}s
@ -59,10 +55,10 @@ import org.apache.commons.logging.LogFactory;
* you are perfectly aware of security implications of accepting * you are perfectly aware of security implications of accepting
* self-signed certificates * self-signed certificates
* </p> * </p>
* * <p/>
* <p> * <p>
* Example of using custom protocol socket factory for a specific host: * Example of using custom protocol socket factory for a specific host:
* <pre> * <pre>
* Protocol easyhttps = new Protocol("https", new EasySSLProtocolSocketFactory(), 443); * Protocol easyhttps = new Protocol("https", new EasySSLProtocolSocketFactory(), 443);
* *
* URI uri = new URI("https://localhost/", true); * URI uri = new URI("https://localhost/", true);
@ -76,7 +72,7 @@ import org.apache.commons.logging.LogFactory;
* </p> * </p>
* <p> * <p>
* Example of using custom protocol socket factory per default instead of the standard one: * Example of using custom protocol socket factory per default instead of the standard one:
* <pre> * <pre>
* Protocol easyhttps = new Protocol("https", new EasySSLProtocolSocketFactory(), 443); * Protocol easyhttps = new Protocol("https", new EasySSLProtocolSocketFactory(), 443);
* Protocol.registerProtocol("https", easyhttps); * Protocol.registerProtocol("https", easyhttps);
* *
@ -87,146 +83,151 @@ import org.apache.commons.logging.LogFactory;
* </p> * </p>
* *
* @author <a href="mailto:oleg -at- ural.ru">Oleg Kalnichevski</a> * @author <a href="mailto:oleg -at- ural.ru">Oleg Kalnichevski</a>
* * <p/>
* <p> * <p>
* DISCLAIMER: HttpClient developers DO NOT actively support this component. * DISCLAIMER: HttpClient developers DO NOT actively support this component.
* The component is provided as a reference material, which may be inappropriate * The component is provided as a reference material, which may be inappropriate
* for use without additional customization. * for use without additional customization.
* </p> * </p>
*/ */
public class EasySSLProtocolSocketFactory implements SecureProtocolSocketFactory { public class EasySSLProtocolSocketFactory implements SecureProtocolSocketFactory {
/** Log object for this class. */ /**
private static final Log LOG = LogFactory.getLog(EasySSLProtocolSocketFactory.class); * Log object for this class.
*/
private static final Log LOG = LogFactory.getLog(EasySSLProtocolSocketFactory.class);
private SSLContext sslcontext = null; private SSLContext sslcontext = null;
/** /**
* Constructor for EasySSLProtocolSocketFactory. * Constructor for EasySSLProtocolSocketFactory.
*/ */
public EasySSLProtocolSocketFactory() { public EasySSLProtocolSocketFactory() {
super(); super();
} }
private static SSLContext createEasySSLContext() { private static SSLContext createEasySSLContext() {
try { try {
SSLContext context = SSLContext.getInstance("SSL"); SSLContext context = SSLContext.getInstance("SSL");
context.init( context.init(
null, null,
new TrustManager[] {new EasyX509TrustManager(null)}, new TrustManager[]{new EasyX509TrustManager(null)},
null); null);
return context; return context;
} catch (Exception e) { } catch (Exception e) {
LOG.error(e.getMessage(), e); LOG.error(e.getMessage(), e);
throw new HttpClientError(e.toString()); throw new HttpClientError(e.toString());
}
} }
}
private SSLContext getSSLContext() { private SSLContext getSSLContext() {
if (this.sslcontext == null) { if (this.sslcontext == null) {
this.sslcontext = createEasySSLContext(); this.sslcontext = createEasySSLContext();
}
return this.sslcontext;
} }
return this.sslcontext;
}
/** /**
* @see SecureProtocolSocketFactory#createSocket(java.lang.String,int,java.net.InetAddress,int) * @see SecureProtocolSocketFactory#createSocket(java.lang.String, int, java.net.InetAddress, int)
*/ */
public Socket createSocket( public Socket createSocket(
String host, String host,
int port, int port,
InetAddress clientHost, InetAddress clientHost,
int clientPort) int clientPort)
throws IOException, UnknownHostException { throws IOException, UnknownHostException {
return getSSLContext().getSocketFactory().createSocket( Socket socket = getSSLContext().getSocketFactory().createSocket(
host, host,
port, port,
clientHost, clientHost,
clientPort clientPort
); );
} return socket;
}
/** /**
* Attempts to get a new socket connection to the given host within the given time limit. * Attempts to get a new socket connection to the given host within the given time limit.
* <p> * <p>
* To circumvent the limitations of older JREs that do not support connect timeout a * To circumvent the limitations of older JREs that do not support connect timeout a
* controller thread is executed. The controller thread attempts to create a new socket * controller thread is executed. The controller thread attempts to create a new socket
* within the given limit of time. If socket constructor does not return until the * within the given limit of time. If socket constructor does not return until the
* timeout expires, the controller terminates and throws an {@link ConnectTimeoutException} * timeout expires, the controller terminates and throws an {@link ConnectTimeoutException}
* </p> * </p>
* *
* @param host the host name/IP * @param host the host name/IP
* @param port the port on the host * @param port the port on the host
* @param clientHost the local host name/IP to bind the socket to * @param clientHost the local host name/IP to bind the socket to
* @param clientPort the port on the local machine * @param clientPort the port on the local machine
* @param params {@link HttpConnectionParams Http connection parameters} * @param params {@link HttpConnectionParams Http connection parameters}
* * @return Socket a new socket
* @return Socket a new socket * @throws IOException if an I/O error occurs while creating the socket
* * @throws UnknownHostException if the IP address of the host cannot be
* @throws IOException if an I/O error occurs while creating the socket * determined
* @throws UnknownHostException if the IP address of the host cannot be */
* determined public Socket createSocket(
*/ final String host,
public Socket createSocket( final int port,
final String host, final InetAddress localAddress,
final int port, final int localPort,
final InetAddress localAddress, final HttpConnectionParams params
final int localPort, ) throws IOException, UnknownHostException, ConnectTimeoutException {
final HttpConnectionParams params if (params == null) {
) throws IOException, UnknownHostException, ConnectTimeoutException { throw new IllegalArgumentException("Parameters may not be null");
if (params == null) {
throw new IllegalArgumentException("Parameters may not be null");
}
int timeout = params.getConnectionTimeout();
SocketFactory socketfactory = getSSLContext().getSocketFactory();
if (timeout == 0) {
return socketfactory.createSocket(host, port, localAddress, localPort);
} else {
Socket socket = socketfactory.createSocket();
SocketAddress localaddr = new InetSocketAddress(localAddress, localPort);
SocketAddress remoteaddr = new InetSocketAddress(host, port);
socket.bind(localaddr);
socket.connect(remoteaddr, timeout);
return socket;
}
} }
int timeout = params.getConnectionTimeout();
SocketFactory socketfactory = getSSLContext().getSocketFactory();
Socket socket;
if (timeout == 0) {
socket = socketfactory.createSocket(host, port, localAddress, localPort);
} else {
socket = socketfactory.createSocket();
SocketAddress localaddr = new InetSocketAddress(localAddress, localPort);
SocketAddress remoteaddr = new InetSocketAddress(host, port);
socket.bind(localaddr);
socket.connect(remoteaddr, timeout);
}
SSLSocket sslSocket = (SSLSocket) socket;
String[] protocolsWithoutSSLv2Hello = {"SSLv3", "TLSv1"};
sslSocket.setEnabledProtocols(protocolsWithoutSSLv2Hello);
return socket;
}
/** /**
* @see SecureProtocolSocketFactory#createSocket(java.lang.String,int) * @see SecureProtocolSocketFactory#createSocket(java.lang.String, int)
*/ */
public Socket createSocket(String host, int port) public Socket createSocket(String host, int port)
throws IOException, UnknownHostException { throws IOException, UnknownHostException {
return getSSLContext().getSocketFactory().createSocket( return getSSLContext().getSocketFactory().createSocket(
host, host,
port port
); );
} }
/** /**
* @see SecureProtocolSocketFactory#createSocket(java.net.Socket,java.lang.String,int,boolean) * @see SecureProtocolSocketFactory#createSocket(java.net.Socket, java.lang.String, int, boolean)
*/ */
public Socket createSocket( public Socket createSocket(
Socket socket, Socket socket,
String host, String host,
int port, int port,
boolean autoClose) boolean autoClose)
throws IOException, UnknownHostException { throws IOException, UnknownHostException {
return getSSLContext().getSocketFactory().createSocket( return getSSLContext().getSocketFactory().createSocket(
socket, socket,
host, host,
port, port,
autoClose autoClose
); );
} }
public boolean equals(Object obj) { public boolean equals(Object obj) {
return ((obj != null) && obj.getClass().equals(EasySSLProtocolSocketFactory.class)); return ((obj != null) && obj.getClass().equals(EasySSLProtocolSocketFactory.class));
} }
public int hashCode() { public int hashCode() {
return EasySSLProtocolSocketFactory.class.hashCode(); return EasySSLProtocolSocketFactory.class.hashCode();
} }
} }