actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-14 04:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refresh Token for BrokerServer (#3167)

Browse Source
This commit is contained in:
Luke Tomlinson
2024-02-26 10:05:41 -05:00
committed by GitHub
parent d296014f99
commit 034c51cd0b
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Runner.Common/BrokerServer.cs
View File

@@ -23,6 +23,8 @@ namespace GitHub.Runner.Common
Task<TaskAgentMessage> GetRunnerMessageAsync(Guid? sessionId, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate, CancellationToken token); Task<TaskAgentMessage> GetRunnerMessageAsync(Guid? sessionId, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate, CancellationToken token);
Task UpdateConnectionIfNeeded(Uri serverUri, VssCredentials credentials); Task UpdateConnectionIfNeeded(Uri serverUri, VssCredentials credentials);
Task ForceRefreshConnection(VssCredentials credentials);
} }
public sealed class BrokerServer : RunnerService, IBrokerServer public sealed class BrokerServer : RunnerService, IBrokerServer
@@ -83,6 +85,11 @@ namespace GitHub.Runner.Common
return Task.CompletedTask; return Task.CompletedTask;
} }
public Task ForceRefreshConnection(VssCredentials credentials)
{
return ConnectAsync(_brokerUri, credentials);
}
public bool ShouldRetryException(Exception ex) public bool ShouldRetryException(Exception ex)
{ {
if (ex is AccessDeniedException ade && ade.ErrorCode == 1) if (ex is AccessDeniedException ade && ade.ErrorCode == 1)

1
src/Runner.Listener/MessageListener.cs
View File

@@ -383,6 +383,7 @@ namespace GitHub.Runner.Listener
public async Task RefreshListenerTokenAsync(CancellationToken cancellationToken) public async Task RefreshListenerTokenAsync(CancellationToken cancellationToken)
{ {
await _runnerServer.RefreshConnectionAsync(RunnerConnectionType.MessageQueue, TimeSpan.FromSeconds(60)); await _runnerServer.RefreshConnectionAsync(RunnerConnectionType.MessageQueue, TimeSpan.FromSeconds(60));
await _brokerServer.ForceRefreshConnection(_creds);
} }
private TaskAgentMessage DecryptMessage(TaskAgentMessage message) private TaskAgentMessage DecryptMessage(TaskAgentMessage message)

1
src/Runner.Listener/Runner.cs
View File

@@ -598,6 +598,7 @@ namespace GitHub.Runner.Listener
} }
else if (string.Equals(message.MessageType, TaskAgentMessageTypes.ForceTokenRefresh)) else if (string.Equals(message.MessageType, TaskAgentMessageTypes.ForceTokenRefresh))
{ {
Trace.Info("Received ForceTokenRefreshMessage");
await _listener.RefreshListenerTokenAsync(messageQueueLoopTokenSource.Token); await _listener.RefreshListenerTokenAsync(messageQueueLoopTokenSource.Token);
} }
else else