cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 15:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixups tested users controller

Browse Source
This commit is contained in:
Jordan Brown
2018-07-26 21:25:38 -04:00
parent f97056bb82
commit f299eba469
22 changed files with 695 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Security/WindowsSystemIdentityFactory.cs
+21 -3
View File
@@ -24,14 +24,28 @@ namespace Tgstation.Server.Host.Security
if (user.SystemIdentifier == null)
throw new InvalidOperationException("User's SystemIdentifier must not be null!");
PrincipalContext pc = null;
UserPrincipal principal = null;
//machine logon first cause it's faster
using (var pc = new PrincipalContext(ContextType.Machine, Environment.UserDomainName))
try
{
pc = new PrincipalContext(ContextType.Machine, Environment.UserDomainName);
principal = UserPrincipal.FindByIdentity(pc, user.SystemIdentifier);
if(principal == null)
using (var pc = new PrincipalContext(ContextType.Domain, Environment.UserDomainName))
if (principal == null)
{
pc.Dispose();
pc = new PrincipalContext(ContextType.Domain, Environment.UserDomainName);
principal = UserPrincipal.FindByIdentity(pc, user.SystemIdentifier);
if (principal == null)
pc.Dispose();
}
}
catch
{
pc?.Dispose();
throw;
}
if (principal == null)
return null;
@@ -42,6 +56,10 @@ namespace Tgstation.Server.Host.Security
/// <inheritdoc />
public Task<ISystemIdentity> CreateSystemIdentity(string username, string password, CancellationToken cancellationToken) => Task.Factory.StartNew(() =>
{
if (username == null)
throw new ArgumentNullException(nameof(username));
if (password == null)
throw new ArgumentNullException(nameof(password));
var splits = username.Split('\\');
var res = NativeMethods.LogonUser(splits.Length > 1 ? splits[1] : splits[0], splits.Length > 1 ? splits[0] : null, password, 3 /*LOGON32_LOGON_NETWORK*/, 0 /*LOGON32_PROVIDER_DEFAULT*/, out var token);