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

fix a bug which prevent us from starting network map server without doorman. (#760)

Browse Source
This commit is contained in:
Patrick Kuo 2018-04-20 17:45:27 +01:00 committed by GitHub
parent c0f254e3bb
commit e618b49a6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/NetworkManagementServer.kt
View File

@ -42,21 +42,7 @@ class NetworkManagementServer(dataSourceProperties: Properties,
private val database = configureDatabase(dataSourceProperties, databaseConfig).also { closeActions += it::close } private val database = configureDatabase(dataSourceProperties, databaseConfig).also { closeActions += it::close }
private val networkMapStorage = PersistentNetworkMapStorage(database) private val networkMapStorage = PersistentNetworkMapStorage(database)
private val nodeInfoStorage = PersistentNodeInfoStorage(database) private val nodeInfoStorage = PersistentNodeInfoStorage(database)
private val crlStorage = PersistentCertificateRevocationListStorage(database)
private val csrStorage = doormanConfig?.let {
if (it.approveAll) {
ApproveAllCertificateSigningRequestStorage(PersistentCertificateSigningRequestStorage(database))
} else {
PersistentCertificateSigningRequestStorage(database)
}
}
private val crrStorage = revocationConfig?.let {
if (it.approveAll) {
ApproveAllCertificateRevocationRequestStorage(PersistentCertificateRevocationRequestStorage(database))
} else {
PersistentCertificateRevocationRequestStorage(database)
}
}
lateinit var hostAndPort: NetworkHostAndPort lateinit var hostAndPort: NetworkHostAndPort
override fun close() { override fun close() {
@ -72,10 +58,8 @@ class NetworkManagementServer(dataSourceProperties: Properties,
private fun getNetworkMapService(config: NetworkMapConfig, signer: LocalSigner?): NetworkMapWebService { private fun getNetworkMapService(config: NetworkMapConfig, signer: LocalSigner?): NetworkMapWebService {
logger.info("Starting Network Map server.") logger.info("Starting Network Map server.")
csrStorage ?: throw IllegalStateException("Certificate signing request storage cannot be null when creating the network map service.")
val localNetworkMapSigner = signer?.let { NetworkMapSigner(networkMapStorage, it) } val localNetworkMapSigner = signer?.let { NetworkMapSigner(networkMapStorage, it) }
val latestParameters = networkMapStorage.getLatestNetworkParameters()?.networkParameters ?: val latestParameters = networkMapStorage.getLatestNetworkParameters()?.networkParameters ?: throw IllegalStateException("No network parameters were found. Please upload new network parameters before starting network map service")
throw IllegalStateException("No network parameters were found. Please upload new network parameters before starting network map service")
logger.info("Starting network map service with latest network parameters: $latestParameters") logger.info("Starting network map service with latest network parameters: $latestParameters")
localNetworkMapSigner?.signAndPersistNetworkParameters(latestParameters) localNetworkMapSigner?.signAndPersistNetworkParameters(latestParameters)
@ -92,15 +76,22 @@ class NetworkManagementServer(dataSourceProperties: Properties,
}, config.signInterval, config.signInterval, TimeUnit.MILLISECONDS) }, config.signInterval, config.signInterval, TimeUnit.MILLISECONDS)
closeActions += scheduledExecutor::shutdown closeActions += scheduledExecutor::shutdown
} }
return NetworkMapWebService(nodeInfoStorage, networkMapStorage, PersistentCertificateSigningRequestStorage(database), config)
return NetworkMapWebService(nodeInfoStorage, networkMapStorage, csrStorage, config)
} }
private fun getDoormanService(config: DoormanConfig, private fun getDoormanService(config: DoormanConfig,
csrCertPathAndKey: CertPathAndKey?, csrCertPathAndKey: CertPathAndKey?,
serverStatus: NetworkManagementServerStatus): RegistrationWebService { serverStatus: NetworkManagementServerStatus): RegistrationWebService {
logger.info("Starting Doorman server.") logger.info("Starting Doorman server.")
csrStorage ?: throw IllegalStateException("Certificate signing request storage cannot be null when creating the doorman service.")
val csrStorage = PersistentCertificateSigningRequestStorage(database).let {
if (config.approveAll) {
ApproveAllCertificateSigningRequestStorage(it)
} else {
it
}
}
val jiraConfig = config.jira val jiraConfig = config.jira
val requestProcessor = if (jiraConfig != null) { val requestProcessor = if (jiraConfig != null) {
val jiraWebAPI = AsynchronousJiraRestClientFactory().createWithBasicHttpAuthentication(URI(jiraConfig.address), jiraConfig.username, jiraConfig.password) val jiraWebAPI = AsynchronousJiraRestClientFactory().createWithBasicHttpAuthentication(URI(jiraConfig.address), jiraConfig.username, jiraConfig.password)
@ -130,7 +121,15 @@ class NetworkManagementServer(dataSourceProperties: Properties,
private fun getRevocationServices(config: CertificateRevocationConfig, private fun getRevocationServices(config: CertificateRevocationConfig,
csrCertPathAndKeyPair: CertPathAndKey?): Pair<CertificateRevocationRequestWebService, CertificateRevocationListWebService> { csrCertPathAndKeyPair: CertPathAndKey?): Pair<CertificateRevocationRequestWebService, CertificateRevocationListWebService> {
logger.info("Starting Revocation server.") logger.info("Starting Revocation server.")
crrStorage ?: throw IllegalStateException("Certificate revocation request storage cannot be null when creating the revocation service.")
val crrStorage = PersistentCertificateRevocationRequestStorage(database).let {
if (config.approveAll) {
ApproveAllCertificateRevocationRequestStorage(it)
} else {
it
}
}
val crlStorage = PersistentCertificateRevocationListStorage(database)
val crlHandler = csrCertPathAndKeyPair?.let { val crlHandler = csrCertPathAndKeyPair?.let {
LocalCrlHandler(crrStorage, LocalCrlHandler(crrStorage,
crlStorage, crlStorage,