Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AST-22257 - Adding support to critical vulnerabilities #147

Merged
merged 11 commits into from
Aug 28, 2024
Merged

AST-22257 - Adding support to critical vulnerabilities #147

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9e0f884
adding support to critical vulnerabilities
igorlombacx Nov 17, 2023
2e03153
fix for triate test
igorlombacx Nov 20, 2023
3469f5b
fixing tests..
igorlombacx Nov 20, 2023
f80967c
fix test
igorlombacx Nov 20, 2023
a7bb58b
fix tests
igorlombacx Nov 20, 2023
c19133a
updating icons
igorlombacx Nov 30, 2023
710788b
-Rebase with main
hmmachadocx Jul 2, 2024
b039959
Rebase with main branch
hmmachadocx Aug 22, 2024
827dd06
Fix triage update in order to properly display error messages
hmmachadocx Aug 27, 2024
abb66bf
Delete .idea directory
hmmachadocx Aug 27, 2024
a556c4c
Fix info icon and suggestions made in PR
hmmachadocx Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/.gitignore
View file
Open in desktop
hmmachadocx marked this conversation as resolved.
Show resolved Hide resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2,676 changes: 2,676 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions ast-visual-studio-extension-tests/cx-unit-tests/cx-wrapper-tests/ResultTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ public void TestResultsJSON()
{
List<Scan> scanList = cxWrapper.GetScans("statuses=Completed");
Assert.True(scanList.Any());
Scan scan = scanList.FirstOrDefault(scan => scan.Status.ToLower() == "completed");
hmmachadocx marked this conversation as resolved.
Show resolved Hide resolved

string scanId = scanList[0].ID;
string scanId = scan.ID;
string results = cxWrapper.GetResults(scanId, ReportFormat.json);

Assert.True(!string.IsNullOrEmpty(results));
Expand All @@ -51,8 +52,9 @@ public void TestResultsStructure()
{
List<Scan> scanList = cxWrapper.GetScans("statuses=Completed");
Assert.True(scanList.Any());
List<Scan> completedScans = scanList.Where(scan => scan.Status.Equals("completed", StringComparison.OrdinalIgnoreCase)).ToList();

Results results = GetFirstScanWithResults(scanList).First().Value;
Results results = GetFirstScanWithResults(completedScans).First().Value;

Assert.Equal(results.totalCount, results.results.Count);
}
Expand Down
29 changes: 17 additions & 12 deletions ast-visual-studio-extension/CxExtension/CxWindowControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,18 +440,22 @@
<Separator Style="{StaticResource SeparatorStyle}" />
</StackPanel>

<ToggleButton ToolTip="High" Style="{StaticResource SeverityFilterStyle}" x:Name="HighSeverityFilter" Click="SeverityFilter_Click">
<Image x:Name="HighSeverityFilterImage" Stretch="None"></Image>
</ToggleButton>
<ToggleButton ToolTip="Medium" Style="{StaticResource SeverityFilterStyle}" x:Name="MediumSeverityFilter" Click="SeverityFilter_Click">
<Image x:Name="MediumSeverityFilterImage" Stretch="None"></Image>
</ToggleButton>
<ToggleButton ToolTip="Low" Style="{StaticResource SeverityFilterStyle}" x:Name="LowSeverityFilter" Click="SeverityFilter_Click">
<Image x:Name="LowSeverityFilterImage" Stretch="None"></Image>
</ToggleButton>
<ToggleButton ToolTip="Info" Style="{StaticResource SeverityFilterStyle}" x:Name="InfoSeverityFilter" Click="SeverityFilter_Click">
<Image x:Name="InfoSeverityFilterImage" Stretch="None"></Image>
</ToggleButton>

<ToggleButton ToolTip="Critical" Style="{StaticResource SeverityFilterStyle}" x:Name="CriticalSeverityFilter" Click="SeverityFilter_Click">
<Image x:Name="CriticalSeverityFilterImage" Stretch="None"></Image>
</ToggleButton>
<ToggleButton ToolTip="High" Style="{StaticResource SeverityFilterStyle}" x:Name="HighSeverityFilter" Click="SeverityFilter_Click">
<Image x:Name="HighSeverityFilterImage" Stretch="None"></Image>
</ToggleButton>
<ToggleButton ToolTip="Medium" Style="{StaticResource SeverityFilterStyle}" x:Name="MediumSeverityFilter" Click="SeverityFilter_Click">
<Image x:Name="MediumSeverityFilterImage" Stretch="None"></Image>
</ToggleButton>
<ToggleButton ToolTip="Low" Style="{StaticResource SeverityFilterStyle}" x:Name="LowSeverityFilter" Click="SeverityFilter_Click">
<Image x:Name="LowSeverityFilterImage" Stretch="None"></Image>
</ToggleButton>
<ToggleButton ToolTip="Info" Style="{StaticResource SeverityFilterStyle}" x:Name="InfoSeverityFilter" Click="SeverityFilter_Click">
<Image x:Name="InfoSeverityFilterImage" Stretch="None"></Image>
</ToggleButton>

<Menu Background="Transparent">
<MenuItem ToolTip="Filter by state" Style="{DynamicResource DefaultMenuItemStyle}" Padding="0" Margin="2,5,2,5">
Expand Down Expand Up @@ -548,6 +552,7 @@

<UniformGrid Rows="1" Columns="3">
<ComboBox IsEditable="True" IsReadOnly="True" Name="TriageSeverityCombobox" Margin="5,5,0,0">
<ComboBoxItem>CRITICAL</ComboBoxItem>
<ComboBoxItem>HIGH</ComboBoxItem>
<ComboBoxItem>MEDIUM</ComboBoxItem>
<ComboBoxItem>LOW</ComboBoxItem>
Expand Down
2 changes: 2 additions & 0 deletions ast-visual-studio-extension/CxExtension/CxWindowControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,14 @@ public CxWindowControl(AsyncPackage package)
.WithResultsTree(TreeViewResults)
.WithSeverityFilters(new Dictionary<ToggleButton, Severity>
{
{ CriticalSeverityFilter, Severity.CRITICAL },
{ HighSeverityFilter, Severity.HIGH },
{ MediumSeverityFilter , Severity.MEDIUM},
{ LowSeverityFilter, Severity.LOW },
{ InfoSeverityFilter, Severity.INFO },
}, new Dictionary<Severity, Image>
{
{ Severity.CRITICAL, CriticalSeverityFilterImage },
{ Severity.HIGH, HighSeverityFilterImage },
{ Severity.MEDIUM, MediumSeverityFilterImage },
{ Severity.LOW, LowSeverityFilterImage },
Expand Down
1 change: 1 addition & 0 deletions ast-visual-studio-extension/CxExtension/Enums/Severity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
public enum Severity
{
CRITICAL,
HIGH,
MEDIUM,
LOW,
Expand Down
Binary file added ast-visual-studio-extension/CxExtension/Resources/C-L.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ast-visual-studio-extension/CxExtension/Resources/H-L.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ast-visual-studio-extension/CxExtension/Resources/I-L.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ast-visual-studio-extension/CxExtension/Resources/L-L.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ast-visual-studio-extension/CxExtension/Resources/M-L.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ast-visual-studio-extension/CxExtension/Resources/critical.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ast-visual-studio-extension/CxExtension/Resources/critical_18x22.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ast-visual-studio-extension/CxExtension/Resources/critical_title.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ast-visual-studio-extension/CxExtension/Resources/high.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ast-visual-studio-extension/CxExtension/Resources/info.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ast-visual-studio-extension/CxExtension/Resources/low.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ast-visual-studio-extension/CxExtension/Resources/medium.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions ast-visual-studio-extension/CxExtension/Utils/CxConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ internal class CxConstants
public static string COLLAPSE_CRUMB => "...";

/************ ICONS ************/
public static string ICON_CRITICAL => "critical.png";
public static string ICON_CRITICAL_TITLE => "C-L.png";
public static string ICON_HIGH => "high.png";
public static string ICON_HIGH_TITLE => "high_18x22.png";
public static string ICON_HIGH_TITLE => "H-L.png";
public static string ICON_MEDIUM => "medium.png";
public static string ICON_MEDIUM_TITLE => "medium_18x22.png";
public static string ICON_MEDIUM_TITLE => "M-L.png";
public static string ICON_LOW => "low.png";
public static string ICON_LOW_TITLE => "low_18x22.png";
public static string ICON_LOW_TITLE => "L-L.png";
public static string ICON_INFO => "info.png";
public static string ICON_INFO_TITLE => "info_18x22.png";
public static string ICON_INFO_TITLE => "I-L.png";
public static string ICON_FLAG => "Flag.png";
public static string ICON_COMMENT => "Comment.png";
public static string ICON_CX_LOGO_INITIAL_PANEL => "checkmarx-80.png";
Expand Down
4 changes: 3 additions & 1 deletion ast-visual-studio-extension/CxExtension/Utils/CxUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ internal class CxUtils
public static string GetIconPathFromSeverity(string severity, Boolean iconForTitle)
{
switch (GetSeverityFromString(severity))
{
{
case Severity.CRITICAL:
return Path.Combine(CxConstants.RESOURCES_BASE_DIR, iconForTitle ? CxConstants.ICON_CRITICAL_TITLE : CxConstants.ICON_CRITICAL);
case Severity.HIGH:
return Path.Combine(CxConstants.RESOURCES_BASE_DIR, iconForTitle ? CxConstants.ICON_HIGH_TITLE : CxConstants.ICON_HIGH);
case Severity.MEDIUM:
Expand Down
1 change: 1 addition & 0 deletions ast-visual-studio-extension/CxExtension/Utils/SettingsUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class SettingsUtils

public static readonly Dictionary<object, bool> severityDefaultValues = new Dictionary<object, bool>
{
{ Severity.CRITICAL, true},
{ Severity.HIGH, true },
{ Severity.MEDIUM, true },
{ Severity.LOW, false },
Expand Down
3 changes: 3 additions & 0 deletions ast-visual-studio-extension/CxWrapper/Models/ResultsSummary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ public class ResultsSummary
[JsonProperty("TotalIssues")]
public int TotalIssues { get; set; }

[JsonProperty("CriticalIssues")]
public int CriticalIssues { get; set; }

[JsonProperty("HighIssues")]
public int HighIssues { get; set; }

Expand Down
15 changes: 14 additions & 1 deletion ast-visual-studio-extension/ast-visual-studio-extension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,20 @@
<PackageReference Include="System.Json" Version="4.7.1" />
</ItemGroup>
<ItemGroup>
<Resource Include="CxExtension\Resources\critical.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="CxExtension\Resources\critical_18x22.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="CxExtension\Resources\critical_title.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="CxExtension\Resources\C-L.png" />
<Resource Include="CxExtension\Resources\H-L.png" />
<Resource Include="CxExtension\Resources\I-L.png" />
<Resource Include="CxExtension\Resources\L-L.png" />
<Resource Include="CxExtension\Resources\M-L.png" />
<Content Include="LICENSE.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
Expand All @@ -191,7 +205,6 @@
</Content>
<Resource Include="CxExtension\Resources\checkmarx-80.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Resource>
<Resource Include="CxExtension\Resources\Comment.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down
Loading