mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-06-16 10:09:55 +00:00
Code Issues Releases Wiki Activity

Added version check to certificate addition

Browse Source
This commit is contained in:
JackMacWindows 2023-03-02 18:30:54 -05:00 committed by GitHub
parent e1dffaa334
commit e4dd4dbef0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java
View File

@ -26,6 +26,7 @@
import javax.annotation.Nonnull;
import javax.net.ssl.*;
import java.io.ByteArrayInputStream;
import java.lang.System;
import java.net.InetSocketAddress;
import java.net.URI;
import java.security.KeyStore;
@ -115,28 +116,36 @@ private static TrustManagerFactory getTrustManager()
TrustManagerFactory tmf = null;
try
{
Certificate ca = CertificateFactory.getInstance( "X.509" )
.generateCertificate( new ByteArrayInputStream( letsEncryptRootCert.getBytes() ) );
KeyStore ks = KeyStore.getInstance( KeyStore.getDefaultType() );
ks.load( null, null );
ks.setCertificateEntry( Integer.toString( 1 ), ca );
TrustManagerFactory additional = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm() );
additional.init( ks );
// Get hold of the extension trust manager
X509TrustManager x509tm = null;
for ( TrustManager tm : additional.getTrustManagers() )
String version = System.getProperty( "java.version" );
if ( version.regionMatches( 0, "1.8.0_", 0, 6 ) && version.length() == 8 ) // 1.8.0_xx (xx < 100)
{
if ( tm instanceof X509TrustManager )
{
x509tm = (X509TrustManager) tm;
break;
}
}
Certificate ca = CertificateFactory.getInstance( "X.509" )
.generateCertificate( new ByteArrayInputStream( letsEncryptRootCert.getBytes() ) );
tmf = new MergedTrustManagerFactory( TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm() ), x509tm );
KeyStore ks = KeyStore.getInstance( KeyStore.getDefaultType() );
ks.load( null, null );
ks.setCertificateEntry( Integer.toString( 1 ), ca );
TrustManagerFactory additional = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm() );
additional.init( ks );
// Get hold of the extension trust manager
X509TrustManager x509tm = null;
for ( TrustManager tm : additional.getTrustManagers() )
{
if ( tm instanceof X509TrustManager )
{
x509tm = (X509TrustManager) tm;
break;
}
}
tmf = new MergedTrustManagerFactory( TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm() ), x509tm );
}
else
{
tmf = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm() );
}
tmf.init( (KeyStore) null );
}
catch( Exception e )