From 7346db4c141ccd73552a0e69e8dab3f61687eb2c Mon Sep 17 00:00:00 2001
From: Igor Lomba <114568996+igorlombacx@users.noreply.github.com>
Date: Fri, 25 Aug 2023 15:49:54 +0100
Subject: [PATCH] Adding Learn More and Remediation Examples tabs in SAST
 (#135)

* Adding Learn More and Remediation Examples tabs

* Fix for sca vulnerabilities with no packages

* PR review fix

* remove empty line

* remove unused import

* remove empty line

* fix for non utf8 characters in learn more

* refactor in AddTextWithTitle and AddSectionTitle functions

---------

Co-authored-by: hmmachadocx <Hugo.Machado@checkmarx.com>
---
 .../CxExtension/CxWindowControl.xaml          | 121 +++++++++++-
 .../CxExtension/CxWindowControl.xaml.cs       |  24 +--
 .../Panels/ResultVulnerabilitiesPanel.cs      | 182 ++++++++++++++++--
 .../CxExtension/Panels/ResultsTreePanel.cs    |   4 +-
 .../CxExtension/Utils/CxConstants.cs          |  12 ++
 .../CxWrapper/CxConstants.cs                  |   5 +
 .../CxWrapper/CxWrapper.cs                    |  22 +++
 .../CxWrapper/Models/LearnMore.cs             |  44 +++++
 .../ast-visual-studio-extension.csproj        |   1 +
 9 files changed, 381 insertions(+), 34 deletions(-)
 create mode 100644 ast-visual-studio-extension/CxWrapper/Models/LearnMore.cs

diff --git a/ast-visual-studio-extension/CxExtension/CxWindowControl.xaml b/ast-visual-studio-extension/CxExtension/CxWindowControl.xaml
index f58768a..ea7ceef 100644
--- a/ast-visual-studio-extension/CxExtension/CxWindowControl.xaml
+++ b/ast-visual-studio-extension/CxExtension/CxWindowControl.xaml
@@ -491,7 +491,7 @@
         </StackPanel>
 
         <!-- Column 1 -->
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Margin="1,1,2,0" PreviewMouseWheel="ResultsTreePanelPreviewMouseWheel">
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Margin="1,1,2,0" PreviewMouseWheel="PreviewMouseWheel">
             <TreeView Background="Transparent" Margin="10,5,0,13" x:Name="TreeViewResults" HorizontalAlignment="Left" VerticalAlignment="Top" BorderThickness="0">
                 <TreeView.Resources>
                     <!-- Style the inactive selection the same as active -->
@@ -638,8 +638,9 @@
             </TabControl>
         </StackPanel>
 
+
         <!-- Column 3 -->
-        <ScrollViewer Grid.Row="1" Grid.Column="2" x:Name="VulnerabilitiesPanel" Visibility="Hidden" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Margin="1,1,2,0" PreviewMouseWheel="VulnerabilitiesPanelPreviewMouseWheel">
+        <ScrollViewer Grid.Row="1" Grid.Column="2" x:Name="VulnerabilitiesPanel" Visibility="Hidden" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Margin="1,1,2,0" PreviewMouseWheel="PreviewMouseWheel">
             <StackPanel>
                 <!-- Result Title -->
                 <WrapPanel Orientation="Horizontal" Margin="10" MinHeight="24">
@@ -658,6 +659,122 @@
                 </ListView>
             </StackPanel>
         </ScrollViewer>
+
+        <ScrollViewer Grid.Row="1" Grid.Column="2" x:Name="SastVulnerabilitiesPanel" Visibility="Hidden" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled" Margin="1,1,2,0">
+            <TabControl x:Name="LearnMoreAndRemediationTabControl" TabStripPlacement="Top" HorizontalAlignment="Stretch" Background="Transparent" BorderBrush="Transparent" Margin="0,10,0,0">
+                <TabControl.Resources>
+                    <Style TargetType="TabItem">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="TabItem">
+                                    <StackPanel Name="Panel" Cursor="Hand" Orientation="Vertical">
+                                        <ContentPresenter x:Name="ContentSite" VerticalAlignment="Center" HorizontalAlignment="Center" ContentSource="Header" Margin="10,2"/>
+                                        <TextBlock Name="BottomBar" Background="Transparent" Height="3" />
+                                        <StackPanel.Style>
+                                            <Style TargetType="{x:Type StackPanel}">
+                                                <Style.Triggers>
+                                                    <Trigger Property="IsMouseOver" Value="True">
+                                                        <Setter Property="Background" Value="{DynamicResource {x:Static vsfx:VsBrushes.AccentDarkKey}}"/>
+                                                    </Trigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </StackPanel.Style>
+                                    </StackPanel>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsSelected" Value="True">
+                                            <Setter TargetName="BottomBar" Property="Background" Value="LightBlue" />
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </TabControl.Resources>
+                <TabItem x:Name="VulnerabilitiesTabItem">
+                     <TabItem.HeaderTemplate>
+                        <DataTemplate>
+                            <DataTemplate.Resources>
+                                <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}" />
+                            </DataTemplate.Resources>
+                            <Grid HorizontalAlignment="Stretch">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="5*" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Text="Attack Vector" Grid.Column="1" VerticalAlignment="Center"/>
+                            </Grid>
+                        </DataTemplate>
+                    </TabItem.HeaderTemplate>
+                    <TabItem.Content>
+                        <ScrollViewer  PreviewMouseWheel="PreviewMouseWheel">
+                            <ScrollViewer.VerticalScrollBarVisibility>Auto</ScrollViewer.VerticalScrollBarVisibility>
+                            <ScrollViewer.Content>
+                                <StackPanel>
+                                    <ListView x:Name="VulnerabilitiesListSast" Grid.Column="2" Background="Transparent" BorderThickness="0">
+                                        <ListView.ItemContainerStyle>
+                                            <Style TargetType="ListViewItem">
+                                                <Setter Property="Focusable" Value="false"/>
+                                                <Setter Property="Margin" Value="5"/>
+                                            </Style>
+                                        </ListView.ItemContainerStyle>
+                                    </ListView>
+                                </StackPanel>
+                            </ScrollViewer.Content>
+                        </ScrollViewer>
+                    </TabItem.Content>
+                </TabItem>
+                <TabItem Name="LearnMore" MouseUp="OnClickLearnMoreRemediation">
+                    <TabItem.HeaderTemplate>
+                        <DataTemplate>
+                            <DataTemplate.Resources>
+                                <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}" />
+                            </DataTemplate.Resources>
+                            <Grid HorizontalAlignment="Stretch">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="5*" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Text="Learn More" Grid.Column="1" VerticalAlignment="Center"/>
+                            </Grid>
+                        </DataTemplate>
+                    </TabItem.HeaderTemplate>
+                    <TabItem.Content>
+                        <ScrollViewer  PreviewMouseWheel="PreviewMouseWheel">
+                            <ScrollViewer.VerticalScrollBarVisibility>Auto</ScrollViewer.VerticalScrollBarVisibility>
+                            <ScrollViewer.Content>
+                                <StackPanel x:Name="LearnMorePanelTitle" CanVerticallyScroll="True">
+                                </StackPanel>
+                            </ScrollViewer.Content>
+                        </ScrollViewer>
+                    </TabItem.Content>
+                </TabItem>
+                <TabItem Name="Remediation" MouseUp="OnClickLearnMoreRemediation">
+                    <TabItem.HeaderTemplate>
+                        <DataTemplate>
+                            <DataTemplate.Resources>
+                                <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}" />
+                            </DataTemplate.Resources>
+                            <Grid HorizontalAlignment="Stretch">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="5*" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock Text="Remediation" Grid.Column="1" VerticalAlignment="Center"/>
+                            </Grid>
+                        </DataTemplate>
+                    </TabItem.HeaderTemplate>
+                    <TabItem.Content>
+                        <ScrollViewer PreviewMouseWheel="PreviewMouseWheel">
+                            <ScrollViewer.VerticalScrollBarVisibility>Auto</ScrollViewer.VerticalScrollBarVisibility>
+                            <ScrollViewer.Content>
+                                <StackPanel x:Name="RemediationPanelTitle" CanVerticallyScroll="True">
+                                </StackPanel>
+                            </ScrollViewer.Content>
+                        </ScrollViewer>
+                    </TabItem.Content>
+                </TabItem>
+            </TabControl>
+        </ScrollViewer>
     </Grid>
 
 
diff --git a/ast-visual-studio-extension/CxExtension/CxWindowControl.xaml.cs b/ast-visual-studio-extension/CxExtension/CxWindowControl.xaml.cs
index 3d67236..598fe0f 100644
--- a/ast-visual-studio-extension/CxExtension/CxWindowControl.xaml.cs
+++ b/ast-visual-studio-extension/CxExtension/CxWindowControl.xaml.cs
@@ -18,7 +18,7 @@ public partial class CxWindowControl : UserControl
         private readonly CxToolbar cxToolbar;
         private readonly ResultInfoPanel resultInfoPanel;
         private readonly AsyncPackage package;
-
+        private readonly ResultVulnerabilitiesPanel resultsVulnPanel;
         public CxWindowControl(AsyncPackage package)
         {
             InitializeComponent();
@@ -27,7 +27,9 @@ public CxWindowControl(AsyncPackage package)
 
             resultInfoPanel = new ResultInfoPanel(this);
 
-            ResultsTreePanel resultsTreePanel = new ResultsTreePanel(package, this, resultInfoPanel);
+            resultsVulnPanel = new ResultVulnerabilitiesPanel(package, this);
+
+            ResultsTreePanel resultsTreePanel = new ResultsTreePanel(package, this, resultInfoPanel, resultsVulnPanel);
 
             // Subscribe OnApply event in checkmarx settings window
             CxPreferencesUI.GetInstance().OnApplySettingsEvent += CheckToolWindowPanel;
@@ -105,21 +107,11 @@ private void CheckToolWindowPanel()
         }
 
         /// <summary>
-        /// Handle mouse wheel in the vulnerabilities panel
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void VulnerabilitiesPanelPreviewMouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            HandleScrollViewer((ScrollViewer)sender, e);
-        }
-
-        /// <summary>
-        /// Handle mouse wheel in the results tree panel
+        /// Handle mouse wheel
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void ResultsTreePanelPreviewMouseWheel(object sender, MouseWheelEventArgs e)
+        private void PreviewMouseWheel(object sender, MouseWheelEventArgs e)
         {
             HandleScrollViewer((ScrollViewer)sender, e);
         }
@@ -271,5 +263,9 @@ private void OnClickCodebashingLink(object sender, MouseButtonEventArgs e)
         {
             _ = resultInfoPanel.CodeBashingListAsync(cxToolbar);
         }
+        private void OnClickLearnMoreRemediation(object sender, RoutedEventArgs e)
+        {
+            _ = resultsVulnPanel.LearnMoreAndRemediationAsync(cxToolbar);
+        }
     }
 }
diff --git a/ast-visual-studio-extension/CxExtension/Panels/ResultVulnerabilitiesPanel.cs b/ast-visual-studio-extension/CxExtension/Panels/ResultVulnerabilitiesPanel.cs
index a013610..6533919 100644
--- a/ast-visual-studio-extension/CxExtension/Panels/ResultVulnerabilitiesPanel.cs
+++ b/ast-visual-studio-extension/CxExtension/Panels/ResultVulnerabilitiesPanel.cs
@@ -1,18 +1,25 @@
+using ast_visual_studio_extension.CxExtension.Toolbar;
 using ast_visual_studio_extension.CxExtension.Utils;
 using ast_visual_studio_extension.CxWrapper.Models;
+using Microsoft.VisualStudio.Imaging;
 using Microsoft.VisualStudio.Shell;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace ast_visual_studio_extension.CxExtension.Panels
 {
     internal class ResultVulnerabilitiesPanel
     {
         private readonly CxWindowControl cxWindowUI;
-
+        private List<LearnMore> learnMore;
         public ResultVulnerabilitiesPanel(AsyncPackage package, CxWindowControl cxWindow)
         {
             cxWindowUI = cxWindow;
@@ -36,20 +43,29 @@ public void Draw(Result result)
 
             cxWindowUI.VulnerabilitiesList.Items.Clear();
 
-            if (nodes.Count > 0)
-            {
-                BuildAttackVectorPanel();
-            }
-            else if (packageDataList.Count > 0)
+            switch (result.Type)
             {
-                BuildPackageDataPanel();
-            }
-            else if (!string.IsNullOrEmpty(result.Data.FileName))
-            {
-                BuildVulnerabilityLocation();
+                case "sast":
+                    cxWindowUI.LearnMorePanelTitle.Children.Clear();
+                    cxWindowUI.RemediationPanelTitle.Children.Clear();
+                    BuildAttackVectorPanel();
+                    cxWindowUI.SastVulnerabilitiesPanel.Visibility = Visibility.Visible;
+                    cxWindowUI.VulnerabilitiesPanel.Visibility = Visibility.Hidden;
+                    learnMore = null;
+                    break;
+                case "sca":
+                    BuildPackageDataPanel();
+                    cxWindowUI.SastVulnerabilitiesPanel.Visibility = Visibility.Hidden;
+                    cxWindowUI.VulnerabilitiesPanel.Visibility = Visibility.Visible;
+                    break;
+                case "kics":
+                    BuildVulnerabilityLocation();
+                    cxWindowUI.SastVulnerabilitiesPanel.Visibility = Visibility.Hidden;
+                    cxWindowUI.VulnerabilitiesPanel.Visibility = Visibility.Visible;
+                    break;
             }
 
-            cxWindowUI.VulnerabilitiesPanel.Visibility = Visibility.Visible;
+            cxWindowUI.VulnerabilitiesTabItem.IsSelected = true;
         }
 
         /// <summary>
@@ -57,9 +73,8 @@ public void Draw(Result result)
         /// </summary>
         private void BuildAttackVectorPanel()
         {
-            cxWindowUI.VulnerabilitiesPanelTitle.Text = CxConstants.LBL_ATTACK_VECTOR;
-
-            ListView vulnerabilitiesList = cxWindowUI.VulnerabilitiesList;
+            ListView vulnerabilitiesListSast = cxWindowUI.VulnerabilitiesListSast;
+            vulnerabilitiesListSast.Items.Clear();
 
             for (int i = 0; i < nodes.Count; i++)
             {
@@ -79,7 +94,7 @@ private void BuildAttackVectorPanel()
                 item.Tag = FileNode.Builder().WithFileName(node.FileName).WithLine(node.Line).WithColumn(node.Column);
                 item.Content = tb;
 
-                vulnerabilitiesList.Items.Add(item);
+                vulnerabilitiesListSast.Items.Add(item);
             }
         }
 
@@ -91,6 +106,16 @@ private void BuildPackageDataPanel()
             cxWindowUI.VulnerabilitiesPanelTitle.Text = CxConstants.LBL_PACKAGE_DATA;
 
             ListView vulnerabilitiesList = cxWindowUI.VulnerabilitiesList;
+           
+            if (packageDataList.Count == 0)
+            {
+                TextBlock tb = new TextBlock();
+                tb.Inlines.Add(CxConstants.NO_INFORMATION);
+                ListViewItem item = new ListViewItem();
+                item.Content = tb;
+                vulnerabilitiesList.Items.Add(item);
+                return;
+            }
 
             for (int i = 0; i < packageDataList.Count; i++)
             {
@@ -143,6 +168,131 @@ private void BuildVulnerabilityLocation()
             vulnerabilitiesList.Items.Add(item);
         }
 
+
+        /// <summary>
+        /// Fill Learn More and Remediation Examples tab
+        /// </summary>
+        /// <param name="cxToolbar"></param>
+        public async Task LearnMoreAndRemediationAsync(CxToolbar cxToolbar)
+        {
+            if (learnMore != null) return;
+
+            CxCLI.CxWrapper cxWrapper = CxUtils.GetCxWrapper(cxToolbar.Package, cxToolbar.ResultsTree, GetType());
+            
+            if (cxWrapper == null)
+            {
+                AddTextWithTitle(cxWindowUI.LearnMorePanelTitle, CxConstants.NO_INFORMATION);
+                AddTextWithTitle(cxWindowUI.RemediationPanelTitle, CxConstants.NO_INFORMATION);
+                return;
+            };
+
+            cxWindowUI.LearnMorePanelTitle.Children.Clear();
+            cxWindowUI.RemediationPanelTitle.Children.Clear();
+
+            AddTextWithTitle(cxWindowUI.LearnMorePanelTitle, CxConstants.LOADING_INFORMATION);
+            AddTextWithTitle(cxWindowUI.RemediationPanelTitle,CxConstants.LOADING_INFORMATION);
+
+            await Task.Run(() =>
+            {
+                try
+                {
+                    learnMore = cxWrapper.LearnMoreAndRemediation(result.Data.QueryId);
+                }
+                catch (Exception ex)
+                {
+                    CxUtils.DisplayMessageInInfoBar(cxToolbar.Package, string.Format(CxConstants.ERROR_GETTING_LEARNMORE, ex.Message), KnownMonikers.StatusError);
+                }
+            });
+            cxWindowUI.LearnMorePanelTitle.Children.Clear();
+            cxWindowUI.RemediationPanelTitle.Children.Clear();
+
+            if (learnMore != null)
+            {
+                foreach (var learnInfo in learnMore)
+                {
+                    AddSectionTitle(cxWindowUI.LearnMorePanelTitle, CxConstants.RISK);
+                    AddTextWithTitle(cxWindowUI.LearnMorePanelTitle, learnInfo.risk);
+                    AddTextWithTitle(cxWindowUI.LearnMorePanelTitle, string.Empty);
+
+                    AddSectionTitle(cxWindowUI.LearnMorePanelTitle, CxConstants.CAUSE);
+                    AddTextWithTitle(cxWindowUI.LearnMorePanelTitle, learnInfo.cause);
+                    AddTextWithTitle(cxWindowUI.LearnMorePanelTitle, string.Empty);
+
+                    AddSectionTitle(cxWindowUI.LearnMorePanelTitle, CxConstants.GENERAL_RECOMENDATIONS);
+                    AddTextWithTitle(cxWindowUI.LearnMorePanelTitle, learnInfo.generalRecommendations);
+                    AddTextWithTitle(cxWindowUI.LearnMorePanelTitle, string.Empty);
+
+                    if (learnInfo.samples == null || learnInfo.samples.Count == 0)
+                    {
+                        AddTextWithTitle(cxWindowUI.RemediationPanelTitle, CxConstants.NO_INFORMATION);
+                        continue;
+                    }
+
+                    foreach (var sample in learnInfo.samples)
+                    {
+                        AddSectionTitle(cxWindowUI.RemediationPanelTitle, string.Format(CxConstants.CODE_SAMPLE_TITLE, sample.title, sample.progLanguage));
+                        TextBox codeTextBox = new TextBox
+                        {
+                            Text = sample.code.Trim(),
+                            IsReadOnly = true,
+                            TextWrapping = TextWrapping.WrapWithOverflow,
+                            Margin = new Thickness(10, 5, 0, 0)
+                        };
+                        cxWindowUI.RemediationPanelTitle.Children.Add(codeTextBox);
+                        AddTextWithTitle(cxWindowUI.RemediationPanelTitle, string.Empty);
+                    }
+                }
+            }
+            else
+            {
+                AddTextWithTitle(cxWindowUI.LearnMorePanelTitle, CxConstants.NO_INFORMATION);
+                AddTextWithTitle(cxWindowUI.RemediationPanelTitle, CxConstants.NO_INFORMATION);
+                learnMore = new List<LearnMore>();
+            }
+        }
+        /// <summary>
+        /// Add section title
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <param name="title"></param
+        private static void AddSectionTitle(StackPanel panel, string title)
+        {
+            TextBlock sectionTitle = CreateParsedTextBlock(title);
+            sectionTitle.FontWeight = FontWeights.Bold;
+            panel.Children.Add(sectionTitle);
+        }
+
+        /// <summary>
+        /// Add Text with title
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <param name="text"></param
+        private static void AddTextWithTitle(StackPanel panel, string text)
+        {
+            TextBlock textBlock = CreateParsedTextBlock(text);
+            panel.Children.Add(textBlock);
+        }
+
+        /// <summary>
+        /// Create a text block
+        /// </summary>
+        /// <param name="text"></param
+        /// <returns></returns>
+        private static TextBlock CreateParsedTextBlock(string text)
+        {
+            byte[] bytes = Encoding.Default.GetBytes(text);
+            text = Encoding.UTF8.GetString(bytes);
+            text = WebUtility.HtmlDecode(text);
+            TextBlock textBlock = new TextBlock
+            {
+                Text = text.Trim(),
+                TextWrapping = TextWrapping.WrapWithOverflow,
+                Margin = new Thickness(10, 5, 0, 0)
+            };
+            return textBlock;
+        }
+
+
         /// <summary>
         /// Clear result vulnerabilities panel
         /// </summary>
diff --git a/ast-visual-studio-extension/CxExtension/Panels/ResultsTreePanel.cs b/ast-visual-studio-extension/CxExtension/Panels/ResultsTreePanel.cs
index c1327a0..5f557d2 100644
--- a/ast-visual-studio-extension/CxExtension/Panels/ResultsTreePanel.cs
+++ b/ast-visual-studio-extension/CxExtension/Panels/ResultsTreePanel.cs
@@ -25,13 +25,13 @@ internal class ResultsTreePanel
         private readonly CxWindowControl cxWindowUI;
         private readonly AsyncPackage package;
 
-        public ResultsTreePanel(AsyncPackage package, CxWindowControl cxWindow, ResultInfoPanel resultInfoPanel)
+        public ResultsTreePanel(AsyncPackage package, CxWindowControl cxWindow, ResultInfoPanel resultInfoPanel, ResultVulnerabilitiesPanel resultsVulnPanel)
         {
             this.package = package;
             cxWindowUI = cxWindow;
             this.resultInfoPanel = resultInfoPanel;
 
-            resultVulnerabilitiesPanel = new ResultVulnerabilitiesPanel(package, cxWindow);
+            resultVulnerabilitiesPanel = resultsVulnPanel;
             UIUtils.CxWindowUI = cxWindowUI;
         }
 
diff --git a/ast-visual-studio-extension/CxExtension/Utils/CxConstants.cs b/ast-visual-studio-extension/CxExtension/Utils/CxConstants.cs
index 52527c2..eafe8ff 100644
--- a/ast-visual-studio-extension/CxExtension/Utils/CxConstants.cs
+++ b/ast-visual-studio-extension/CxExtension/Utils/CxConstants.cs
@@ -90,5 +90,17 @@ internal class CxConstants
         public static string PROJECT_AND_BRANCH_DO_NOT_MATCH => "The Git branch and files open in your workspace don't match the branch and project that were previously scanned in this Checkmarx project. Do you want to scan anyway?";
         public static string RUN_SCAN => "Run scan";
         public static string RUN_SCAN_ACTION => "RUN_SCAN_ACTION";
+
+        /** LEARN MORE AND REMEDIATION **/
+        public static string CODE_SAMPLE_TITLE => "{0} using {1}";
+        public static string NO_INFORMATION => "No information";
+        public static string LOADING_INFORMATION => "Loading Information...";
+
+        public static string RISK => "Risk";
+        public static string CAUSE => "Cause";
+        public static string GENERAL_RECOMENDATIONS => "General Recommendations";
+
+        public static string ERROR_GETTING_LEARNMORE => "ERROR GETTING LEARN MORE AND REMEDIATIONS";
+
     }
 }
diff --git a/ast-visual-studio-extension/CxWrapper/CxConstants.cs b/ast-visual-studio-extension/CxWrapper/CxConstants.cs
index 4b06451..0a8ebb0 100644
--- a/ast-visual-studio-extension/CxWrapper/CxConstants.cs
+++ b/ast-visual-studio-extension/CxWrapper/CxConstants.cs
@@ -25,6 +25,8 @@ public static class CxConstants
         public static string CLI_CANCEL_CMD => "cancel";
         public static string CLI_UTILS_CMD = "utils";
         public static string CLI_TENANT_CMD = "tenant";
+        public static string CLI_LEARN_MORE_CMD = "learn-more";
+
 
         /** CLI FLAGS **/
         public static string FLAG_API_KEY => "--apikey";
@@ -54,6 +56,8 @@ public static class CxConstants
         public static string FLAG_ASYNC => "--async";
         public static string FLAG_INCREMENTAL => "--sast-incremental";
         public static string FLAG_RESUBMIT => "--resubmit";
+        public static string FLAG_QUERY_ID => "--query-id";
+
 
         /** EXCEPTIONS **/
         public static string EXCEPTION_CREDENTIALS_NOT_SET => "Credentials are not set";
@@ -83,5 +87,6 @@ public static class CxConstants
         public static string SCAN_RUNNING => "running";
         public static string SCAN_PARTIAL => "partial";
         public static string SCAN_COMPLETED => "completed";
+
     }
 }
diff --git a/ast-visual-studio-extension/CxWrapper/CxWrapper.cs b/ast-visual-studio-extension/CxWrapper/CxWrapper.cs
index 29dd5b2..292a2cb 100644
--- a/ast-visual-studio-extension/CxWrapper/CxWrapper.cs
+++ b/ast-visual-studio-extension/CxWrapper/CxWrapper.cs
@@ -384,6 +384,28 @@ public List<CodeBashing> CodeBashingList(string cweId, string language, string q
             return JsonConvert.DeserializeObject<List<CodeBashing>>(codebashingLink);
         }
 
+        /// <summary>
+        /// Learn More and Code Samples
+        /// </summary>
+        /// <param name="queryId"></param>
+        /// <returns></returns>
+        public List<LearnMore> LearnMoreAndRemediation(string queryId)
+        {
+            List<string> learnMoreRemediation = new List<string>
+            {
+                CxConstants.CLI_UTILS_CMD,
+                CxConstants.CLI_LEARN_MORE_CMD,
+                CxConstants.FLAG_QUERY_ID,
+                queryId,
+                CxConstants.FLAG_FORMAT,
+                CxConstants.JSON_FORMAT_VALUE,
+            };
+
+            string learnMoreRemediationSamples = Execution.ExecuteCommand(WithConfigArguments(learnMoreRemediation), Execution.CheckValidJSONString);
+
+            return JsonConvert.DeserializeObject<List<LearnMore>>(learnMoreRemediationSamples);
+        }
+
         /// <summary>
         /// Tenant settings command
         /// </summary>
diff --git a/ast-visual-studio-extension/CxWrapper/Models/LearnMore.cs b/ast-visual-studio-extension/CxWrapper/Models/LearnMore.cs
new file mode 100644
index 0000000..032b7de
--- /dev/null
+++ b/ast-visual-studio-extension/CxWrapper/Models/LearnMore.cs
@@ -0,0 +1,44 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace ast_visual_studio_extension.CxWrapper.Models
+{   
+    public class LearnMore {
+
+        [JsonProperty("queryId", NullValueHandling = NullValueHandling.Ignore)]
+        public string queryId;
+
+        [JsonProperty("queryName", NullValueHandling = NullValueHandling.Ignore)]
+        public string queryName;
+
+        [JsonProperty("queryDescriptionId", NullValueHandling = NullValueHandling.Ignore)]
+        public string queryDescriptionId;
+
+        [JsonProperty("resultDescription", NullValueHandling = NullValueHandling.Ignore)]
+        public string resultDescription;
+
+        [JsonProperty("risk", NullValueHandling = NullValueHandling.Ignore)]
+        public string risk;
+
+        [JsonProperty("cause", NullValueHandling = NullValueHandling.Ignore)]
+        public string cause;
+
+        [JsonProperty("generalRecommendations", NullValueHandling = NullValueHandling.Ignore)]
+        public string generalRecommendations;
+
+        [JsonProperty("samples", NullValueHandling = NullValueHandling.Ignore)]
+        public List<Sample> samples;
+    }
+
+    public class Sample
+    {
+        [JsonProperty("progLanguage", NullValueHandling = NullValueHandling.Ignore)]
+        public string progLanguage;
+
+        [JsonProperty("code", NullValueHandling = NullValueHandling.Ignore)]
+        public string code;
+
+        [JsonProperty("title", NullValueHandling = NullValueHandling.Ignore)]
+        public string title;
+    }
+}
diff --git a/ast-visual-studio-extension/ast-visual-studio-extension.csproj b/ast-visual-studio-extension/ast-visual-studio-extension.csproj
index f478a5d..75ff9cb 100644
--- a/ast-visual-studio-extension/ast-visual-studio-extension.csproj
+++ b/ast-visual-studio-extension/ast-visual-studio-extension.csproj
@@ -95,6 +95,7 @@
     <Compile Include="CxWrapper\CxConstants.cs" />
     <Compile Include="CxWrapper\Exceptions\CxException.cs" />
     <Compile Include="CxWrapper\Execution.cs" />
+    <Compile Include="CxWrapper\Models\LearnMore.cs" />
     <Compile Include="CxWrapper\Models\TenantSetting.cs" />
     <Compile Include="CxWrapper\Models\CodeBashing.cs" />
     <Compile Include="CxWrapper\Models\Comments.cs" />