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

Add the Corda node's legalName to the Web error page. (#569)

Browse Source
This commit is contained in:
Chris Rankin 2017-04-21 14:46:29 +01:00 committed by GitHub
parent 2b1a71955c
commit 4cb21257e6
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt
View File

@ -16,6 +16,7 @@ class WebServerConfig(val baseDirectory: Path, val config: Config) : SSLConfigur
override val trustStorePassword: String by config
val exportJMXto: String get() = "http"
val useHTTPS: Boolean by config
val myLegalName: String by config
val p2pAddress: HostAndPort by config // TODO: Use RPC port instead of P2P port (RPC requires authentication, P2P does not)
val webAddress: HostAndPort by config
}

30
webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt
View File

@ -12,6 +12,7 @@ import net.corda.webserver.servlets.ObjectMapperConfig
import net.corda.webserver.servlets.ResponseFilter
import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException
import org.eclipse.jetty.server.*
import org.eclipse.jetty.server.handler.ErrorHandler
import org.eclipse.jetty.server.handler.HandlerCollection
import org.eclipse.jetty.servlet.DefaultServlet
import org.eclipse.jetty.servlet.ServletContextHandler
@ -22,13 +23,17 @@ import org.glassfish.jersey.server.ResourceConfig
import org.glassfish.jersey.server.ServerProperties
import org.glassfish.jersey.servlet.ServletContainer
import org.slf4j.LoggerFactory
import java.io.IOException
import java.io.Writer
import java.lang.reflect.InvocationTargetException
import java.util.*
import java.util.ServiceLoader
import javax.servlet.http.HttpServletRequest
import javax.ws.rs.core.MediaType
class NodeWebServer(val config: WebServerConfig) {
private companion object {
val log = loggerFor<NodeWebServer>()
val retryDelay = 1000L // Milliseconds
const val retryDelay = 1000L // Milliseconds
}
val address = config.webAddress
@ -58,7 +63,7 @@ class NodeWebServer(val config: WebServerConfig) {
handlerCollection.addHandler(WebAppContext().apply {
// Find the jolokia WAR file on the classpath.
contextPath = "/monitoring/json"
setInitParameter("mimeType", "application/json")
setInitParameter("mimeType", MediaType.APPLICATION_JSON)
war = warpath
})
} else {
@ -106,14 +111,27 @@ class NodeWebServer(val config: WebServerConfig) {
private fun buildServletContextHandler(localRpc: CordaRPCOps): ServletContextHandler {
return ServletContextHandler().apply {
contextPath = "/"
errorHandler = object : ErrorHandler() {
@Throws(IOException::class)
override fun writeErrorPageHead(request: HttpServletRequest, writer: Writer, code: Int, message: String) {
writer.write("<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\"/>\n")
writer.write("<title>Corda ${config.myLegalName} : Error $code</title>\n")
}
@Throws(IOException::class)
override fun writeErrorPageMessage(request: HttpServletRequest, writer: Writer, code: Int, message: String , uri: String) {
writer.write("<h1>Corda ${config.myLegalName}</h1>\n")
super.writeErrorPageMessage(request, writer, code, message, uri)
}
}
setAttribute("rpc", localRpc)
addServlet(DataUploadServlet::class.java, "/upload/*")
addServlet(AttachmentDownloadServlet::class.java, "/attachments/*")
val resourceConfig = ResourceConfig()
resourceConfig.register(ObjectMapperConfig(localRpc))
resourceConfig.register(ResponseFilter())
resourceConfig.register(APIServerImpl(localRpc))
.register(ObjectMapperConfig(localRpc))
.register(ResponseFilter())
.register(APIServerImpl(localRpc))
val webAPIsOnClasspath = pluginRegistries.flatMap { x -> x.webApis }
for (webapi in webAPIsOnClasspath) {