ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-10 03:11:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

TEMP disable use of "sun.security, sun.misc.Unsafe" in serializer lists (re-instate with module add-exports directive)

Browse Source
This commit is contained in:
josecoll 2019-04-09 13:40:36 +01:00
parent b8fb617ee1
commit ac56f302eb
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node/src/main/kotlin/net/corda/node/serialization/kryo/DefaultKryoCustomizer.kt
View File

@ -42,8 +42,8 @@ import org.objenesis.instantiator.ObjectInstantiator
import org.objenesis.strategy.InstantiatorStrategy import org.objenesis.strategy.InstantiatorStrategy
import org.objenesis.strategy.StdInstantiatorStrategy import org.objenesis.strategy.StdInstantiatorStrategy
import org.slf4j.Logger import org.slf4j.Logger
import sun.security.ec.ECPublicKeyImpl //import sun.security.ec.ECPublicKeyImpl
import sun.security.provider.certpath.X509CertPath //import sun.security.provider.certpath.X509CertPath
import java.io.BufferedInputStream import java.io.BufferedInputStream
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.FileInputStream import java.io.FileInputStream
@ -97,7 +97,7 @@ object DefaultKryoCustomizer {
register(BufferedInputStream::class.java, InputStreamSerializer) register(BufferedInputStream::class.java, InputStreamSerializer)
register(Class.forName("sun.net.www.protocol.jar.JarURLConnection\$JarURLInputStream"), InputStreamSerializer) register(Class.forName("sun.net.www.protocol.jar.JarURLConnection\$JarURLInputStream"), InputStreamSerializer)
noReferencesWithin<WireTransaction>() noReferencesWithin<WireTransaction>()
register(ECPublicKeyImpl::class.java, publicKeySerializer) // register(ECPublicKeyImpl::class.java, publicKeySerializer)
register(EdDSAPublicKey::class.java, publicKeySerializer) register(EdDSAPublicKey::class.java, publicKeySerializer)
register(EdDSAPrivateKey::class.java, PrivateKeySerializer) register(EdDSAPrivateKey::class.java, PrivateKeySerializer)
register(CompositeKey::class.java, publicKeySerializer) // Using a custom serializer for compactness register(CompositeKey::class.java, publicKeySerializer) // Using a custom serializer for compactness
@ -109,7 +109,7 @@ object DefaultKryoCustomizer {
register(Class::class.java, ClassSerializer) register(Class::class.java, ClassSerializer)
register(FileInputStream::class.java, InputStreamSerializer) register(FileInputStream::class.java, InputStreamSerializer)
register(CertPath::class.java, CertPathSerializer) register(CertPath::class.java, CertPathSerializer)
register(X509CertPath::class.java, CertPathSerializer) // register(X509CertPath::class.java, CertPathSerializer)
register(BCECPrivateKey::class.java, PrivateKeySerializer) register(BCECPrivateKey::class.java, PrivateKeySerializer)
register(BCECPublicKey::class.java, publicKeySerializer) register(BCECPublicKey::class.java, publicKeySerializer)
register(BCRSAPrivateCrtKey::class.java, PrivateKeySerializer) register(BCRSAPrivateCrtKey::class.java, PrivateKeySerializer)

8
serialization/src/main/kotlin/net/corda/serialization/internal/AllButBlacklisted.kt
View File

@ -2,8 +2,8 @@ package net.corda.serialization.internal
import net.corda.core.DeleteForDJVM import net.corda.core.DeleteForDJVM
import net.corda.core.serialization.ClassWhitelist import net.corda.core.serialization.ClassWhitelist
import sun.misc.Unsafe //import sun.misc.Unsafe
import sun.security.util.Password //import sun.security.util.Password
import java.io.* import java.io.*
import java.lang.invoke.* import java.lang.invoke.*
import java.lang.reflect.AccessibleObject import java.lang.reflect.AccessibleObject
@ -50,7 +50,7 @@ object AllButBlacklisted : ClassWhitelist {
ClassLoader::class.java.name, ClassLoader::class.java.name,
Handler::class.java.name, // MemoryHandler, StreamHandler Handler::class.java.name, // MemoryHandler, StreamHandler
Runtime::class.java.name, Runtime::class.java.name,
Unsafe::class.java.name, // Unsafe::class.java.name,
ZipFile::class.java.name, ZipFile::class.java.name,
Provider::class.java.name, Provider::class.java.name,
SecurityManager::class.java.name, SecurityManager::class.java.name,
@ -62,7 +62,7 @@ object AllButBlacklisted : ClassWhitelist {
// java.security. // java.security.
KeyStore::class.java.name, KeyStore::class.java.name,
Password::class.java.name, // Password::class.java.name,
AccessController::class.java.name, AccessController::class.java.name,
Permission::class.java.name, Permission::class.java.name,

4
serialization/src/main/kotlin/net/corda/serialization/internal/DefaultWhitelist.kt
View File

@ -5,7 +5,7 @@ import net.corda.core.utilities.NetworkHostAndPort
import org.apache.activemq.artemis.api.core.SimpleString import org.apache.activemq.artemis.api.core.SimpleString
import rx.Notification import rx.Notification
import rx.exceptions.OnErrorNotImplementedException import rx.exceptions.OnErrorNotImplementedException
import sun.security.x509.X509CertImpl //import sun.security.x509.X509CertImpl
import java.security.cert.CRLReason import java.security.cert.CRLReason
import java.util.* import java.util.*
@ -62,7 +62,7 @@ object DefaultWhitelist : SerializationWhitelist {
StackTraceElement::class.java, StackTraceElement::class.java,
// Implementation of X509Certificate. // Implementation of X509Certificate.
X509CertImpl::class.java, // X509CertImpl::class.java,
CRLReason::class.java CRLReason::class.java
) )
} }