Merge pull request #110 from allisterb/v3.x_issue107

Upgrade testing
sonatype-nexus-community · Apr 10, 2019 · 7e2b4ea · 7e2b4ea
2 parents 0ee8e84 + 126ac3c
commit 7e2b4ea
Show file tree

Hide file tree

Showing 59 changed files with 8,881 additions and 2,642 deletions.
diff --git a/DevAudit.AuditLibrary/Analyzer.cs b/DevAudit.AuditLibrary/Analyzer.cs
diff --git a/...AuditLibrary/DataSources/HttpException.cs → DevAudit.AuditLibrary/Audit/HttpException.cs b/...AuditLibrary/DataSources/HttpException.cs → DevAudit.AuditLibrary/Audit/HttpException.cs
diff --git a/DevAudit.AuditLibrary/Audit/Utility.cs b/DevAudit.AuditLibrary/Audit/Utility.cs
diff --git a/DevAudit.AuditLibrary/Base/AuditEnvironment.cs b/DevAudit.AuditLibrary/Base/AuditEnvironment.cs
@@ -812,6 +812,7 @@ internal void Error(AggregateException ae)
                 }
             }
         }
+
 
         [DebuggerStepThrough]
         internal void Error(AggregateException ae, string message_format, params object[] message)

diff --git a/DevAudit.AuditLibrary/Base/AuditTarget.cs b/DevAudit.AuditLibrary/Base/AuditTarget.cs
@@ -44,7 +44,7 @@ public AuditTarget(Dictionary<string, object> audit_options, EventHandler<Enviro
             if (ReferenceEquals(audit_options, null)) throw new ArgumentNullException("audit_options");
             this.AuditOptions = audit_options;
 
-            #region Initialise host environment
+            #region Setup host environment
             if (this.AuditOptions.ContainsKey("HostEnvironment"))
             {
                 this.HostEnvironment = (LocalEnvironment)this.AuditOptions["HostEnvironment"];
@@ -64,7 +64,7 @@ public AuditTarget(Dictionary<string, object> audit_options, EventHandler<Enviro
             }
             #endregion
 
-            #region Initialise audit environment
+            #region Setup audit environment
             if (this.AuditOptions.ContainsKey("AuditEnvironment"))
             {
                 this.AuditEnvironment = (AuditEnvironment)this.AuditOptions["AuditEnvironment"];
@@ -330,25 +330,48 @@ public AuditTarget(Dictionary<string, object> audit_options, EventHandler<Enviro
             }
             #endregion
 
+            #region Setup data source options
+            if (this.AuditOptions.ContainsKey("NoCache"))
+            {
+                this.DataSourceOptions.Add("NoCache", true);
+            }
+
+            if (this.AuditOptions.ContainsKey("DeleteCache"))
+            {
+                this.DataSourceOptions.Add("DeleteCache", true);
+            }
+
             if (this.AuditOptions.ContainsKey("HttpsProxy"))
             {
-                this.HostEnvironment.Info("Using proxy {0}.", ((Uri)AuditOptions["HttpsProxy"]).AbsoluteUri);
+                DataSourceOptions.Add("HttpsProxy", (Uri)this.AuditOptions["HttpsProxy"]);
             }
+
             if (this.AuditOptions.ContainsKey("IgnoreHttpsCertErrors"))
             {
                 this.DataSourceOptions.Add("IgnoreHttpsCertErrors", true);
             }
+
             if (this.AuditOptions.ContainsKey("WithOSSI")) 
             {
-                // this.DataSources.Add(new OSSIndexDataSource(this, this.DataSourceOptions));
                 this.DataSources.Add(new OSSIndexApiv3DataSource(this, DataSourceOptions));
             }
+
             if (this.AuditOptions.ContainsKey("WithVulners"))
             {
                 this.DataSources.Add(new VulnersDataSource(this, DataSourceOptions));
             }
+            #endregion
+
+            #region Setup audit profile
+            if (this.AuditEnvironment.FileExists("devaudit.yml"))
+            {
+                this.AuditProfile = new AuditProfile(this.AuditEnvironment, this.AuditEnvironment.ConstructFile("devaudit.yml"));
+            }
+
+            #endregion
         }
 
+        #region Event Handlers
         private void AuditTarget_HostEnvironmentMessageHandler(object sender, EnvironmentEventArgs e)
         {
             e.EnvironmentLocation = "HOST";
@@ -368,6 +391,8 @@ private void AuditTarget_ScriptEnvironmentMessageHandler(object sender, Environm
         }
         #endregion
 
+        #endregion
+
         #region Events
         protected event EventHandler<EnvironmentEventArgs> HostEnvironmentMessage;
         protected event EventHandler<EnvironmentEventArgs> AuditEnvironmentMessage;
@@ -492,6 +517,5 @@ protected virtual void Dispose(bool isDisposing)
             Dispose(false);
         }
         #endregion
-
     }
-}
+}