Added UserAgent to api request trace log

src/Radarr.Http/Authentication/AuthenticationService.cs

@@ -209,70 +209,27 @@ private string GetApiKey(NancyContext context)
 
         public void LogUnauthorized(NancyContext context)
         {
-            _authLogger.Info("Auth-Unauthorized ip {0} url '{1}'", GetRemoteIP(context), context.Request.Url.ToString());
+            _authLogger.Info("Auth-Unauthorized ip {0} url '{1}'", context.GetRemoteIP(), context.Request.Url.ToString());
         }
 
         private void LogInvalidated(NancyContext context)
         {
-            _authLogger.Info("Auth-Invalidated ip {0}", GetRemoteIP(context));
+            _authLogger.Info("Auth-Invalidated ip {0}", context.GetRemoteIP());
         }
 
         private void LogFailure(NancyContext context, string username)
         {
-            _authLogger.Warn("Auth-Failure ip {0} username '{1}'", GetRemoteIP(context), username);
+            _authLogger.Warn("Auth-Failure ip {0} username '{1}'", context.GetRemoteIP(), username);
         }
 
         private void LogSuccess(NancyContext context, string username)
         {
-            _authLogger.Info("Auth-Success ip {0} username '{1}'", GetRemoteIP(context), username);
+            _authLogger.Info("Auth-Success ip {0} username '{1}'", context.GetRemoteIP(), username);
         }
 
         private void LogLogout(NancyContext context, string username)
         {
-            _authLogger.Info("Auth-Logout ip {0} username '{1}'", GetRemoteIP(context), username);
+            _authLogger.Info("Auth-Logout ip {0} username '{1}'", context.GetRemoteIP(), username);
-        }
-
-        private string GetRemoteIP(NancyContext context)
-        {
-            if (context == null || context.Request == null)
-            {
-                return "Unknown";
-            }
-
-            var remoteAddress = context.Request.UserHostAddress;
-            IPAddress remoteIP;
-
-            // Only check if forwarded by a local network reverse proxy
-            if (IPAddress.TryParse(remoteAddress, out remoteIP) && remoteIP.IsLocalAddress())
-            {
-                var realIPHeader = context.Request.Headers["X-Real-IP"];
-                if (realIPHeader.Any())
-                {
-                    return realIPHeader.First().ToString();
-                }
-
-                var forwardedForHeader = context.Request.Headers["X-Forwarded-For"];
-                if (forwardedForHeader.Any())
-                {
-                    // Get the first address that was forwarded by a local IP to prevent remote clients faking another proxy
-                    foreach (var forwardedForAddress in forwardedForHeader.SelectMany(v => v.Split(',')).Select(v => v.Trim()).Reverse())
-                    {
-                        if (!IPAddress.TryParse(forwardedForAddress, out remoteIP))
-                        {
-                            return remoteAddress;
-                        }
-
-                        if (!remoteIP.IsLocalAddress())
-                        {
-                            return forwardedForAddress;
-                        }
-
-                        remoteAddress = forwardedForAddress;
-                    }
-                }
-            }
-
-            return remoteAddress;
         }
     }
 }

src/Radarr.Http/Extensions/Pipelines/RequestLoggingPipeline.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using Nancy;
 using Nancy.Bootstrapper;
@@ -42,8 +42,7 @@ private Response LogStart(NancyContext context)
 
             var reqPath = GetRequestPathAndQuery(context.Request);
 
-            _loggerHttp.Trace("Req: {0} [{1}] {2}", id, context.Request.Method, reqPath);
+            _loggerHttp.Trace("Req: {0} [{1}] {2} (from {3})", id, context.Request.Method, reqPath, GetOrigin(context));
-
             return null;
         }
 
@@ -89,5 +88,17 @@ private static string GetRequestPathAndQuery(Request request)
                 return request.Url.Path;
             }
         }
+
+        private static string GetOrigin(NancyContext context)
+        {
+            if (context.Request.Headers.UserAgent.IsNullOrWhiteSpace())
+            {
+                return context.GetRemoteIP();
+            }
+            else
+            {
+                return $"{context.GetRemoteIP()} {context.Request.Headers.UserAgent}";
+            }
+        }
     }
 }

src/Radarr.Http/Extensions/RequestExtensions.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Linq;
+using System.Net;
 using Nancy;
+using NzbDrone.Common.Extensions;
 
 namespace Radarr.Http.Extensions
 {
@@ -78,5 +81,48 @@ public static int GetIntegerQueryParameter(this Request request, string paramete
 
             return defaultValue;
         }
+
+        public static string GetRemoteIP(this NancyContext context)
+        {
+            if (context == null || context.Request == null)
+            {
+                return "Unknown";
+            }
+
+            var remoteAddress = context.Request.UserHostAddress;
+            IPAddress remoteIP;
+
+            // Only check if forwarded by a local network reverse proxy
+            if (IPAddress.TryParse(remoteAddress, out remoteIP) && remoteIP.IsLocalAddress())
+            {
+                var realIPHeader = context.Request.Headers["X-Real-IP"];
+                if (realIPHeader.Any())
+                {
+                    return realIPHeader.First().ToString();
+                }
+
+                var forwardedForHeader = context.Request.Headers["X-Forwarded-For"];
+                if (forwardedForHeader.Any())
+                {
+                    // Get the first address that was forwarded by a local IP to prevent remote clients faking another proxy
+                    foreach (var forwardedForAddress in forwardedForHeader.SelectMany(v => v.Split(',')).Select(v => v.Trim()).Reverse())
+                    {
+                        if (!IPAddress.TryParse(forwardedForAddress, out remoteIP))
+                        {
+                            return remoteAddress;
+                        }
+
+                        if (!remoteIP.IsLocalAddress())
+                        {
+                            return forwardedForAddress;
+                        }
+
+                        remoteAddress = forwardedForAddress;
+                    }
+                }
+            }
+
+            return remoteAddress;
+        }
     }
 }