GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 17:47:32 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Updates map tile fetcher to use TLSv1.2 when connecting to (#599)

Browse Source 
openstreetmap.  Java13 uses TLSv1.3 by default and that's not supported
by the tile server.
This commit is contained in:
Denny Sheirer
2019-11-22 09:21:28 -05:00
committed by GitHub
parent 8915797aac
commit 85df151a96
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java
View File

@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException; import javax.net.ssl.SSLException;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@@ -38,6 +39,9 @@ import java.lang.ref.SoftReference;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
@@ -54,8 +58,8 @@ import java.util.concurrent.ThreadFactory;
*/ */
public abstract class AbstractTileFactory extends TileFactory public abstract class AbstractTileFactory extends TileFactory
{ {
private final static Logger mLog = private final static Logger mLog = LoggerFactory.getLogger( AbstractTileFactory.class );
LoggerFactory.getLogger( AbstractTileFactory.class ); private boolean mSSLSuitesLogged = false;
/** /**
* Creates a new instance of DefaultTileFactory using the spcified TileFactoryInfo * Creates a new instance of DefaultTileFactory using the spcified TileFactoryInfo
@@ -382,7 +386,7 @@ public abstract class AbstractTileFactory extends TileFactory
} }
else else
{ {
mLog.error("SSL Exception: " + ssle.getMessage()); mLog.error("SSL Exception");
} }
} }
catch (Throwable e) catch (Throwable e)
@@ -408,6 +412,23 @@ public abstract class AbstractTileFactory extends TileFactory
{ {
HttpsURLConnection conn = (HttpsURLConnection)url.openConnection(); HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
conn.addRequestProperty("User-Agent", "sdrtrunk"); conn.addRequestProperty("User-Agent", "sdrtrunk");
try
{
//Java 13 uses TLSv1.3 by default and fails to connect to tile server, so force TLS 1.2
SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
sslContext.init(null, null, new SecureRandom());
conn.setSSLSocketFactory(sslContext.getSocketFactory());
}
catch(KeyManagementException kme)
{
mLog.error("Error initializing SSL context");
}
catch(NoSuchAlgorithmException nsae)
{
mLog.error("Unable to use TLSv1.2 for openstreetmap tiles");
}
InputStream is = conn.getInputStream(); InputStream is = conn.getInputStream();
ByteArrayOutputStream bout = new ByteArrayOutputStream(); ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -419,6 +440,9 @@ public abstract class AbstractTileFactory extends TileFactory
break; break;
bout.write(buf, 0, n); bout.write(buf, 0, n);
} }
conn.disconnect();
return bout.toByteArray(); return bout.toByteArray();
} }
else else