izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

OidcToken - Added timeout option (defaults to 20 minutes) were if the user hasn't logged in the opened browser for this time we just shutdown with a error, this prevents zombie processes from sticking around at the risk of users coming back after this timeout and trying to login to the popuped browser and getting a 404 (as the local webserver will have shutdown).

Browse Source 
[CL 29983000 by joakim lindqvist in ue5-main branch]
This commit is contained in:
joakim lindqvist
2023-11-29 04:51:48 -05:00
parent bef51f55b4
commit 09b1c46dac
3 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Engine/Source/Programs/Shared/EpicGames.OIDC/OidcTokenManager.cs
View File

@@ -45,7 +45,7 @@ namespace EpicGames.OIDC
OidcTokenClient? client;
if (!_tokenClients.TryGetValue(name, out client))
{
client = new OidcTokenClient(name, providerInfo, _tokenStore);
client = new OidcTokenClient(name, providerInfo, TimeSpan.FromMinutes(20), _tokenStore);
_tokenClients.Add(name, client);
}
return client;
@@ -72,7 +72,7 @@ namespace EpicGames.OIDC
continue;
}
OidcTokenClient tokenClient = ActivatorUtilities.CreateInstance<OidcTokenClient>(provider, key, providerInfo);
OidcTokenClient tokenClient = ActivatorUtilities.CreateInstance<OidcTokenClient>(provider, key, providerInfo, settings.CurrentValue.LoginTimeout);
if (refreshTokens.TryGetValue(key, out string? refreshToken))
{
@@ -113,7 +113,7 @@ namespace EpicGames.OIDC
continue;
}
OidcTokenClient tokenClient = new OidcTokenClient(key, providerInfo, _tokenStore);
OidcTokenClient tokenClient = new OidcTokenClient(key, providerInfo, options.LoginTimeout, _tokenStore);
if (refreshTokens.TryGetValue(key, out string? refreshToken))
{
@@ -182,6 +182,7 @@ namespace EpicGames.OIDC
private readonly string _name;
private readonly ProviderInfo _providerInfo;
private readonly TimeSpan _loginTimeout;
private readonly ITokenStore _tokenStore;
private readonly Uri _authorityUri;
private readonly string _clientId;
@@ -193,10 +194,11 @@ namespace EpicGames.OIDC
private readonly List<Uri> _redirectUris;
public OidcTokenClient(string name, ProviderInfo providerInfo, ITokenStore tokenStore)
public OidcTokenClient(string name, ProviderInfo providerInfo, TimeSpan loginTimeout, ITokenStore tokenStore)
{
_name = name;
_providerInfo = providerInfo;
_loginTimeout = loginTimeout;
_tokenStore = tokenStore;
_authorityUri = providerInfo.ServerUri;
@@ -277,7 +279,17 @@ namespace EpicGames.OIDC
{
try
{
loginResult = await ProcessHttpRequest(http, loginState, oidcClient);
Task<LoginResult> processHttpTask = ProcessHttpRequest(http, loginState, oidcClient);
Task finishedTask = await Task.WhenAny(Task.Delay(_loginTimeout, cancellationToken), processHttpTask);
if (finishedTask == processHttpTask)
{
loginResult = await processHttpTask;
}
else
{
// timed out
loginResult = new LoginResult($"Login timed out after: {_loginTimeout.TotalMinutes} minutes");
}
}
catch when (cancellationToken.IsCancellationRequested)
{
@@ -610,6 +622,8 @@ namespace EpicGames.OIDC
{
public Dictionary<string, ProviderInfo> Providers { get; set; } = new Dictionary<string, ProviderInfo>();
public TimeSpan LoginTimeout { get; set; } = TimeSpan.FromMinutes(20);
public static OidcTokenOptions Bind(IConfiguration config)
{
OidcTokenOptions options = new OidcTokenOptions();