From c9d812260a72bd2c2b34661b94f62da6d10bcf6c Mon Sep 17 00:00:00 2001
From: Claude Brisson <claude@renegat.net>
Date: Sat, 10 Jun 2023 10:08:34 +0200
Subject: [PATCH] Some code cleaning

---
 .../jeudego/pairgoth/application/Pairgoth.kt  | 71 +++++++++++++------
 .../main/resources/server.default.properties  |  1 +
 2 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/webserver/src/main/kotlin/org/jeudego/pairgoth/application/Pairgoth.kt b/webserver/src/main/kotlin/org/jeudego/pairgoth/application/Pairgoth.kt
index ef46c26..8fb9bdf 100644
--- a/webserver/src/main/kotlin/org/jeudego/pairgoth/application/Pairgoth.kt
+++ b/webserver/src/main/kotlin/org/jeudego/pairgoth/application/Pairgoth.kt
@@ -84,6 +84,35 @@ private fun launchServer() {
     val viewContext = createContext("view", "/")
 
     // handle properties
+    readProperties(apiContext, viewContext)
+
+    val webappUrl = serverProps.getProperty("webapp.url")?.let { URL(it) } ?: throw Error("missing property webapp.url")
+    val secure = webappUrl.protocol == "https"
+
+    // create server
+    val server =
+        if (secure) Server()
+        else Server(webappUrl.port)
+
+    server.apply {
+        // register webapps
+        handler = ContextHandlerCollection(apiContext, viewContext)
+        if (secure) {
+            val connector = buildSecureConnector(server, webappUrl.port)
+            addConnector(connector)
+        }
+        // launch server
+        start()
+        join()
+    }
+}
+
+private fun createContext(webapp: String, contextPath: String) = WebAppContext().also { context ->
+    context.war = "$tmp/pairgoth/webapps/$webapp-webapp-$version.war"
+    context.contextPath = contextPath
+}
+
+private fun readProperties(vararg contexts: WebAppContext) {
     val defaultProps = getResource("/server.default.properties") ?: throw Error("missing default server properties")
     defaultProps.openStream().use {
         serverProps.load(InputStreamReader(it, StandardCharsets.UTF_8))
@@ -97,8 +126,9 @@ private fun launchServer() {
             if (property.startsWith("logger.")) {
                 // special handling for logger properties
                 val webappLoggerPropKey = "webapp-slf4j-logger.${property.substring(7)}"
-                apiContext.setInitParameter(webappLoggerPropKey, value)
-                viewContext.setInitParameter(webappLoggerPropKey, value)
+                contexts.forEach { context ->
+                    context.setInitParameter(webappLoggerPropKey, value)
+                }
             } else if (property.startsWith("webapp.ssl.")) {
                 // do not propagate ssl properties further
             } else {
@@ -106,13 +136,9 @@ private fun launchServer() {
             }
         }
     }
+}
 
-    // create server
-    val server = Server()
-
-    // register webapps
-    server.handler = ContextHandlerCollection(apiContext, viewContext)
-
+private fun buildSecureConnector(server: Server, port: Int): ServerConnector {
     // set up http/2
     val httpConfig = HttpConfiguration().apply {
         addCustomizer(SecureRequestCustomizer())
@@ -124,7 +150,8 @@ private fun launchServer() {
     }
     val cert = getResourceProperty("webapp.ssl.cert").readBytes()
     val key = getResourceProperty("webapp.ssl.key").readText().let {
-        val encodedKey = Pattern.compile("(?m)(?s)^---*BEGIN.*---*$(.*)^---*END.*---*$.*").matcher(it).replaceFirst("$1")
+        val encodedKey =
+            Pattern.compile("(?m)(?s)^---*BEGIN.*---*$(.*)^---*END.*---*$.*").matcher(it).replaceFirst("$1")
         Base64.getDecoder().decode(encodedKey.replace("\n", ""))
     }
     val pass = serverProps.getProperty("webapp.ssl.pass") ?: "foobar"
@@ -136,27 +163,25 @@ private fun launchServer() {
     val certificateFactory = CertificateFactory.getInstance("X.509")
     val store = KeyStore.getInstance("JKS").apply {
         load(null)
-        setCertificateEntry("certificate", certificateFactory.generateCertificate(ByteArrayInputStream(cert)) as X509Certificate)
-        setKeyEntry("key", privKey, pass.toCharArray(), arrayOf(certificateFactory.generateCertificate(ByteArrayInputStream(cert))))
+        setCertificateEntry(
+            "certificate",
+            certificateFactory.generateCertificate(ByteArrayInputStream(cert)) as X509Certificate
+        )
+        setKeyEntry(
+            "key",
+            privKey,
+            pass.toCharArray(),
+            arrayOf(certificateFactory.generateCertificate(ByteArrayInputStream(cert)))
+        )
     }
     val sslContextFactory = SslContextFactory.Server().apply {
         keyStoreType = "JKS"
         keyStore = store
         keyStorePassword = pass
-        // if (pass.isNotEmpty()) keyManagerPassword = pass
     }
 
     val tls = SslConnectionFactory(sslContextFactory, alpn.protocol)
     val connector = ServerConnector(server, tls, alpn, h2, http11)
-    connector.port = 8443
-    server.addConnector(connector)
-
-    // launch server
-    server.start()
-    server.join()
-}
-
-private fun createContext(webapp: String, contextPath: String) = WebAppContext().also { context ->
-    context.war = "$tmp/pairgoth/webapps/$webapp-webapp-$version.war"
-    context.contextPath = contextPath
+    connector.port = port
+    return connector
 }
diff --git a/webserver/src/main/resources/server.default.properties b/webserver/src/main/resources/server.default.properties
index 72fc84e..c996630 100644
--- a/webserver/src/main/resources/server.default.properties
+++ b/webserver/src/main/resources/server.default.properties
@@ -1,3 +1,4 @@
+webapp.url = https://localhost:8443
 webapp.ssl.key = jar:file:$jar!/ssl/localhost.key
 # webapp.ssl.pass = foobar (not supported for now)
 webapp.ssl.cert = jar:file:$jar!/ssl/localhost.crt