From 84f54ed0c7e50cd596ae4b87eb090e4474e96c51 Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Thu, 8 Oct 2020 13:50:01 +0200
Subject: [PATCH] [Markdown-report] pretty-print paths and add baseUris
---
src/plugins/markdown-report/sarif.ml | 6 ++----
src/plugins/markdown-report/sarif_gen.ml | 16 ++++++++++++++--
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/plugins/markdown-report/sarif.ml b/src/plugins/markdown-report/sarif.ml
index e50d9262a43..92fbd5de6e7 100644
--- a/src/plugins/markdown-report/sarif.ml
+++ b/src/plugins/markdown-report/sarif.ml
@@ -98,10 +98,8 @@ module ArtifactLocation = struct
let default = create ~uri:"" ()
let of_loc loc =
- let open Filepath in
- (* by construction, we have an absolute path here, no need for uriBase *)
- let uri = ((fst loc).pos_path :> string) in
- create ~uri ()
+ let uriBaseId, uri = Filepath.(Normalized.to_base_uri (fst loc).pos_path) in
+ create ~uri ?uriBaseId ()
end
module ArtifactLocationDictionary = Json_dictionary(ArtifactLocation)
diff --git a/src/plugins/markdown-report/sarif_gen.ml b/src/plugins/markdown-report/sarif_gen.ml
index 278073346ff..407b4f064e1 100644
--- a/src/plugins/markdown-report/sarif_gen.ml
+++ b/src/plugins/markdown-report/sarif_gen.ml
@@ -159,7 +159,7 @@ let gen_statuses () =
let gen_artifacts () =
let add_src_file f =
- let uri = (f:Filepath.Normalized.t :> string) in
+ let uri = Filepath.Normalized.to_pretty_string f in
let location = ArtifactLocation.create ~uri () in
let roles = [ Role.analysisTarget ] in
let mimeType = "text/x-csrc" in
@@ -192,7 +192,19 @@ let gen_run remarks =
let taxonomies = [ToolComponent.create ~name ~rules ()] in
let results = results @ user_annot_results in
let artifacts = gen_artifacts () in
- Run.create ~tool ~invocations ~results ~taxonomies ~artifacts ()
+ let uriBases = ("PWD", Sys.getcwd ()) :: Filepath.all_symbolic_dirs () in
+ let uriBasesJson =
+ List.fold_left (fun acc (name, dir) ->
+ (name, `Assoc [("uri", `String dir)]) :: acc
+ ) [] uriBases
+ in
+ let originalUriBaseIds =
+ match ArtifactLocationDictionary.of_yojson (`Assoc uriBasesJson) with
+ | Ok x -> x
+ | Error s -> failwith s
+ in
+ Run.create ~tool ~invocations ~results ~taxonomies ~artifacts
+ ~originalUriBaseIds ()
let generate () =
let remarks = get_remarks () in
--
GitLab