jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Fix #62: DeviceDomainId may be null

Browse Source
This commit is contained in:
Gary Sharp
2014-07-15 14:57:58 +10:00
parent 09b1c93bf0
commit 4b3905b4fc
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/DeviceBI/Enrol.cs
+7 -2
View File
@@ -365,7 +365,7 @@ namespace Disco.BI.DeviceBI
if (domain == null) if (domain == null)
domain = ActiveDirectory.Context.GetDomainByName(Request.DeviceDNSDomainName); domain = ActiveDirectory.Context.GetDomainByName(Request.DeviceDNSDomainName);
if (!authenticatedToken.User.UserId.Equals(string.Format(@"{0}\{1}$", domain.NetBiosName, Request.DeviceComputerName), System.StringComparison.OrdinalIgnoreCase)) if (!authenticatedToken.User.UserId.Equals(string.Format(@"{0}\{1}$", domain.NetBiosName, Request.DeviceComputerName), System.StringComparison.OrdinalIgnoreCase))
throw new EnrolSafeException(string.Format("Connection not correctly authenticated (SN: {0}; Auth User: {1})", Request.DeviceSerialNumber, authenticatedToken.User.UserId)); throw new EnrolSafeException(string.Format("Connection not correctly authenticated (SN: {0}; Auth User: {1})", Request.DeviceSerialNumber, authenticatedToken.User.UserId));
} }
@@ -499,7 +499,7 @@ namespace Disco.BI.DeviceBI
response.DeviceComputerName = adMachineAccount.Name; response.DeviceComputerName = adMachineAccount.Name;
response.DeviceDomainName = adMachineAccount.Domain.NetBiosName; response.DeviceDomainName = adMachineAccount.Domain.NetBiosName;
} }
else else if (ActiveDirectory.IsValidDomainAccountId(RepoDevice.DeviceDomainId))
{ {
string accountUsername; string accountUsername;
ADDomain accountDomain; ADDomain accountDomain;
@@ -508,6 +508,11 @@ namespace Disco.BI.DeviceBI
response.DeviceDomainName = accountDomain == null ? null : accountDomain.NetBiosName; response.DeviceDomainName = accountDomain == null ? null : accountDomain.NetBiosName;
response.DeviceComputerName = accountUsername; response.DeviceComputerName = accountUsername;
} }
else
{
response.DeviceDomainName = Request.DeviceDNSDomainName;
response.DeviceComputerName = Request.DeviceComputerName;
}
} }
else else
{ {