From 97d28f7803999ef3d7d3e9028396919a5facfd80 Mon Sep 17 00:00:00 2001
From: Luke Tomlinson <luketomlinson@github.com>
Date: Thu, 16 Mar 2023 10:30:15 -0700
Subject: [PATCH] wip

---
 src/Runner.Common/RunnerDotcomServer.cs       | 16 ++++++---
 .../Configuration/ConfigurationManager.cs     | 12 ++++++-
 src/Sdk/DTWebApi/WebApi/Runner.cs             | 35 +++++++++++++++++--
 3 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/Runner.Common/RunnerDotcomServer.cs b/src/Runner.Common/RunnerDotcomServer.cs
index 399719e91..96cf82b00 100644
--- a/src/Runner.Common/RunnerDotcomServer.cs
+++ b/src/Runner.Common/RunnerDotcomServer.cs
@@ -17,7 +17,7 @@ namespace GitHub.Runner.Common
     {
         Task<List<TaskAgent>> GetRunnersAsync(int runnerGroupId, string githubUrl, string githubToken, string agentName);
 
-        Task<TaskAgent> AddRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey);
+        Task<TaskAgent> AddRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey, string hostId);
         Task<List<TaskAgentPool>> GetRunnerGroupsAsync(string githubUrl, string githubToken);
 
         string GetGitHubRequestId(HttpResponseHeaders headers);
@@ -136,7 +136,7 @@ namespace GitHub.Runner.Common
             return agentPools?.ToAgentPoolList();
         }
 
-        public async Task<TaskAgent> AddRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey)
+        public async Task<TaskAgent> AddRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey, string hostId)
         {
             var gitHubUrlBuilder = new UriBuilder(githubUrl);
             var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
@@ -160,11 +160,19 @@ namespace GitHub.Runner.Common
                         {"ephemeral", agent.Ephemeral},
                         {"labels", agent.Labels},
                         {"public_key", publicKey},
+                        {"host_id", hostId},
                     };
 
             var body = new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json");
-            var responseAgent = await RetryRequest<TaskAgent>(githubApiUrl, githubToken, RequestType.Post, 3, "Failed to add agent", body);
-            agent.Id = responseAgent.Id;
+
+            var response = await RetryRequest(githubApiUrl, githubToken, RequestType.Post, 3, "Failed to add agent", body);
+            var runner = StringUtil.ConvertFromJson<GitHub.DistributedTask.WebApi.Runner>(response);
+            agent.Id = runner.Id;
+            agent.Authorization = new TaskAgentAuthorization()
+            {
+                AuthorizationUrl = runner.RunnerAuthorization.AuthorizationUrl,
+                ClientId = new Guid(runner.RunnerAuthorization.ClientId),
+            };
             return agent;
         }
 
diff --git a/src/Runner.Listener/Configuration/ConfigurationManager.cs b/src/Runner.Listener/Configuration/ConfigurationManager.cs
index 867624d9f..327879474 100644
--- a/src/Runner.Listener/Configuration/ConfigurationManager.cs
+++ b/src/Runner.Listener/Configuration/ConfigurationManager.cs
@@ -14,6 +14,7 @@ using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.Common.Internal;
 using GitHub.Services.OAuth;
+using GitHub.Services.WebApi.Jwt;
 
 namespace GitHub.Runner.Listener.Configuration
 {
@@ -116,6 +117,7 @@ namespace GitHub.Runner.Listener.Configuration
             VssCredentials creds = null;
             _term.WriteSection("Authentication");
             string registerToken = string.Empty;
+            string hostId = string.Empty;
             while (true)
             {
                 // When testing against a dev deployment of Actions Service, set this environment variable
@@ -140,6 +142,7 @@ namespace GitHub.Runner.Listener.Configuration
                     _term.WriteLine($"Using V2 flow: {runnerSettings.UseV2Flow}");
                     creds = authResult.ToVssCredentials();
                     Trace.Info("cred retrieved via GitHub auth");
+                    hostId = GetHostId(authResult.Token);
                 }
 
                 try
@@ -299,7 +302,7 @@ namespace GitHub.Runner.Listener.Configuration
                     {
                         if (runnerSettings.UseV2Flow)
                         {
-                            agent = await _dotcomServer.AddRunnerAsync(runnerSettings.PoolId, agent, runnerSettings.GitHubUrl, registerToken, publicKeyXML);
+                            agent = await _dotcomServer.AddRunnerAsync(runnerSettings.PoolId, agent, runnerSettings.GitHubUrl, registerToken, publicKeyXML, hostId);
                         }
                         else
                         {
@@ -775,5 +778,12 @@ namespace GitHub.Runner.Listener.Configuration
             }
             return null;
         }
+
+        // Temporary hack for sending legacy host id using v2 flow
+        private string GetHostId(string accessToken)
+        {
+            var claims = JsonWebToken.Create(accessToken).ExtractClaims();
+            return claims.FirstOrDefault(x => x.Type == "aud").Value.Split(':').LastOrDefault();
+        }
     }
 }
diff --git a/src/Sdk/DTWebApi/WebApi/Runner.cs b/src/Sdk/DTWebApi/WebApi/Runner.cs
index 2103bf3a2..e6d9de992 100644
--- a/src/Sdk/DTWebApi/WebApi/Runner.cs
+++ b/src/Sdk/DTWebApi/WebApi/Runner.cs
@@ -1,12 +1,28 @@
 using Newtonsoft.Json;
+using System.Security.AccessControl;
 
 namespace GitHub.DistributedTask.WebApi
 {
     public class Runner
     {
-        /// <summary>
-        /// Name of the agent
-        /// </summary>
+
+        public class Authorization
+        {
+            [JsonProperty("authorization_url")]
+            public Uri AuthorizationUrl
+            {
+                get;
+                internal set;
+            }
+
+            [JsonProperty("client_id")]
+            public string ClientId
+            {
+                get;
+                internal set;
+            }
+        }
+
         [JsonProperty("name")]
         public string Name
         {
@@ -14,5 +30,18 @@ namespace GitHub.DistributedTask.WebApi
             internal set;
         }
 
+        [JsonProperty("id")]
+        public Int32 Id
+        {
+            get;
+            internal set;
+        }
+
+        [JsonProperty("authorization")]
+        public Authorization RunnerAuthorization
+        {
+            get;
+            internal set;
+        }
     }
 }