Merge branch 'automatic-analyzer'

Author: AshleyPoole

SSLLWrapper/Models/Response/BaseSubModels/Wrapper.cs

@@ -0,0 +1,8 @@
+namespace SSLLWrapper.Models.Response.BaseSubModels
+{
+	public class Wrapper
+	{
+		public int ApiPassCount { get; set; }
+		public string ApiCommandUrl { get; set; }
+	}
+}

SSLLabsApiWrapper/Domain/ResponsePopulation.cs

@@ -23,6 +23,7 @@ public Info InfoModel(WebResponseModel webResponse, Info infoModel)
 
 			infoModel = JsonConvert.DeserializeObject<Info>(webResponse.Payloay, JsonSerializerSettings);
 			infoModel.Header = PopulateHeader(infoModel.Header, webResponse);
+			infoModel.Wrapper.ApiCommandUrl = webResponse.Url;
 
 			return infoModel;
 		}
@@ -31,6 +32,7 @@ public Analyze AnalyzeModel(WebResponseModel webResponse, Analyze analyzeModel)
 		{
 			analyzeModel = JsonConvert.DeserializeObject<Analyze>(webResponse.Payloay, JsonSerializerSettings);
 			analyzeModel.Header = PopulateHeader(analyzeModel.Header, webResponse);
+			analyzeModel.Wrapper.ApiCommandUrl = webResponse.Url;
 
 			if (analyzeModel.status == "ERROR") { analyzeModel.Errors.Add(new Error() { message = analyzeModel.statusMessage }); }
 
@@ -41,6 +43,7 @@ public Endpoint EndpointModel(WebResponseModel webResponse, Endpoint endpointMod
 		{
 			endpointModel = JsonConvert.DeserializeObject<Endpoint>(webResponse.Payloay, JsonSerializerSettings);
 			endpointModel.Header = PopulateHeader(endpointModel.Header, webResponse);
+			endpointModel.Wrapper.ApiCommandUrl = webResponse.Url;
 
 			return endpointModel;
 		}
@@ -49,6 +52,7 @@ public StatusCodes StatusCodesModel(WebResponseModel webResponse, StatusCodes st
 		{
 			statusCodes = JsonConvert.DeserializeObject<StatusCodes>(webResponse.Payloay, JsonSerializerSettings);
 			statusCodes.Header = PopulateHeader(statusCodes.Header, webResponse);
+			statusCodes.Wrapper.ApiCommandUrl = webResponse.Url;
 
 			return statusCodes;
 		}

SSLLabsApiWrapper/External/SSLLabsApi.cs

@@ -29,6 +29,7 @@ public WebResponseModel MakeGetRequest(RequestModel requestModel)
 			webResponseModel.Payloay = streamReader.ReadToEnd();
 			webResponseModel.StatusCode = (int)response.StatusCode;
 			webResponseModel.StatusDescription = response.StatusDescription;
+			webResponseModel.Url = url;
 
 			return webResponseModel;
 		}

SSLLabsApiWrapper/Interfaces/IBaseResponse.cs

@@ -8,5 +8,6 @@ public interface IBaseResponse
 		Header Header { get; set; }
 		bool HasErrorOccurred { get; set; }
 		List<Error> Errors { get; set; }
+		Wrapper Wrapper { get; set; }
 	}
 }

SSLLabsApiWrapper/Models/Response/BaseModel.cs

@@ -9,11 +9,13 @@ public class BaseModel : IBaseResponse
 		public Header Header { get; set; }
 		public bool HasErrorOccurred { get; set; }
 		public List<Error> Errors { get; set; }
+		public Wrapper Wrapper { get; set; }
 
 		public BaseModel()
 		{
 			Header = new Header();
 			Errors = new List<Error>();
+			Wrapper = new Wrapper();
 			this.HasErrorOccurred = false;
 		}
 	}

SSLLabsApiWrapper/SSLLabsApiService.cs

@@ -137,8 +137,9 @@ public Analyze AutomaticAnalyze(string host, int maxWaitInterval, int sleepInter
 
 		public Analyze AutomaticAnalyze(string host, Publish publish, ClearCache clearCache, FromCache fromCache, All all, int maxWaitInterval, int sleepInterval)
 	    {
-		    var startTime = DateTime.Now;
+			var startTime = DateTime.Now;
 			var sleepIntervalMilliseconds = sleepInterval * 1000;
+			var apiPassCount = 1;
 			var analyzeModel = Analyze(host, publish, clearCache, fromCache, all);
 
 			// Ignoring cache settings after first request to prevent loop
@@ -148,9 +149,12 @@ public Analyze AutomaticAnalyze(string host, Publish publish, ClearCache clearCa
 			while (analyzeModel.HasErrorOccurred == false && analyzeModel.status != "READY" && (DateTime.Now - startTime).TotalSeconds < maxWaitInterval)
 			{
 				Thread.Sleep(sleepIntervalMilliseconds);
+				apiPassCount ++;
 				analyzeModel = Analyze(host, publish, clearCache, fromCache, all);
 		    }
 
+			analyzeModel.Wrapper.ApiPassCount = apiPassCount;
+
 			return analyzeModel;
 	    }
 

SSLLabsApiWrapper/SSLLabsApiWrapper.csproj

@@ -46,6 +46,7 @@
   <ItemGroup>
     <Compile Include="External\SSLLabsApi.cs" />
     <Compile Include="Interfaces\IBaseResponse.cs" />
+    <Compile Include="Models\Response\BaseSubModels\Wrapper.cs" />
     <Compile Include="Models\Response\StatusCodes.cs" />
     <Compile Include="Models\WebResponseModel.cs" />
     <Compile Include="SSLLabsApiService.cs" />