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

Only allow the first node to run notary services. And validate port numbers more strongly.

Browse Source
This commit is contained in:
Chris Rankin 2017-02-08 14:04:23 +00:00
parent c734fbf8bb
commit f95b743426
3 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
View File

@ -2,17 +2,20 @@ package net.corda.demobench.model
import com.typesafe.config.ConfigRenderOptions
import java.lang.management.ManagementFactory
import java.nio.file.Paths
import java.text.SimpleDateFormat
import java.util.*
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.atomic.AtomicInteger
import net.corda.demobench.pty.R3Pty
import tornadofx.Controller
import java.io.IOException
import java.net.ServerSocket
class NodeController : Controller() {
private companion object Data {
const val FIRST_PORT = 10000
const val MIN_PORT = 1024
const val MAX_PORT = 65535
}
private val jvm by inject<JVMConfig>()
@ -63,12 +66,27 @@ class NodeController : Controller() {
val nextPort: Int get() = port.andIncrement
fun isPortAvailable(port: Int): Boolean {
if ((port >= MIN_PORT) && (port <= MAX_PORT)) {
try {
ServerSocket(port).close()
return true
} catch (e: IOException) {
return false
}
} else {
return false
}
}
fun keyExists(key: String) = nodes.keys.contains(key)
fun nameExists(name: String) = keyExists(toKey(name))
fun hasNetworkMap(): Boolean = networkMapConfig != null
fun chooseNetworkMap(config: NodeConfig) {
if (networkMapConfig != null) {
if (hasNetworkMap()) {
config.networkMap = networkMapConfig
} else {
networkMapConfig = config

40
tools/demobench/src/main/kotlin/net/corda/demobench/model/ServiceController.kt
View File

@ -7,32 +7,28 @@ import java.util.*
class ServiceController : Controller() {
private var serviceSet: List<String>
val services: List<String> get() = serviceSet
val services: List<String> = loadConf(javaClass.classLoader.getResource("services.conf"))
init {
/*
* Load our list of known extra Corda services.
*/
val serviceConf = javaClass.classLoader.getResource("services.conf")
serviceSet = if (serviceConf == null) {
emptyList<String>()
val notaries: List<String> = services.filter { it.startsWith("corda.notary.") }.toList()
/*
* Load our list of known extra Corda services.
*/
private fun loadConf(url: URL?): List<String> {
if (url == null) {
return emptyList()
} else {
loadConf(serviceConf)
}
}
val set = TreeSet<String>()
InputStreamReader(url.openStream()).useLines {
sq -> sq.forEach {
val service = it.trim()
set.add(service)
private fun loadConf(url: URL): List<String> {
val set = TreeSet<String>()
InputStreamReader(url.openStream()).useLines {
sq -> sq.forEach {
val service = it.trim()
set.add(service)
log.info("Supports: " + service)
log.info("Supports: " + service)
}
}
return set.toList()
}
return set.toList()
}
}
}

11
tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTabView.kt
View File

@ -73,6 +73,8 @@ class NodeTabView : Fragment() {
error("Port number required")
} else if (it.contains(NOT_NUMBER)) {
error("Invalid port number")
} else if (!nodeController.isPortAvailable(it.toInt())) {
error("Port $it is unavailable")
} else {
null
}
@ -88,6 +90,8 @@ class NodeTabView : Fragment() {
error("Port number required")
} else if (it.contains(NOT_NUMBER)) {
error("Invalid port number")
} else if (!nodeController.isPortAvailable(it.toInt())) {
error("Port $it is unavailable")
} else {
null
}
@ -103,6 +107,8 @@ class NodeTabView : Fragment() {
error("Port number required")
} else if (it.contains(NOT_NUMBER)) {
error("Invalid port number")
} else if (!nodeController.isPortAvailable(it.toInt())) {
error("Port $it is unavailable")
} else {
null
}
@ -112,7 +118,7 @@ class NodeTabView : Fragment() {
}
fieldset("Services") {
listview(serviceController.services.observable()) {
listview(availableServices.observable()) {
selectionModel.selectionMode = MULTIPLE
model.item.extraServices.set(selectionModel.selectedItems)
}
@ -131,6 +137,9 @@ class NodeTabView : Fragment() {
val nodeTab = CloseableTab("New Node", root)
private val availableServices: List<String>
get() = if (nodeController.hasNetworkMap()) serviceController.services else serviceController.notaries
fun launch() {
model.commit()
val config = nodeController.validate(model.item)