From ec8b28b3c5a24dde1cd50171326e80c26b11d10a Mon Sep 17 00:00:00 2001
From: "~ . ~" <paul.n.wand@gsa.gov>
Date: Thu, 7 Nov 2024 16:18:44 -0500
Subject: [PATCH] better logging + try catch around execution

---
 .../oscal/tools/server/OscalVerticle.kt       | 21 +++++++++----------
 src/main/resources/log4j2.xml                 |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/gov/nist/secauto/oscal/tools/server/OscalVerticle.kt b/src/main/kotlin/gov/nist/secauto/oscal/tools/server/OscalVerticle.kt
index 27b2d1b..4a47c2c 100644
--- a/src/main/kotlin/gov/nist/secauto/oscal/tools/server/OscalVerticle.kt
+++ b/src/main/kotlin/gov/nist/secauto/oscal/tools/server/OscalVerticle.kt
@@ -13,6 +13,8 @@ import kotlinx.coroutines.async
 import java.util.UUID
 import io.vertx.ext.web.handler.StaticHandler
 import io.vertx.ext.web.handler.BodyHandler
+import gov.nist.secauto.metaschema.cli.processor.ExitCode
+import gov.nist.secauto.metaschema.cli.processor.ExitCode.RUNTIME_ERROR
 import gov.nist.secauto.metaschema.cli.processor.ExitStatus
 import gov.nist.secauto.metaschema.cli.processor.MessageExitStatus
 import io.vertx.ext.web.Router
@@ -136,10 +138,7 @@ class OscalVerticle : CoroutineVerticle() {
     
 
     private fun processUrl(url: String): String {
-        logger.info("processUrl input: $url")
-        
         if (!url.startsWith("file://")) {
-            logger.info("processUrl output (unchanged): $url")
             return url
         }
 
@@ -162,13 +161,9 @@ class OscalVerticle : CoroutineVerticle() {
                     // Unix-like systems
                     decodedPath
                 }
-            }
-            
-            logger.info("processUrl output: $result")
+            }            
             return result
         } catch (e: Exception) {
-            logger.error("Error processing file URL: $url", e)
-            logger.info("processUrl output (error case): $url")
             return url
         }
     }
@@ -419,7 +414,12 @@ class OscalVerticle : CoroutineVerticle() {
                 mutableArgs.add(sarifFilePath)
 
                 logger.info(mutableArgs.joinToString(" "))
-                val exitStatus = CLI.runCli(*mutableArgs.toTypedArray())
+                
+                val exitStatus = try {
+                    CLI.runCli(*mutableArgs.toTypedArray())
+                } catch (e: Exception) {
+                    MessageExitStatus(ExitCode.RUNTIME_ERROR, e.message)
+                }
                 // Check if SARIF file was created
                 if (!File(sarifFilePath).exists()) {
                     val exitCode = "code:${exitStatus.exitCode}"
@@ -445,7 +445,7 @@ class OscalVerticle : CoroutineVerticle() {
     }
 
     private fun createBasicSarif(errorMessage: String): String {
-        val version = OscalCliVersion();
+        val version = OscalCliVersion().getVersion();
         return """
         {
           "${'$'}schema": "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json",
@@ -474,7 +474,6 @@ class OscalVerticle : CoroutineVerticle() {
     }
     private fun sendSuccessResponse(ctx: RoutingContext, exitStatus: ExitStatus, sarifFilePath: String) {
         val fileContent = File(sarifFilePath).readText()
-        File(sarifFilePath).delete()
         ctx.response()
             .setStatusCode(200) // HTTP 200 OK
             .putHeader("Exit-Status", exitStatus.exitCode.toString())
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 793939c..33516c3 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -10,7 +10,7 @@
             <PatternLayout pattern="${LOG_PATTERN}" disableAnsi="false"/>
             <Filters>
                 <!-- Allow INFO level and above -->
-                <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+                <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
         </Console>
     </Appenders>