Updates to support EU General Data Protection Regulations for 2018

Author: niemyjski

src/Exceptionless/Plugins/Default/050_EnvironmentInfoPlugin.cs

@@ -16,6 +16,9 @@ public void Run(EventPluginContext context) {
                     return;
 
                 var info = collector.GetEnvironmentInfo();
+                if (!context.Client.Configuration.IncludePrivateInformation)
+                    info.IpAddress = null;
+
                 info.InstallId = context.Client.Configuration.GetInstallId();
                 context.Event.Data[Event.KnownDataKeys.EnvironmentInfo] = info;
             } catch (Exception ex) {

src/Platforms/Exceptionless.AspNetCore/ExceptionlessExtensions.cs

@@ -89,7 +89,7 @@ public static void ReadFromConfiguration(this ExceptionlessConfiguration config,
         /// <param name="context">The http context to gather information from.</param>
         /// <param name="config">The config.</param>
         public static RequestInfo GetRequestInfo(this HttpContext context, ExceptionlessConfiguration config) {
-            return RequestInfoCollector.Collect(context, config.DataExclusions);
+            return RequestInfoCollector.Collect(context, config);
         }
 
         /// <summary>

src/Platforms/Exceptionless.AspNetCore/RequestInfoCollector.cs

@@ -11,17 +11,19 @@
 
 namespace Exceptionless.AspNetCore {
     internal static class RequestInfoCollector {
-        public static RequestInfo Collect(HttpContext context, IEnumerable<string> exclusions) {
+        public static RequestInfo Collect(HttpContext context, ExceptionlessConfiguration config) {
             if (context == null)
                 return null;
 
             var info = new RequestInfo {
-                ClientIpAddress = context.GetClientIpAddress(),
                 HttpMethod = context.Request.Method,
                 IsSecure = context.Request.IsHttps,
                 Path = context.Request.Path.HasValue ? context.Request.Path.Value : "/",
             };
 
+            if (config.IncludePrivateInformation)
+                info.ClientIpAddress = context.GetClientIpAddress();
+
             if (!String.IsNullOrEmpty(context.Request.Host.Host))
                 info.Host = context.Request.Host.Host;
 
@@ -34,7 +36,7 @@ public static RequestInfo Collect(HttpContext context, IEnumerable<string> exclu
             if (context.Request.Headers.ContainsKey(HeaderNames.Referer))
                 info.Referrer = context.Request.Headers[HeaderNames.Referer].ToString();
 
-            var exclusionList = exclusions as string[] ?? exclusions.ToArray();
+            var exclusionList = config.DataExclusions as string[] ?? config.DataExclusions.ToArray();
             info.Cookies = context.Request.Cookies.ToDictionary(exclusionList);
             info.QueryString = context.Request.Query.ToDictionary(exclusionList);
 

src/Platforms/Exceptionless.Nancy/ExceptionlessNancyExtensions.cs

@@ -65,7 +65,7 @@ private static void AfterRequest(NancyContext context) {
         /// <param name="context">The nancy context to gather information from.</param>
         /// <param name="config">The config.</param>
         public static RequestInfo GetRequestInfo(this NancyContext context, ExceptionlessConfiguration config) {
-            return RequestInfoCollector.Collect(context, config.DataExclusions);
+            return RequestInfoCollector.Collect(context, config);
         }
 
         public static Event AddRequestInfo(this Event ev, NancyContext context) {

src/Platforms/Exceptionless.Nancy/RequestInfoCollector.cs

@@ -9,15 +9,17 @@
 
 namespace Exceptionless.ExtendedData {
     internal static class RequestInfoCollector {
-        public static RequestInfo Collect(NancyContext context, IEnumerable<string> exclusions) {
+        public static RequestInfo Collect(NancyContext context, ExceptionlessConfiguration config) {
             if (context == null)
                 return null;
 
             var info = new RequestInfo {
-                ClientIpAddress = context.Request.UserHostAddress,
                 HttpMethod = context.Request.Method
             };
 
+            if (config.IncludePrivateInformation)
+                info.ClientIpAddress = context.Request.UserHostAddress;
+
             if (!String.IsNullOrWhiteSpace(context.Request.Headers.UserAgent))
                 info.UserAgent = context.Request.Headers.UserAgent;
 
@@ -31,7 +33,7 @@ public static RequestInfo Collect(NancyContext context, IEnumerable<string> excl
             if (!String.IsNullOrWhiteSpace(context.Request.Headers.Referrer))
                 info.Referrer = context.Request.Headers.Referrer;
 
-            var exclusionsArray = exclusions as string[] ?? exclusions.ToArray();
+            var exclusionsArray = config.DataExclusions as string[] ?? config.DataExclusions.ToArray();
             info.Cookies = context.Request.Cookies.ToDictionary(exclusionsArray);
 
             if (context.Request.Url != null && !String.IsNullOrWhiteSpace(context.Request.Url.Query))

src/Platforms/Exceptionless.Web/RequestInfoCollector.cs

@@ -23,10 +23,12 @@ public static RequestInfo Collect(HttpContextBase context, ExceptionlessConfigur
                 Path = String.IsNullOrEmpty(context.Request.Path) ? "/" : context.Request.Path
             };
 
-            try {
-                info.ClientIpAddress = GetUserIPAddress(context);
-            } catch (ArgumentException ex) {
-                config.Resolver.GetLog().Error(ex, "An error occurred while setting the Client Ip Address.");
+            if (config.IncludePrivateInformation) {
+                try {
+                    info.ClientIpAddress = GetUserIPAddress(context);
+                } catch (ArgumentException ex) {
+                    config.Resolver.GetLog().Error(ex, "An error occurred while setting the Client Ip Address.");
+                }
             }
 
             try {

src/Platforms/Exceptionless.WebApi/ExceptionlessWebApiExtensions.cs

@@ -65,7 +65,7 @@ private static void ReplaceHttpErrorHandler(HttpConfiguration config, Exceptionl
         /// <param name="context">The http action context to gather information from.</param>
         /// <param name="config">The config.</param>
         public static RequestInfo GetRequestInfo(this HttpActionContext context, ExceptionlessConfiguration config) {
-            return RequestInfoCollector.Collect(context, config.DataExclusions);
+            return RequestInfoCollector.Collect(context, config);
         }
 
         /// <summary>

src/Platforms/Exceptionless.WebApi/RequestInfoCollector.cs

@@ -12,15 +12,17 @@
 
 namespace Exceptionless.ExtendedData {
     internal static class RequestInfoCollector {
-        public static RequestInfo Collect(HttpActionContext context, IEnumerable<string> exclusions) {
+        public static RequestInfo Collect(HttpActionContext context, ExceptionlessConfiguration config) {
             if (context == null)
                 return null;
 
             var info = new RequestInfo {
-                ClientIpAddress = context.Request.GetClientIpAddress(),
                 HttpMethod = context.Request.Method.Method
             };
 
+            if (config.IncludePrivateInformation)
+                info.ClientIpAddress = context.Request.GetClientIpAddress();
+
             if (context.Request.Headers.UserAgent != null)
                 info.UserAgent = context.Request.Headers.UserAgent.ToString();
 
@@ -34,7 +36,7 @@ public static RequestInfo Collect(HttpActionContext context, IEnumerable<string>
             if (context.Request.Headers.Referrer != null)
                 info.Referrer = context.Request.Headers.Referrer.ToString();
 
-            var exclusionList = exclusions as string[] ?? exclusions.ToArray();
+            var exclusionList = config.DataExclusions as string[] ?? config.DataExclusions.ToArray();
             info.Cookies = context.Request.Headers.GetCookies().ToDictionary(exclusionList);
             info.QueryString = context.Request.RequestUri.ParseQueryString().ToDictionary(exclusionList);