Merge pull request #1187 from tgstation/Patches [TGSDeploy]

Add a null check for the OAuth config section
This commit is contained in:
Jordan Brown
2021-01-03 22:18:58 -05:00
committed by GitHub
2 changed files with 6 additions and 2 deletions
@@ -42,6 +42,10 @@ namespace Tgstation.Server.Host.Security.OAuth
var securityConfiguration = securityConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(securityConfigurationOptions));
var validatorsBuilder = new List<IOAuthValidator>();
validators = validatorsBuilder;
if (securityConfiguration.OAuth == null)
return;
if (securityConfiguration.OAuth.TryGetValue(OAuthProvider.GitHub, out var gitHubConfig))
validatorsBuilder.Add(
@@ -73,8 +77,6 @@ namespace Tgstation.Server.Host.Security.OAuth
assemblyInformationProvider,
loggerFactory.CreateLogger<KeycloakOAuthValidator>(),
keyCloakConfig));
validators = validatorsBuilder;
}
/// <inheritdoc />
@@ -106,6 +106,8 @@ namespace Tgstation.Server.Tests
args.Add($"Security:OAuth:{I}:RedirectUrl=https://fakest.com");
args.Add($"Security:OAuth:{I}:ServerUrl=https://fakestest.com");
}
else
args.Add($"Security:OAuth=null");
// SPECIFICALLY DELETE THE DEV APPSETTINGS, WE DON'T WANT IT IN THE WAY
File.Delete("appsettings.Development.json");