chore: ktor plugin and misc refactorings

Author: sureshg

backend/jvm/src/main/kotlin/dev/suresh/App.kt

@@ -5,7 +5,7 @@ import dev.suresh.di.configureDI
 import dev.suresh.plugins.*
 import dev.suresh.routes.*
 import io.ktor.server.application.*
-import io.ktor.server.jetty.jakarta.EngineMain
+import io.ktor.server.jetty.jakarta.*
 import io.ktor.server.routing.*
 import io.ktor.util.logging.*
 import kotlin.io.path.Path

backend/jvm/src/main/kotlin/dev/suresh/plugins/Http.kt

@@ -21,9 +21,11 @@ import io.ktor.server.request.*
 import io.ktor.server.resources.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
+import io.ktor.server.servlet.jakarta.*
 import io.ktor.server.sessions.*
 import io.ktor.server.sse.*
 import io.ktor.server.websocket.*
+import javax.net.ssl.SSLSession
 import kotlin.concurrent.atomics.AtomicLong
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
@@ -126,7 +128,15 @@ fun Application.configureHTTP() {
     mdc("remoteHost") { call -> call.request.origin.remoteHost }
     // callIdMdc(TRACE_ID)
 
-    // Enable logging for API routes only
+    // format { call ->
+    //   val status = call.response.status() ?: OK
+    //   val method = call.request.httpMethod.value
+    //   val path = call.request.path()
+    //   val took = call.processingTimeMillis()
+    //   val remote = call.request.origin.remoteHost
+    //   "[$remote] $status: $method $path (${took}ms)"
+    // }
+
     filter { it.isApi }
   }
 
@@ -141,9 +151,9 @@ fun Application.configureHTTP() {
 }
 
 fun Application.configureInterceptors() {
-  intercept(ApplicationCallPipeline.Plugins) {
-    println("Request: ${call.request.uri}")
-    if (call.request.headers["Custom-Header"] == "Test") {
+  intercept(ApplicationCallPipeline.Call) {
+    println("[${call.request.origin.remoteHost}] --> ${call.request.uri}")
+    if (call.request.headers["X-Custom"] == "Test") {
       call.respond(HttpStatusCode.Forbidden)
       finish()
     }
@@ -153,12 +163,15 @@ fun Application.configureInterceptors() {
 val ApplicationCall.debug
   get() = request.queryParameters.contains("debug")
 
+val ApplicationCall.sslSession
+  get() = request.servletRequestAttributes["jakarta.servlet.request.ssl_session"] as? SSLSession
+
 val ApplicationCall.isApi
   get() = run {
     val path = request.path()
     when {
       path.contains("/swagger") -> false
-      path.startsWith("/api/") -> true
+      path.startsWith("/") -> true
       else -> false
     }
   }

backend/jvm/src/main/kotlin/dev/suresh/plugins/OTel.kt

@@ -19,10 +19,10 @@ fun Application.configureOTel() {
   val isAgentActive = globalOtel !== OpenTelemetry.noop()
   when (isAgentActive) {
     true -> log.info("\uD83D\uDFE2 OTel Java agent is active")
-    else -> log.warn("\uD83D\uDFE1 OTel Java agent is inactive!!")
+    else -> log.warn("\uD83D\uDFE1 OTel Java agent is inactive")
   }
 
-  install(OTelExtnPlugin) { enabled = true }
+  install(OTelExtnPlugin)
   // otelSdk.shutdown().join(10, TimeUnit.SECONDS);
 }
 

backend/jvm/src/main/kotlin/dev/suresh/plugins/custom/AuthzPlugin.kt

@@ -0,0 +1,28 @@
+package dev.suresh.plugins.custom
+
+import io.ktor.server.application.*
+import io.ktor.server.auth.*
+import io.ktor.server.response.*
+
+class AuthzPluginConfig {
+  var enabled: Boolean = false
+  var roles: Set<String> = emptySet()
+  lateinit var getRole: (userName: String?) -> String
+}
+
+val AuthzPlugin =
+    createRouteScopedPlugin(name = "AuthzPlugin", createConfiguration = ::AuthzPluginConfig) {
+      if (!pluginConfig.enabled) return@createRouteScopedPlugin
+      application.log.info("\uD83E\uDDE9 AuthzPlugin is installed")
+
+      on(AuthenticationChecked) { call ->
+        val userName = call.principal<UserIdPrincipal>()?.name
+        val userRole = pluginConfig.getRole(userName)
+        if (userRole !in pluginConfig.roles) {
+          call.respondText(
+              "You are not allowed to visit this page",
+              status = Forbidden,
+          )
+        }
+      }
+    }

backend/jvm/src/main/kotlin/dev/suresh/plugins/custom/Plugins.kt renamed to backend/jvm/src/main/kotlin/dev/suresh/plugins/custom/OTelExtnPlugin.kt

@@ -2,23 +2,34 @@ package dev.suresh.plugins.custom
 
 import dev.suresh.plugins.isApi
 import io.ktor.server.application.*
+import io.ktor.server.config.*
 import io.ktor.util.*
 import io.opentelemetry.api.trace.Span
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class OTelExtnPluginConfig(
+    val enabled: Boolean = false,
+    val traceIdHeader: String = "X-TraceId",
+)
 
 /**
  * A custom ktor plugin to automatically add OpenTelemetry trace id to response headers for API
  * endpoints.
  */
 val OTelExtnPlugin =
-    createApplicationPlugin(name = "OTelExtnPlugin", createConfiguration = ::OTelExtnPluginConfig) {
+    createApplicationPlugin(name = "OTelExtnPlugin") {
+      val config: OTelExtnPluginConfig = application.property("plugins.otel-extn")
+      if (!config.enabled) return@createApplicationPlugin
+      application.log.info("\uD83E\uDDE9 OTelExtnPlugin is installed")
+
       val onCallTimeKey = AttributeKey<Long>("onCallTimeKey")
       onCall { call ->
         val onCallTime = System.currentTimeMillis()
         call.attributes.put(onCallTimeKey, onCallTime)
-
-        if (pluginConfig.enabled && call.isApi) {
+        if (call.isApi) {
           Span.current()?.let { span ->
-            call.response.headers.append(pluginConfig.traceIdHeader, span.spanContext.traceId)
+            call.response.headers.append(config.traceIdHeader, span.spanContext.traceId)
             // span.setAttribute("custom-attribute", "TestPlugin")
             // span.addEvent("TestPluginEvent")
           }
@@ -48,8 +59,3 @@ val OTelExtnPlugin =
       //    }
       //  }
     }
-
-class OTelExtnPluginConfig {
-  var enabled: Boolean = false
-  var traceIdHeader: String = "X-TraceId"
-}

backend/jvm/src/main/kotlin/dev/suresh/routes/Service.kt

@@ -4,12 +4,15 @@ import dev.suresh.JFR
 import dev.suresh.http.*
 import dev.suresh.lang.*
 import dev.suresh.log.RespLogger
+import dev.suresh.plugins.custom.AuthzPlugin
 import dev.suresh.plugins.custom.CookieSession
 import dev.suresh.wasm.wasm
 import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.http.*
 import io.ktor.server.application.*
+import io.ktor.server.auth.UserIdPrincipal
+import io.ktor.server.auth.principal
 import io.ktor.server.http.content.*
 import io.ktor.server.plugins.csrf.*
 import io.ktor.server.response.*
@@ -109,6 +112,15 @@ fun Routing.services() {
     println(call.isDecompressionSuppressed)
     println(call.isCompressionSuppressed) // true
   }
+
+  route("/authz") {
+    install(AuthzPlugin) {
+      enabled = true
+      roles = setOf("admin")
+      getRole = { it ?: "admin" }
+    }
+    get { call.respondText("Hello, ${call.principal<UserIdPrincipal>()?.name}!") }
+  }
 }
 
 @WithSpan suspend fun mediaApiCall() = MediaApiClient().images().size

backend/jvm/src/main/resources/application.conf

@@ -54,4 +54,11 @@ app {
       maxDelay = PT5S
     }
   }
+}
+
+plugins {
+  otel-extn {
+    enabled = true
+    traceIdHeader = "X-TraceId"
+  }
 }

compose/cmp/build.gradle.kts

@@ -1,19 +1,16 @@
-@file:OptIn(ExperimentalComposeLibrary::class)
 @file:Suppress("UnstableApiUsage")
 
 import common.*
 import common.Platform
 import java.time.Year
 import kotlin.io.path.listDirectoryEntries
-import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat.*
 import org.jetbrains.compose.desktop.application.tasks.AbstractJPackageTask
 
 plugins {
   id("dev.suresh.plugin.kotlin.mpp")
   alias(libs.plugins.kotlin.compose.compiler)
   alias(libs.plugins.jetbrains.compose)
-  alias(libs.plugins.jetbrains.compose.hotreload)
   // alias(libs.plugins.detekt)
   id("dev.suresh.plugin.publishing")
 }
@@ -27,30 +24,26 @@ kotlin {
   sourceSets {
     commonMain.dependencies {
       implementation(projects.shared)
-      implementation(compose.runtime)
-      implementation(compose.foundation)
-      implementation(compose.material3)
-      implementation(compose.ui)
-      implementation(compose.components.resources)
-      implementation(compose.preview)
-
+      implementation(libs.compose.material3)
       implementation(libs.compose.nav)
       implementation(libs.compose.lifecycle.viewmodel)
       implementation(libs.compose.material3.adaptive)
       implementation(libs.compose.material3.adaptive.layout)
       implementation(libs.compose.material3.adaptive.nav)
       implementation(libs.compose.material.icons.core)
       implementation(libs.compose.kottie)
+      implementation(libs.compose.resources)
+      implementation(libs.compose.ui.toolingpreview)
 
       // implementation(compose.materialIconsExtended)
       // project.dependencies.detektPlugins(libs.detekt.compose.rules)
     }
 
-    commonTest.dependencies { implementation(compose.uiTest) }
+    commonTest.dependencies { implementation(libs.compose.ui.test) }
 
     jvmMain.dependencies {
       implementation(compose.desktop.currentOs)
-      implementation(compose.desktop.components.animatedImage)
+      implementation(libs.compose.animatedimage)
       implementation(libs.kotlinx.coroutines.swing)
       implementation(libs.slf4j.simple)
     }

compose/cmp/src/commonMain/kotlin/ui/home/HomeScreen.kt

@@ -71,7 +71,7 @@ fun Home(navToFile: () -> Unit, navToImage: () -> Unit) {
 
             append("Compose Multiplatform : ")
             withStyle(style = SpanStyle(color = Color.Blue, fontWeight = FontWeight.Bold)) {
-              append(BuildConfig.jetbrainsCompose)
+              append(BuildConfig.compose)
             }
           }
           showImage = !showImage

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx6g
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.daemon=true
-org.gradle.configureondemand=true
+org.gradle.configureondemand=false
 org.gradle.configuration-cache=true
 org.gradle.configuration-cache.parallel=true
 org.gradle.configuration-cache.problems=warn