From fcec787eb6daa55fcb86a3eb71a481e3a6ab20a5 Mon Sep 17 00:00:00 2001
From: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com>
Date: Tue, 18 May 2021 02:45:23 +0100
Subject: [PATCH] Show User Agent in System->Tasks for externally triggered
 commands (#6327)

* Show User Agent in System->Tasks for externally triggered commands

(cherry picked from commit fe8f319f7bfdadb7218b6313ada6cae1d2a35ad8)

* Translations

Co-authored-by: Taloth Saldono <Taloth@users.noreply.github.com>
---
 .../src/System/Tasks/Queued/QueuedTaskRow.css |  9 ++++++++
 .../src/System/Tasks/Queued/QueuedTaskRow.js  | 14 ++++++++++++-
 src/NzbDrone.Api/Commands/CommandResource.cs  |  5 +++++
 src/NzbDrone.Common/Http/UserAgentParser.cs   | 21 +++++++++++++++++++
 src/NzbDrone.Core/Localization/Core/en.json   |  2 ++
 .../Messaging/Commands/Command.cs             |  2 ++
 src/Radarr.Api.V3/Commands/CommandModule.cs   |  2 ++
 src/Radarr.Api.V3/Commands/CommandResource.cs |  5 +++++
 8 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 src/NzbDrone.Common/Http/UserAgentParser.cs

diff --git a/frontend/src/System/Tasks/Queued/QueuedTaskRow.css b/frontend/src/System/Tasks/Queued/QueuedTaskRow.css
index 6e38929c9..034804711 100644
--- a/frontend/src/System/Tasks/Queued/QueuedTaskRow.css
+++ b/frontend/src/System/Tasks/Queued/QueuedTaskRow.css
@@ -10,6 +10,15 @@
   width: 100%;
 }
 
+.commandName {
+  display: inline-block;
+  min-width: 220px;
+}
+
+.userAgent {
+  color: #b0b0b0;
+}
+
 .queued,
 .started,
 .ended {
diff --git a/frontend/src/System/Tasks/Queued/QueuedTaskRow.js b/frontend/src/System/Tasks/Queued/QueuedTaskRow.js
index cfe85573c..f9afcb32e 100644
--- a/frontend/src/System/Tasks/Queued/QueuedTaskRow.js
+++ b/frontend/src/System/Tasks/Queued/QueuedTaskRow.js
@@ -157,6 +157,7 @@ class QueuedTaskRow extends Component {
       status,
       duration,
       message,
+      clientUserAgent,
       longDateFormat,
       timeFormat,
       onCancelPress
@@ -192,7 +193,17 @@ class QueuedTaskRow extends Component {
           </span>
         </TableRowCell>
 
-        <TableRowCell>{commandName}</TableRowCell>
+        <TableRowCell>
+          <span className={styles.commandName}>
+            {commandName}
+          </span>
+          {
+            clientUserAgent &&
+              <span className={styles.userAgent} title={translate('TaskUserAgentTooltip')}>
+                {translate('from')}: {clientUserAgent}
+              </span>
+          }
+        </TableRowCell>
 
         <TableRowCell
           className={styles.queued}
@@ -256,6 +267,7 @@ QueuedTaskRow.propTypes = {
   status: PropTypes.string.isRequired,
   duration: PropTypes.string,
   message: PropTypes.string,
+  clientUserAgent: PropTypes.string,
   showRelativeDates: PropTypes.bool.isRequired,
   shortDateFormat: PropTypes.string.isRequired,
   longDateFormat: PropTypes.string.isRequired,
diff --git a/src/NzbDrone.Api/Commands/CommandResource.cs b/src/NzbDrone.Api/Commands/CommandResource.cs
index eea9341dc..06e77fce4 100644
--- a/src/NzbDrone.Api/Commands/CommandResource.cs
+++ b/src/NzbDrone.Api/Commands/CommandResource.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
+using NzbDrone.Common.Http;
 using NzbDrone.Core.Messaging.Commands;
 using Radarr.Http.REST;
 
@@ -21,6 +22,8 @@ namespace NzbDrone.Api.Commands
         public string Exception { get; set; }
         public CommandTrigger Trigger { get; set; }
 
+        public string ClientUserAgent { get; set; }
+
         [JsonIgnore]
         public string CompletionMessage { get; set; }
 
@@ -125,6 +128,8 @@ namespace NzbDrone.Api.Commands
                 Exception = model.Exception,
                 Trigger = model.Trigger,
 
+                ClientUserAgent = UserAgentParser.SimplifyUserAgent(model.Body.ClientUserAgent),
+
                 CompletionMessage = model.Body.CompletionMessage,
                 LastExecutionTime = model.Body.LastExecutionTime
             };
diff --git a/src/NzbDrone.Common/Http/UserAgentParser.cs b/src/NzbDrone.Common/Http/UserAgentParser.cs
new file mode 100644
index 000000000..2c382236a
--- /dev/null
+++ b/src/NzbDrone.Common/Http/UserAgentParser.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NzbDrone.Common.Http
+{
+    public static class UserAgentParser
+    {
+        public static string SimplifyUserAgent(string userAgent)
+        {
+            if (userAgent == null || userAgent.StartsWith("Mozilla/5.0"))
+            {
+                return null;
+            }
+
+            return userAgent;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 9ef6cfd94..c0a0074af 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -344,6 +344,7 @@
   "ForMoreInformationOnTheIndividualImportListsClinkOnTheInfoButtons": "For more information on the individual import lists, click on the info buttons.",
   "ForMoreInformationOnTheIndividualIndexers": "For more information on the individual indexers, click on the info buttons.",
   "FreeSpace": "Free Space",
+  "From": "From",
   "General": "General",
   "GeneralSettings": "General Settings",
   "GeneralSettingsSummary": "Port, SSL, username/password, proxy, analytics and updates",
@@ -963,6 +964,7 @@
   "TagsHelpText": "Applies to movies with at least one matching tag",
   "TagsSettingsSummary": "See all tags and how they are used. Unused tags can be removed",
   "Tasks": "Tasks",
+  "TaskUserAgentTooltip": "User-Agent provided by the app that called the API",
   "Test": "Test",
   "TestAll": "Test All",
   "TestAllClients": "Test All Clients",
diff --git a/src/NzbDrone.Core/Messaging/Commands/Command.cs b/src/NzbDrone.Core/Messaging/Commands/Command.cs
index aa3ffa685..020b5ec64 100644
--- a/src/NzbDrone.Core/Messaging/Commands/Command.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/Command.cs
@@ -34,6 +34,8 @@ namespace NzbDrone.Core.Messaging.Commands
         public CommandTrigger Trigger { get; set; }
         public bool SuppressMessages { get; set; }
 
+        public string ClientUserAgent { get; set; }
+
         public Command()
         {
             Name = GetType().Name.Replace("Command", "");
diff --git a/src/Radarr.Api.V3/Commands/CommandModule.cs b/src/Radarr.Api.V3/Commands/CommandModule.cs
index 7ffdc966b..ae18b63d4 100644
--- a/src/Radarr.Api.V3/Commands/CommandModule.cs
+++ b/src/Radarr.Api.V3/Commands/CommandModule.cs
@@ -57,6 +57,8 @@ namespace Radarr.Api.V3.Commands
             command.SuppressMessages = !command.SendUpdatesToClient;
             command.SendUpdatesToClient = true;
 
+            command.ClientUserAgent = Request.Headers.UserAgent;
+
             var trackedCommand = _commandQueueManager.Push(command, CommandPriority.Normal, CommandTrigger.Manual);
             return trackedCommand.Id;
         }
diff --git a/src/Radarr.Api.V3/Commands/CommandResource.cs b/src/Radarr.Api.V3/Commands/CommandResource.cs
index b54442995..ea42ef71c 100644
--- a/src/Radarr.Api.V3/Commands/CommandResource.cs
+++ b/src/Radarr.Api.V3/Commands/CommandResource.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
 using NzbDrone.Core.Messaging.Commands;
 using Radarr.Http.REST;
 
@@ -23,6 +24,8 @@ namespace Radarr.Api.V3.Commands
         public string Exception { get; set; }
         public CommandTrigger Trigger { get; set; }
 
+        public string ClientUserAgent { get; set; }
+
         [JsonIgnore]
         public string CompletionMessage { get; set; }
 
@@ -106,6 +109,8 @@ namespace Radarr.Api.V3.Commands
                 Exception = model.Exception,
                 Trigger = model.Trigger,
 
+                ClientUserAgent = UserAgentParser.SimplifyUserAgent(model.Body.ClientUserAgent),
+
                 CompletionMessage = model.Body.CompletionMessage,
                 LastExecutionTime = model.Body.LastExecutionTime
             };