From 4f40a04eb442ca2872799f182107a8ed593443e1 Mon Sep 17 00:00:00 2001
From: Ruud Senden <8635138+rsenden@users.noreply.github.com>
Date: Wed, 21 Aug 2024 10:30:10 +0200
Subject: [PATCH] fix: SSC: Fix application version link in
 `appversion-summary` & `bitbucket-sast-report` actions

---
 .../cli/ssc/action/cli/cmd/SSCActionRunCommand.java        | 7 +++++--
 .../fortify/cli/ssc/actions/zip/appversion-summary.yaml    | 2 +-
 .../fortify/cli/ssc/actions/zip/bitbucket-sast-report.yaml | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/action/cli/cmd/SSCActionRunCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/action/cli/cmd/SSCActionRunCommand.java
index d521f47ab2..53587dec42 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/action/cli/cmd/SSCActionRunCommand.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/action/cli/cmd/SSCActionRunCommand.java
@@ -97,9 +97,12 @@ public String issueBrowserUrl(ObjectNode issue, ObjectNode filterset) {
             }
             return templateRunner.getSpelEvaluator().evaluate(SpelHelper.parseTemplateExpression(deepLinkExpression), issue, String.class);
         }
-        public String appversionBrowserUrl(ObjectNode appversion) {
+        public String appversionBrowserUrl(ObjectNode appversion, ObjectNode filterset) {
             var deepLinkExpression = baseUrl()
-                    +"/html/ssc/index.jsp#!/version/${id}/fix";
+                    +"/html/ssc/version/${id}/audit";
+            if ( filterset!=null ) { 
+                deepLinkExpression+="?filterSet="+filterset.get("guid").asText();
+            }
             return templateRunner.getSpelEvaluator().evaluate(SpelHelper.parseTemplateExpression(deepLinkExpression), appversion, String.class);
         }
         private String baseUrl() {
diff --git a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/appversion-summary.yaml b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/appversion-summary.yaml
index 35b4bfe8e0..6e5656a938 100644
--- a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/appversion-summary.yaml
+++ b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/appversion-summary.yaml
@@ -234,7 +234,7 @@ valueTemplates:
     contents: |
       # SSC Application Version Summary
       
-      ## [${parameters.appversion.project.name} - ${parameters.appversion.name}](${#ssc.appversionBrowserUrl(parameters.appversion)})
+      ## [${parameters.appversion.project.name} - ${parameters.appversion.name}](${#ssc.appversionBrowserUrl(parameters.appversion,null)})
       
       Summary generated on: ${#formatDateTime(dateFmt)}
       
diff --git a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bitbucket-sast-report.yaml b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bitbucket-sast-report.yaml
index 20695d15dc..3bfa38d01f 100644
--- a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bitbucket-sast-report.yaml
+++ b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/actions/zip/bitbucket-sast-report.yaml
@@ -102,7 +102,7 @@ valueTemplates:
       details: Fortify detected ${annotations?.size()?:0} static ${annotations?.size()==1 ? 'vulnerability':'vulnerabilities'}
       #external_id:
       reporter: Fortify Static Code Analyzer ${lastStaticScan?.engineVersion?:''}
-      link: ${#ssc.appversionBrowserUrl(parameters.appversion)}
+      link: ${#ssc.appversionBrowserUrl(parameters.appversion,parameters.filterset)}
       # remote_link_enabled:
       logo_url: https://bitbucket.org/workspaces/fortifysoftware/avatar
       report_type: SECURITY