ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-18 02:39:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-3327: Check for missing certificates directory (#4905)

Browse Source 
While the node is starting up, we now check for the presence of the certificates directory. This allows us to print out an easily understandable error message if the directory is not present. An exception is made for devMode, as devMode will result in the directory being created in any case.
This commit is contained in:
Jonathan Locke 2019-03-21 16:56:18 +00:00 committed by Shams Asari
parent e6804aead6
commit 2777e32a1c
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
View File

@ -149,19 +149,21 @@ open class NodeStartup : NodeStartupLogging {
// Step 5. Load and validate node configuration.
val rawConfig = cmdLineOptions.rawConfiguration().doOnErrors(cmdLineOptions::logRawConfigurationErrors).optional ?: return ExitCodes.FAILURE
val configuration = cmdLineOptions.parseConfiguration(rawConfig).doIfValid { logRawConfig(rawConfig) }.doOnErrors(::logConfigurationErrors).optional ?: return ExitCodes.FAILURE
// Step 6. Check if we can access the certificates directory
if (!canReadCertificatesDirectory(configuration.certificatesDirectory, configuration.devMode)) return ExitCodes.FAILURE
// Step 6. Configuring special serialisation requirements, i.e., bft-smart relies on Java serialization.
// Step 7. Configuring special serialisation requirements, i.e., bft-smart relies on Java serialization.
if (attempt { banJavaSerialisation(configuration) }.doOnFailure(Consumer { error -> error.logAsUnexpected("Exception while configuring serialisation") }) !is Try.Success) return ExitCodes.FAILURE
// Step 7. Any actions required before starting up the Corda network layer.
// Step 8. Any actions required before starting up the Corda network layer.
if (attempt { preNetworkRegistration(configuration) }.doOnFailure(Consumer(::handleRegistrationError)) !is Try.Success) return ExitCodes.FAILURE
// Step 8. Log startup info.
// Step 9. Log startup info.
logStartupInfo(versionInfo, configuration)
// Step 9. Start node: create the node, check for other command-line options, add extra logging etc.
// Step 10. Start node: create the node, check for other command-line options, add extra logging etc.
if (attempt {
cmdLineOptions.baseDirectory.createDirectories()
afterNodeInitialisation.run(createNode(configuration, versionInfo))
}.doOnFailure(Consumer(::handleStartError)) !is Try.Success) return ExitCodes.FAILURE
@ -297,6 +299,20 @@ open class NodeStartup : NodeStartupLogging {
return true
}
private fun canReadCertificatesDirectory(certDirectory: Path, devMode: Boolean): Boolean {
//Test for access to the certificates path and shutdown if we are unable to reach it.
//We don't do this if devMode==true because the certificates would be created anyway
if (devMode) return true
if (!certDirectory.isDirectory()) {
printError("Unable to access certificates directory ${certDirectory}. This could be because the node has not been registered with the Identity Operator.")
printError("Please see https://docs.corda.net/joining-a-compatibility-zone.html for more information.")
printError("Node will now shutdown.")
return false
}
return true
}
private fun lookupMachineNameAndMaybeWarn(): String {
val start = System.currentTimeMillis()
val hostName: String = InetAddress.getLocalHost().hostName