CORDA-2914: Allow certificate directory to be a symlink (#5102)

This commit is contained in:
Manoj
2019-07-03 17:39:40 +08:00
committed by Shams Asari
parent 88894bc592
commit 44835bd17c
3 changed files with 14 additions and 6 deletions

View File

@ -7,9 +7,11 @@ import net.corda.core.internal.createDirectories
import net.corda.core.internal.exists
import net.corda.core.internal.read
import net.corda.core.internal.write
import net.corda.core.internal.safeSymbolicRead
import java.io.IOException
import java.io.InputStream
import java.nio.file.Path
import java.nio.file.Files
import java.security.*
import java.security.cert.Certificate
import java.security.cert.X509Certificate
@ -30,7 +32,7 @@ fun loadOrCreateKeyStore(keyStoreFilePath: Path, storePassword: String): KeyStor
keyStoreFilePath.read { keyStore.load(it, pass) }
} else {
keyStore.load(null, pass)
keyStoreFilePath.toAbsolutePath().parent?.createDirectories()
keyStoreFilePath.toAbsolutePath().parent?.safeSymbolicRead()?.createDirectories()
keyStoreFilePath.write { keyStore.store(it, pass) }
}
return keyStore