Merge branch 'develop'

Todd Lair · Todd Lair · commit 2c8c089a5148 · 2022-06-22T08:42:29.000-05:00
diff --git a/README.md b/README.md
@@ -87,6 +87,21 @@ static void StackifyAPILogger_OnLogMessage(string data)
 }
 ```
 
+## Additional Settings
+
+These settings are available to further customize what information is captured and transmitted to Stackify.
+
+```xml
+<appSettings>
+       <add key="Stackify.CaptureErrorHeaders" value="true" />
+       <add key="Stackify.CaptureServerVariables" value="false" />
+       <add key="Stackify.CaptureSessionVariables" value="false" />
+       <add key="Stackify.CaptureErrorCookies" value="false" />
+       <add key="Stackify.CaptureErrorUserName" value="true" />
+       <add key="Stackify.CaptureErrorPostdata" value="false" />
+</appSettings>
+```
+
 
 ## Errors and Logs
 
diff --git a/Src/NLog.Targets.Stackify/Properties/AssemblyInfo.cs b/Src/NLog.Targets.Stackify/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyKeyFileAttribute("..\\StackifyLib\\Netreo.snk")]
+//[assembly: AssemblyKeyFile("..\\StackifyLib\\Netreo.snk")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
diff --git a/Src/StackifyLib.AspNetCore/Properties/AssemblyInfo.cs b/Src/StackifyLib.AspNetCore/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyCompany("Stackify")]
 [assembly: AssemblyProduct("StackifyLib.AspNetCore")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyKeyFileAttribute("..\\StackifyLib\\Netreo.snk")]
+//[assembly: AssemblyKeyFile("..\\StackifyLib\\Netreo.snk")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
diff --git a/Src/StackifyLib.CoreLogger/Properties/AssemblyInfo.cs b/Src/StackifyLib.CoreLogger/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyCompany("Stackify")]
 [assembly: AssemblyProduct("StackifyLib.CoreLogger")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyKeyFileAttribute("..\\StackifyLib\\Netreo.snk")]
+//[assembly: AssemblyKeyFile("..\\StackifyLib\\Netreo.snk")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
diff --git a/Src/StackifyLib.ELMAH/Properties/AssemblyInfo.cs b/Src/StackifyLib.ELMAH/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyKeyFileAttribute("..\\StackifyLib\\Netreo.snk")]
+//[assembly: AssemblyKeyFile("..\\StackifyLib\\Netreo.snk")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
diff --git a/Src/StackifyLib.StackifyTraceListener/Properties/AssemblyInfo.cs b/Src/StackifyLib.StackifyTraceListener/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyCompany("Stackify")]
 [assembly: AssemblyProduct("StackifyLib.StackifyTraceListener")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyKeyFileAttribute("..\\StackifyLib\\Netreo.snk")]
+//[assembly: AssemblyKeyFile("..\\StackifyLib\\Netreo.snk")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
diff --git a/Src/StackifyLib.log4net/Properties/AssemblyInfo.cs b/Src/StackifyLib.log4net/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyKeyFileAttribute("..\\StackifyLib\\Netreo.snk")]
+//[assembly: AssemblyKeyFile("..\\StackifyLib\\Netreo.snk")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
diff --git a/Src/StackifyLib/Config.cs b/Src/StackifyLib/Config.cs
@@ -62,6 +62,10 @@ public static void LoadSettings()
 
                 CaptureErrorCookies = Get("Stackify.CaptureErrorCookies", bool.FalseString).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
 
+                CaptureErrorUserName = Get("Stackify.CaptureErrorUserName", bool.TrueString).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
+
+                CaptureErrorPostdata = Get("Stackify.CaptureErrorPostdata", bool.FalseString).Equals(bool.TrueString, StringComparison.CurrentCultureIgnoreCase);
+
                 ApiKey = Get("Stackify.ApiKey", ApiKey ?? string.Empty);
 
                 AppName = Get("Stackify.AppName", AppName ?? string.Empty);
@@ -183,21 +187,14 @@ public static void LoadSettings()
         public static bool CaptureErrorPostdata { get; set; }
         public static bool CaptureErrorHeaders { get; set; } = true;
         public static bool CaptureErrorCookies { get; set; }
-
+        public static bool CaptureErrorUserName { get; set; } = true;
         public static string CaptureErrorSessionWhitelist { get; set; }
-
         public static string CaptureErrorHeadersWhitelist { get; set; }
-
         public static string CaptureErrorHeadersBlacklist { get; set; } = "cookie,authorization";
-
         public static string CaptureErrorCookiesWhitelist { get; set; }
-
         public static string CaptureErrorCookiesBlacklist { get; set; } = ".ASPXAUTH";
-
         public static int Ec2InstanceMetadataUpdateThresholdMinutes { get; set; } = 60;
-
         public static bool? IsEc2 { get; set; }
-
         public static bool? ApiLog { get; set; }
 
         public static int LoggingJsonMaxFields { get; set; } = 50;
diff --git a/Src/StackifyLib/Properties/AssemblyInfo.cs b/Src/StackifyLib/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: AssemblyCopyright("Copyright © 2018-2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyKeyFileAttribute("Netreo.snk")]
+//[assembly: AssemblyKeyFile("Netreo.snk")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
diff --git a/Src/StackifyLib/StackifyError.cs b/Src/StackifyLib/StackifyError.cs
@@ -153,7 +153,7 @@ private void Init()
                 {
                     WebRequestDetail = new WebRequestDetail(this);
 
-                    if (HttpContext.Current.User != null && HttpContext.Current.User.Identity != null)
+                    if (Config.CaptureErrorUserName && HttpContext.Current.User != null && HttpContext.Current.User.Identity != null)
                     {
                         UserName = HttpContext.Current.User.Identity.Name;
                     }
@@ -163,7 +163,7 @@ private void Init()
 #else
             WebRequestDetail = new WebRequestDetail(this);
 #endif
-
+            
             //Fire event
             OnCaptureDetail?.Invoke(this);
 
diff --git a/Src/StackifyLib/StackifyLib.csproj b/Src/StackifyLib/StackifyLib.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyTitle>Stackify API</AssemblyTitle>
-    <VersionPrefix>2.2.7</VersionPrefix>
+    <VersionPrefix>2.2.9</VersionPrefix>
     <TargetFrameworks>netstandard2.0;net40;net45;net451;net452;net46;net461;net462</TargetFrameworks>
     <AssemblyName>StackifyLib</AssemblyName>
     <PackageId>StackifyLib</PackageId>
@@ -13,15 +13,15 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <Version>2.2.7</Version>
+    <Version>2.2.9</Version>
     <Authors>StackifyLib</Authors>
     <PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/stackify/stackify-api-dotnet</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageIconUrl>https://stackify.com/wp-content/uploads/2017/02/stk.png</PackageIconUrl>
-    <AssemblyVersion>2.2.7.0</AssemblyVersion>
-    <FileVersion>2.2.7.0</FileVersion>
+    <AssemblyVersion>2.2.9.0</AssemblyVersion>
+    <FileVersion>2.2.9.0</FileVersion>
     <PackageReleaseNotes>Remove default internal file logger</PackageReleaseNotes>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
diff --git a/Src/StackifyLib/Web/RealUserMonitoring.cs b/Src/StackifyLib/Web/RealUserMonitoring.cs
@@ -1,6 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
+using System.Security.Cryptography;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using StackifyLib.Utils;
@@ -9,6 +8,8 @@ namespace StackifyLib.Web
 {
     public static class RealUserMonitoring
     {
+        private static readonly RandomNumberGenerator Rng = new RNGCryptoServiceProvider();
+
         public static string GetHeaderScript()
         {
             var rumScriptUrl = Config.RumScriptUrl;
@@ -51,8 +52,13 @@ public static string GetHeaderScript()
                 settings["Trans"] = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(reportingUrl));
             }
 
-            return string.Format(@"<script type=""text/javascript"">(window.StackifySettings || (window.StackifySettings = {0}))</script><script src=""{1}"" data-key=""{2}"" async></script>",
-                settings.ToString(Formatting.None), rumScriptUrl, rumKey);
+            // generate nonce for strict CSP rules
+            var nonceBytes = new byte[20];
+            Rng.GetNonZeroBytes(nonceBytes);
+            var nonce = Convert.ToBase64String(nonceBytes);
+
+            return string.Format("<script type=\"text/javascript\" nonce=\"{3}\">(window.StackifySettings || (window.StackifySettings = {0}))</script><script src=\"{1}\" data-key=\"{2}\" async></script>",
+                settings.ToString(Formatting.None), rumScriptUrl, rumKey, nonce);
         }
     }
 }
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -43,7 +43,16 @@ steps:
     inputs:
       targetType: inline
       script: >
-        (Get-Content -path Src\StackifyLib\StackifyLib.csproj -Raw) -replace '<PackageId>StackifyLib</PackageId>','<PackageId>StackifyLib.signed</PackageId>' | Set-Content -Path Src\StackifyLib\StackifyLib.csproj
+        (Get-Content -path Src\StackifyLib\StackifyLib.csproj -Raw) -replace '<PackageId>StackifyLib</PackageId>','<PackageId>StackifyLib.signed</PackageId>' | Set-Content -Path Src\StackifyLib\StackifyLib.csproj -Encoding utf8
+  
+  # note: the signing attribute here is commented out so we can build locally
+  - powershell: |
+      $filename = Get-ChildItem ".\src\*\AssemblyInfo.cs" -Recurse
+      $filename | %{
+         (gc $_) -replace ([regex]::Escape("//[assembly: AssemblyKeyFile")), "[assembly: AssemblyKeyFile" | Set-Content $_.FullName -Encoding utf8
+      }
+    displayName: Uncoment signing attribute
+  
   - task: PowerShell@2
     displayName: 'Setup Code Signing'
     inputs:

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ private void Init()`
`153`	`153`	`{`
`154`	`154`	`WebRequestDetail = new WebRequestDetail(this);`
`155`	`155`
`156`		`- if (HttpContext.Current.User != null && HttpContext.Current.User.Identity != null)`
	`156`	`+ if (Config.CaptureErrorUserName && HttpContext.Current.User != null && HttpContext.Current.User.Identity != null)`
`157`	`157`	`{`
`158`	`158`	`UserName = HttpContext.Current.User.Identity.Name;`
`159`	`159`	`}`
`@@ -163,7 +163,7 @@ private void Init()`
`163`	`163`	`#else`
`164`	`164`	`WebRequestDetail = new WebRequestDetail(this);`
`165`	`165`	`#endif`
`166`		`-`
	`166`	`+`
`167`	`167`	`//Fire event`
`168`	`168`	`OnCaptureDetail?.Invoke(this);`
`169`	`169`