Skip to content

Rename analysis file cli parameter to be AnalysisFile instead of "fil… #646

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

Draft
gfs wants to merge 2 commits into
base: release/v2.3
Choose a base branch
from
Draft

Rename analysis file cli parameter to be AnalysisFile instead of "fil… #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12e2d0c
Rename analysis file cli parameter to be AnalysisFile instead of "fil…
gfs Mar 11, 2022
e8748ad
Clean up leftovers from debugging #638
gfs Mar 11, 2022
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
24 changes: 3 additions & 21 deletions Cli/AttackSurfaceAnalyzerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@ public static List<BaseCompare> GetComparators()

Dictionary<string, string> EndEvent = new();
BaseCompare c = new();
var watch = System.Diagnostics.Stopwatch.StartNew();
Stopwatch watch = Stopwatch.StartNew();
if (!c.TryCompare(opts.FirstRunId, opts.SecondRunId, DatabaseManager))
{
Log.Warning(Strings.Get("Err_Comparing") + " : {0}", c.GetType().Name);
Expand Down Expand Up @@ -1179,10 +1179,6 @@ public static List<BaseCompare> GetComparators()
{
if (c.Results[key] is IEnumerable<CompareResult> queue)
{
if (queue.Any(x => x is null))
{
Console.WriteLine("found em");
}
IEnumerable<AsaRule> platformRules = opts.AnalysesFile.Rules.Where(rule => rule.Platforms == null || rule.Platforms.Contains(platform));
if (opts.SingleThreadAnalysis)
{
Expand All @@ -1204,22 +1200,8 @@ void PopulateAnalysisForResult(CompareResult res)
var selectedRules = platformRules.Where((rule) =>
(rule.ChangeTypes == null || rule.ChangeTypes.Contains(res.ChangeType))
&& (rule.ResultType == res.ResultType));
if (res is null)
{
return;
}
Log.Verbose("Type: {0}", res.ResultType);
Log.Verbose("Base: {0}", JsonConvert.SerializeObject(res.Base));
Log.Verbose("Compare: {0}", JsonConvert.SerializeObject(res.Compare));
Log.Verbose("Num Rules: {0}", selectedRules.Count());
try
{
res.Rules = analyzer.Analyze(selectedRules, res.Base, res.Compare).ToList();
}
catch(Exception ex)
{
Log.Debug("Exception while analyzing object {3}. Use --verbose for object details. {0}:{1}. {2}.", ex.GetType().Name, ex.Message, ex.StackTrace, res.Identity);
}

res.Rules = analyzer.Analyze(selectedRules, res.Base, res.Compare).ToList();
Log.Verbose("Applied Rules: {0}", res.Rules);

res.Analysis = res.Rules.Count
Expand Down
2 changes: 1 addition & 1 deletion Lib/Objects/CommandOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public class ExportGuidedCommandOptions : ExportMonitorCommandOptions

public class ExportOptions : CommandOptions
{
[Option("filename", HelpText = "Custom analysis rules file.")]
[Option(HelpText = "Custom analysis rules file.")]
public string? AnalysesFile { get; set; }

[Option(HelpText = "Set to Disable Analysis.")]
Expand Down