From b9f7c395508811a254f75e14da219f89d7612210 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Thu, 30 Dec 2021 14:13:58 -0500
Subject: [PATCH] improve capture of request attributes

---
 Oqtane.Client/Modules/Admin/Logs/Index.razor | 1 +
 Oqtane.Server/Pages/_Host.cshtml.cs          | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 311e73b0..c9818389 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -46,6 +46,7 @@ else
             </div>
         </div>
     </div>
+	<br />
 
     @if (_logs.Any())
     {
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index cdd2a127..0ff719fc 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -19,6 +19,7 @@ using Microsoft.Net.Http.Headers;
 using Microsoft.AspNetCore.Http;
 using System.Security.Claims;
 using System.Net;
+using Microsoft.Extensions.Primitives;
 
 namespace Oqtane.Pages
 {
@@ -186,15 +187,15 @@ namespace Oqtane.Pages
         private void TrackVisitor(int SiteId)
         {
             // get request attributes
-            string ip = HttpContext.Connection.RemoteIpAddress.ToString();
-            string useragent = Request.Headers[HeaderNames.UserAgent];
-            string language = Request.Headers[HeaderNames.AcceptLanguage];
+            string ip = HttpContext.Connection.RemoteIpAddress?.ToString() ?? "";
+            string useragent = (Request.Headers[HeaderNames.UserAgent] != StringValues.Empty) ? Request.Headers[HeaderNames.UserAgent] : "";
+            string language = (Request.Headers[HeaderNames.AcceptLanguage] != StringValues.Empty) ? Request.Headers[HeaderNames.AcceptLanguage] : "";
             if (language.Contains(","))
             {
                 language = language.Substring(0, language.IndexOf(","));
             }
             string url = Request.GetEncodedUrl();
-            string referrer = Request.Headers[HeaderNames.Referer];
+            string referrer = (Request.Headers[HeaderNames.Referer] != StringValues.Empty) ? Request.Headers[HeaderNames.Referer] : "";
             int? userid = null;
             if (User.HasClaim(item => item.Type == ClaimTypes.PrimarySid))
             {