additional device details
This commit is contained in:
Gary Sharp
@@ -2,6 +2,7 @@
|
||||
using Disco.Models.ClientServices.EnrolmentInformation;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Management;
|
||||
|
||||
@@ -44,6 +45,7 @@ namespace Disco.Client.Interop
|
||||
audit.ApplyProcessorInformation();
|
||||
audit.ApplyPhysicalMemoryInformation();
|
||||
audit.ApplyDiskDriveInformation();
|
||||
audit.ApplyBatteryInformation();
|
||||
|
||||
audit.NetworkAdapters = Network.GetNetworkAdapters();
|
||||
|
||||
@@ -71,13 +73,11 @@ namespace Disco.Client.Interop
|
||||
processor.Manufacturer = (string)mItem.GetPropertyValue("Manufacturer");
|
||||
processor.Name = (string)mItem.GetPropertyValue("Name");
|
||||
processor.Description = (string)mItem.GetPropertyValue("Description");
|
||||
processor.Family = (ushort)mItem.GetPropertyValue("Family");
|
||||
processor.MaxClockSpeed = (uint)mItem.GetPropertyValue("MaxClockSpeed");
|
||||
processor.NumberOfCores = (uint)mItem.GetPropertyValue("NumberOfCores");
|
||||
processor.NumberOfLogicalProcessors = (uint)mItem.GetPropertyValue("NumberOfLogicalProcessors");
|
||||
|
||||
var architectureCode = (ushort)mItem.GetPropertyValue("Architecture");
|
||||
processor.Architecture = Enum.GetName(typeof(ProcessorArchitectures), architectureCode) ?? $"Unknown {architectureCode}";
|
||||
processor.Family = (ushort?)mItem.GetPropertyValue("Family");
|
||||
processor.MaxClockSpeed = (uint?)mItem.GetPropertyValue("MaxClockSpeed");
|
||||
processor.NumberOfCores = (uint?)mItem.GetPropertyValue("NumberOfCores");
|
||||
processor.NumberOfLogicalProcessors = (uint?)mItem.GetPropertyValue("NumberOfLogicalProcessors");
|
||||
processor.Architecture = ((ProcessorArchitectures?)(ushort?)mItem.GetPropertyValue("Architecture"))?.ToString();
|
||||
|
||||
processors.Add(processor);
|
||||
}
|
||||
@@ -114,9 +114,9 @@ namespace Disco.Client.Interop
|
||||
physicalMemory.SerialNumber = (string)mItem.GetPropertyValue("SerialNumber");
|
||||
physicalMemory.Manufacturer = (string)mItem.GetPropertyValue("Manufacturer");
|
||||
physicalMemory.PartNumber = (string)mItem.GetPropertyValue("PartNumber");
|
||||
physicalMemory.Capacity = (ulong)mItem.GetPropertyValue("Capacity");
|
||||
physicalMemory.ConfiguredClockSpeed = (uint)mItem.GetPropertyValue("ConfiguredClockSpeed");
|
||||
physicalMemory.Speed = (uint)mItem.GetPropertyValue("Speed");
|
||||
physicalMemory.Capacity = (ulong?)mItem.GetPropertyValue("Capacity");
|
||||
physicalMemory.ConfiguredClockSpeed = (uint?)mItem.GetPropertyValue("ConfiguredClockSpeed");
|
||||
physicalMemory.Speed = (uint?)mItem.GetPropertyValue("Speed");
|
||||
physicalMemory.DeviceLocator = (string)mItem.GetPropertyValue("DeviceLocator");
|
||||
|
||||
physicalMemories.Add(physicalMemory);
|
||||
@@ -157,7 +157,7 @@ namespace Disco.Client.Interop
|
||||
diskDrive.InterfaceType = (string)diskResult.GetPropertyValue("InterfaceType");
|
||||
diskDrive.SerialNumber = (string)diskResult.GetPropertyValue("SerialNumber");
|
||||
diskDrive.FirmwareRevision = (string)diskResult.GetPropertyValue("FirmwareRevision");
|
||||
diskDrive.Size = (ulong)diskResult.GetPropertyValue("Size");
|
||||
diskDrive.Size = (ulong?)diskResult.GetPropertyValue("Size");
|
||||
|
||||
using (var partitionSearcher = new ManagementObjectSearcher($"ASSOCIATORS OF {{Win32_DiskDrive.DeviceID=\"{diskDrive.DeviceID.Replace(@"\", @"\\")}\"}} WHERE AssocClass = Win32_DiskDriveToDiskPartition"))
|
||||
{
|
||||
@@ -173,11 +173,11 @@ namespace Disco.Client.Interop
|
||||
var partition = new DiskDrivePartition();
|
||||
|
||||
partition.DeviceID = (string)partitionResult.GetPropertyValue("DeviceID");
|
||||
partition.Bootable = (bool)partitionResult.GetPropertyValue("Bootable");
|
||||
partition.BootPartition = (bool)partitionResult.GetPropertyValue("BootPartition");
|
||||
partition.PrimaryParition = (bool)partitionResult.GetPropertyValue("PrimaryPartition");
|
||||
partition.Size = (ulong)partitionResult.GetPropertyValue("Size");
|
||||
partition.StartingOffset = (ulong)partitionResult.GetPropertyValue("StartingOffset");
|
||||
partition.Bootable = (bool?)partitionResult.GetPropertyValue("Bootable");
|
||||
partition.BootPartition = (bool?)partitionResult.GetPropertyValue("BootPartition");
|
||||
partition.PrimaryParition = (bool?)partitionResult.GetPropertyValue("PrimaryPartition");
|
||||
partition.Size = (ulong?)partitionResult.GetPropertyValue("Size");
|
||||
partition.StartingOffset = (ulong?)partitionResult.GetPropertyValue("StartingOffset");
|
||||
partition.Type = (string)partitionResult.GetPropertyValue("Type");
|
||||
|
||||
using (var logicalSearcher = new ManagementObjectSearcher($"ASSOCIATORS OF {{Win32_DiskPartition.DeviceID=\"{partition.DeviceID}\"}} WHERE AssocClass = Win32_LogicalDiskToPartition"))
|
||||
@@ -194,13 +194,11 @@ namespace Disco.Client.Interop
|
||||
|
||||
logical.DeviceID = (string)logicalResult.GetPropertyValue("DeviceID");
|
||||
logical.Description = (string)logicalResult.GetPropertyValue("Description");
|
||||
var driveType = (uint)logicalResult.GetPropertyValue("DriveType");
|
||||
logical.DriveType = Enum.GetName(typeof(DiskLogicalDriveTypes), driveType) ?? $"Unknown {driveType}";
|
||||
var mediaType = (uint)logicalResult.GetPropertyValue("MediaType");
|
||||
logical.MediaType = Enum.GetName(typeof(DiskLogicalMediaTypes), mediaType) ?? $"Unknown {mediaType}";
|
||||
logical.DriveType = ((DiskLogicalDriveTypes?)(uint?)logicalResult.GetPropertyValue("DriveType")).ToString();
|
||||
logical.MediaType = ((DiskLogicalMediaTypes?)(uint?)logicalResult.GetPropertyValue("MediaType")).ToString();
|
||||
logical.FileSystem = (string)logicalResult.GetPropertyValue("FileSystem");
|
||||
logical.Size = (ulong)logicalResult.GetPropertyValue("Size");
|
||||
logical.FreeSpace = (ulong)logicalResult.GetPropertyValue("FreeSpace");
|
||||
logical.Size = (ulong?)logicalResult.GetPropertyValue("Size");
|
||||
logical.FreeSpace = (ulong?)logicalResult.GetPropertyValue("FreeSpace");
|
||||
logical.VolumeName = (string)logicalResult.GetPropertyValue("VolumeName");
|
||||
logical.VolumeSerialNumber = (string)logicalResult.GetPropertyValue("VolumeSerialNumber");
|
||||
|
||||
@@ -233,12 +231,50 @@ namespace Disco.Client.Interop
|
||||
// ignore errors to ensure backwards compatibility
|
||||
}
|
||||
}
|
||||
private static void ApplyBatteryInformation(this DeviceHardware deviceHardware)
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var mSearcher = new ManagementObjectSearcher("SELECT DeviceID, Availability, Chemistry, Description, DesignCapacity, DesignVoltage, FullChargeCapacity, Name FROM Win32_Battery"))
|
||||
{
|
||||
using (var mResults = mSearcher.Get())
|
||||
{
|
||||
if (mResults.Count > 0)
|
||||
{
|
||||
var batteries = new List<Battery>(mResults.Count);
|
||||
foreach (var mItem in mResults.Cast<ManagementObject>())
|
||||
{
|
||||
if (mItem != null)
|
||||
{
|
||||
var battery = new Battery();
|
||||
|
||||
battery.Availability = ((BatteryAvailability?)(ushort?)mItem.GetPropertyValue("Availability"))?.ToString();
|
||||
battery.Chemistry = ((BatteryChemistry?)(ushort?)mItem.GetPropertyValue("Chemistry"))?.ToString();
|
||||
battery.Description = (string)mItem.GetPropertyValue("Description");
|
||||
battery.DesignCapacity = (uint?)mItem.GetPropertyValue("DesignCapacity");
|
||||
battery.DeviceID = (string)mItem.GetPropertyValue("DeviceID");
|
||||
battery.FullChargeCapacity = (uint?)mItem.GetPropertyValue("FullChargeCapacity");
|
||||
battery.Name = (string)mItem.GetPropertyValue("Name");
|
||||
|
||||
batteries.Add(battery);
|
||||
}
|
||||
}
|
||||
deviceHardware.Batteries = batteries;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
// ignore errors to ensure backwards compatibility
|
||||
}
|
||||
}
|
||||
|
||||
private static void ApplyBIOSInformation(this DeviceHardware deviceHardware)
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var mSearcher = new ManagementObjectSearcher("SELECT SerialNumber, Manufacturer, SMBIOSBIOSVersion FROM Win32_BIOS WHERE PrimaryBios=true"))
|
||||
using (var mSearcher = new ManagementObjectSearcher("SELECT BIOSVersion, Manufacturer, ReleaseDate, SerialNumber, SMBIOSBIOSVersion, SMBIOSMajorVersion, SMBIOSMinorVersion, SystemBiosMajorVersion, SystemBiosMinorVersion FROM Win32_BIOS WHERE PrimaryBios=true"))
|
||||
{
|
||||
using (var mResults = mSearcher.Get())
|
||||
{
|
||||
@@ -248,17 +284,42 @@ namespace Disco.Client.Interop
|
||||
{
|
||||
var serialNumber = (string)mItem.GetPropertyValue("SerialNumber");
|
||||
if (!string.IsNullOrWhiteSpace(serialNumber))
|
||||
{
|
||||
deviceHardware.SerialNumber = serialNumber.Trim();
|
||||
}
|
||||
|
||||
var manufacturer = (string)mItem.GetPropertyValue("Manufacturer");
|
||||
if (deviceHardware.Manufacturer == null && !string.IsNullOrWhiteSpace(manufacturer))
|
||||
{
|
||||
deviceHardware.Manufacturer = manufacturer.Trim();
|
||||
}
|
||||
|
||||
ErrorReporting.DeviceIdentifier = deviceHardware.SerialNumber;
|
||||
|
||||
var biosVersion = (string[])mItem.GetPropertyValue("BIOSVersion");
|
||||
var releaseDate = default(DateTime?);
|
||||
var releaseDateString = (string)mItem.GetPropertyValue("ReleaseDate");
|
||||
if (releaseDateString != null && releaseDateString.Length == 25 && int.TryParse(releaseDateString.Substring(22), out var offsetMinutes))
|
||||
{
|
||||
releaseDateString = $"{releaseDateString.Substring(0, 22)}{offsetMinutes / 60:00}:{Math.Abs(offsetMinutes % 60):00}";
|
||||
if (DateTime.TryParseExact(releaseDateString, "yyyyMMddHHmmss.ffffffzzz", CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out var releaseDateResult))
|
||||
releaseDate = releaseDateResult;
|
||||
}
|
||||
var sMBIOSBIOSVersion = (string)mItem.GetPropertyValue("SMBIOSBIOSVersion");
|
||||
var sMBIOSMajorVersion = (ushort?)mItem.GetPropertyValue("SMBIOSMajorVersion");
|
||||
var sMBIOSMinorVersion = (ushort?)mItem.GetPropertyValue("SMBIOSMinorVersion");
|
||||
var systemBiosMajorVersion = (byte?)mItem.GetPropertyValue("SystemBiosMajorVersion");
|
||||
var systemBiosMinorVersion = (byte?)mItem.GetPropertyValue("SystemBiosMinorVersion");
|
||||
|
||||
var bios = new Bios()
|
||||
{
|
||||
BIOSVersion = biosVersion,
|
||||
Manufacturer = manufacturer,
|
||||
ReleaseDate = releaseDate,
|
||||
SerialNumber = serialNumber,
|
||||
SMBIOSBIOSVersion = sMBIOSBIOSVersion,
|
||||
SMBIOSMajorVersion = sMBIOSMajorVersion,
|
||||
SMBIOSMinorVersion = sMBIOSMinorVersion,
|
||||
SystemBiosMajorVersion = systemBiosMajorVersion,
|
||||
SystemBiosMinorVersion = systemBiosMinorVersion,
|
||||
};
|
||||
deviceHardware.Bios = new List<Bios>() { bios };
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -278,7 +339,7 @@ namespace Disco.Client.Interop
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var mSearcher = new ManagementObjectSearcher("SELECT Manufacturer, Model, PCSystemType FROM Win32_ComputerSystem"))
|
||||
using (var mSearcher = new ManagementObjectSearcher("SELECT ChassisSKUNumber, CurrentTimeZone, Description, Manufacturer, Model, OEMStringArray, PCSystemType, PrimaryOwnerContact, PrimaryOwnerName, Roles, SystemSKUNumber, SystemType FROM Win32_ComputerSystem"))
|
||||
{
|
||||
using (var mResults = mSearcher.Get())
|
||||
{
|
||||
@@ -288,17 +349,40 @@ namespace Disco.Client.Interop
|
||||
{
|
||||
var manufacturer = (string)mItem.GetPropertyValue("Manufacturer");
|
||||
if (!string.IsNullOrWhiteSpace(manufacturer))
|
||||
{
|
||||
deviceHardware.Manufacturer = manufacturer.Trim();
|
||||
}
|
||||
|
||||
var model = (string)mItem.GetPropertyValue("Model");
|
||||
if (!string.IsNullOrWhiteSpace(model))
|
||||
{
|
||||
deviceHardware.Model = model.ToString();
|
||||
}
|
||||
deviceHardware.Model = model;
|
||||
|
||||
deviceHardware.ModelType = ((PCSystemTypes)mItem.GetPropertyValue("PCSystemType")).Description();
|
||||
|
||||
var chassisSKUNumber = (string)mItem.GetPropertyValue("ChassisSKUNumber");
|
||||
var currentTimeZone = (short?)mItem.GetPropertyValue("CurrentTimeZone");
|
||||
var description = (string)mItem.GetPropertyValue("Description");
|
||||
var oemStringArray = (string[])mItem.GetPropertyValue("OEMStringArray");
|
||||
var pcSystemType = ((PCSystemTypes)mItem.GetPropertyValue("PCSystemType")).ToString();
|
||||
var primaryOwnerContact = (string)mItem.GetPropertyValue("PrimaryOwnerContact");
|
||||
var primaryOwnerName = (string)mItem.GetPropertyValue("PrimaryOwnerName");
|
||||
var roles = (string[])mItem.GetPropertyValue("Roles");
|
||||
var systemSKUNumber = (string)mItem.GetPropertyValue("SystemSKUNumber");
|
||||
var systemType = (string)mItem.GetPropertyValue("SystemType");
|
||||
|
||||
var computerSystem = new ComputerSystem()
|
||||
{
|
||||
ChassisSKUNumber = chassisSKUNumber,
|
||||
CurrentTimeZone = currentTimeZone,
|
||||
Description = description,
|
||||
OEMStringArray = oemStringArray,
|
||||
PCSystemType = pcSystemType,
|
||||
PrimaryOwnerContact = primaryOwnerContact,
|
||||
PrimaryOwnerName = primaryOwnerName,
|
||||
Roles = roles,
|
||||
SystemSKUNumber = systemSKUNumber,
|
||||
SystemType = systemType,
|
||||
};
|
||||
|
||||
deviceHardware.ComputerSystem = new List<ComputerSystem>() { computerSystem };
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -351,7 +435,7 @@ namespace Disco.Client.Interop
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var mSearcher = new ManagementObjectSearcher("SELECT SerialNumber, Manufacturer, Model, Product FROM Win32_BaseBoard"))
|
||||
using (var mSearcher = new ManagementObjectSearcher("SELECT ConfigOptions, Manufacturer, Model, PartNumber, Product, SerialNumber, SKU, Version FROM Win32_BaseBoard"))
|
||||
{
|
||||
using (var mResults = mSearcher.Get())
|
||||
{
|
||||
@@ -369,13 +453,13 @@ namespace Disco.Client.Interop
|
||||
var model = (string)mItem.GetPropertyValue("Model");
|
||||
if (deviceHardware.Model == null && !string.IsNullOrWhiteSpace(model))
|
||||
{
|
||||
deviceHardware.Model = model.ToString();
|
||||
deviceHardware.Model = model;
|
||||
}
|
||||
|
||||
var product = (string)mItem.GetPropertyValue("Product");
|
||||
if (deviceHardware.Model == null && !string.IsNullOrWhiteSpace(product))
|
||||
{
|
||||
deviceHardware.Model = product.ToString();
|
||||
deviceHardware.Model = product;
|
||||
}
|
||||
|
||||
// Added 2012-11-22 G# - Lenovo IdeaPad Serial SHIM
|
||||
@@ -390,6 +474,25 @@ namespace Disco.Client.Interop
|
||||
deviceHardware.SerialNumber = serialNumber.Trim();
|
||||
ErrorReporting.DeviceIdentifier = deviceHardware.SerialNumber;
|
||||
}
|
||||
|
||||
var configOptions = (string[])mItem.GetPropertyValue("ConfigOptions");
|
||||
var partNumber = (string)mItem.GetPropertyValue("PartNumber");
|
||||
var sku = (string)mItem.GetPropertyValue("SKU");
|
||||
var version = (string)mItem.GetPropertyValue("Version");
|
||||
|
||||
var baseBoard = new BaseBoard()
|
||||
{
|
||||
ConfigOptions = configOptions,
|
||||
Manufacturer = manufacturer,
|
||||
Model = model,
|
||||
PartNumber = partNumber,
|
||||
Product = product,
|
||||
SerialNumber = serialNumber,
|
||||
SKU = sku,
|
||||
Version = version,
|
||||
};
|
||||
|
||||
deviceHardware.BasebBoard = new List<BaseBoard>() { baseBoard };
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -546,5 +649,42 @@ namespace Disco.Client.Interop
|
||||
F3_240M_512,
|
||||
F3_32M_512,
|
||||
}
|
||||
|
||||
private enum BatteryAvailability : ushort
|
||||
{
|
||||
Other = 1,
|
||||
Unknown = 2,
|
||||
RunningFullPower = 3,
|
||||
Warning = 4,
|
||||
InTest = 5,
|
||||
NotApplicable = 6,
|
||||
PowerOff = 7,
|
||||
OffLine = 8,
|
||||
OffDuty = 9,
|
||||
Degraded = 10,
|
||||
NotInstalled = 11,
|
||||
InstallError = 12,
|
||||
PowerSaveUnknown = 13,
|
||||
PowerSaveLowPowerMode = 14,
|
||||
PowerSaveStandby = 15,
|
||||
PowerCycle = 16,
|
||||
PowerSaveWarning = 17,
|
||||
Paused = 18,
|
||||
NotReady = 19,
|
||||
NotConfigured = 20,
|
||||
Quiesced = 21,
|
||||
}
|
||||
|
||||
private enum BatteryChemistry : ushort
|
||||
{
|
||||
Other = 1,
|
||||
Unknown = 2,
|
||||
LeadAcid = 3,
|
||||
NickelCadmium = 4,
|
||||
NickelMetalHydride = 5,
|
||||
LithiumIon = 6,
|
||||
ZincAir = 7,
|
||||
LithiumPolymer = 8,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user