Skip to content

Use VDS to get drive info #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Adam1213 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Use VDS to get drive info #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1170b94
initial proof-of-concept fetching disk from VDS
Adam1213 Oct 3, 2024
329277e
Fix missing dynamic drives from queries. Since we get VdsDiskProperti…
Adam1213 Oct 3, 2024
b0ebb5f
Optimise getting partition by drive letter
Adam1213 Oct 9, 2024
7c53a69
Move free space calculation to new method, as calculations are done i…
Adam1213 Oct 9, 2024
012b28b
Adapt NVMe smart data for VDS method. TODO: Smart data for non-NVMe d…
Adam1213 Oct 9, 2024
0b310b7
Fix retrieving bitlocker and nvme smart data from VDS method. Add get…
Adam1213 Oct 15, 2024
4870cb5
Replace console writes with logging methods
Adam1213 Oct 15, 2024
750f4dd
Add drive letter for all extents in volume, not only first extent
Adam1213 Nov 4, 2024
d85014d
Merge branch 'Spec-ify:main' into disk-vds
Adam1213 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 61 additions & 50 deletions client/data/Methods/Hardware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,14 @@ private static List<DiskDrive> GetBasicDriveInfo()
{
drive.DeviceName = drive.DeviceName.Trim();
}
if (!driveWmi.TryWmiRead("Name", out drive.DeviceId))
{
LogEvent($"Could not retrieve device id of drive @ index {diskNumber}", Region.Hardware, EventType.ERROR);
}
else
{
drive.DeviceId = drive.DeviceId.Trim();
}
if (!driveWmi.TryWmiRead("SerialNumber", out drive.SerialNumber))
{
LogEvent($"Could not retrieve serial number of drive @ index {diskNumber}", Region.Hardware, EventType.ERROR);
Expand Down Expand Up @@ -859,25 +867,18 @@ private static List<DiskDrive> GetBitlockerStatus(List<DiskDrive> drives)
}
return drives;
}

private static Partition GetPartitionByDriveLetter(string driveLetter, List<DiskDrive> drives)
{
foreach (var drive in drives)
Partition part = drives?.SelectMany(x => x.Partitions).Where(x=> !string.IsNullOrWhiteSpace(x?.PartitionLetter)).FirstOrDefault(x => driveLetter.StartsWith(x.PartitionLetter, StringComparison.CurrentCultureIgnoreCase));

if (part == null)
{
foreach (var partition in drive.Partitions)
{
if (string.IsNullOrEmpty(partition.PartitionLetter))
{
continue;
}
if (partition.PartitionLetter.Equals(driveLetter))
{
return partition;
}
}
}
LogEvent($"A matching partition could not be found for drive letter \"{driveLetter}\"", Region.Hardware, EventType.ERROR);
return null;
}
return part;
}

private static List<DiskDrive> GetPartitionSchemes(List<DiskDrive> drives)
{
foreach (var drive in drives)
Expand Down Expand Up @@ -934,12 +935,37 @@ private static List<DiskDrive> GetPartitionSchemes(List<DiskDrive> drives)
}
private static async Task GetDiskDriveData()
{
List<DiskDrive> drives = null;
try
{
// First try getting drive information from VDS service
drives = Data.Methods.VDS.VDSClass.GetDisksInfo();

// Get device PnP ID from WMI, VDS does not provide them.
var wmidrives = GetBasicDriveInfo();

foreach (var drive in drives)
{
drive.InstanceId = wmidrives.FirstOrDefault(x => x.DeviceId.Equals(drive.DeviceId.Replace('?','.'),StringComparison.CurrentCultureIgnoreCase))?.InstanceId;
}
}
catch (Exception ex)
{
LogEvent($"Failed to get disk information from VDS service. Error: {ex.Message}", Region.Hardware, EventType.ERROR);
}

// If VDS method fails, get back to old methods
if (drives == null)
{
// "Basic" in this context refers to data we can retrieve directly from WMI without much processing. Model names, partition labels, etc.
List<DiskDrive> drives = GetBasicDriveInfo();
drives = GetBasicPartitionInfo(drives);
drives = LinkLogicalPartitions(drives);
drives = LinkNonLogicalPartitions(drives);
drives = GetPartitionSchemes(drives);
drives = GetBasicDriveInfo();
drives = GetBasicPartitionInfo(drives);
drives = LinkLogicalPartitions(drives);
drives = LinkNonLogicalPartitions(drives);
drives = GetPartitionSchemes(drives);
drives = GetDiskFreeSpace(drives);
}

drives = GetBitlockerStatus(drives);

try
Expand All @@ -960,23 +986,24 @@ private static async Task GetDiskDriveData()
LogEvent($"{e}", Region.Hardware);
}

for (int i = 0; i < drives.Count; i++)
foreach (var drive in drives.Where(x => x.SmartData == null))
{
var drive = drives[i];
if (drive.SmartData == null)
{
try
{
drive = GetNvmeSmart(drive);
GetNvmeSmart(drive);
}
catch (Exception e)
{
LogEvent($"Exception during NVMe Smart Data retrieval on drive {drive.DeviceName}", Region.Hardware, EventType.ERROR);
LogEvent($"{e}", Region.Hardware);
}
}
}

Disks = drives;
}

private static List<DiskDrive> GetDiskFreeSpace(List<DiskDrive> drives)
{
foreach (var d in drives)
{
bool complete = true;
Expand Down Expand Up @@ -1018,43 +1045,26 @@ private static async Task GetDiskDriveData()
d.DiskFree = free;
}
}
Disks = drives;
return drives;
}

private static DiskDrive GetNvmeSmart(DiskDrive drive)
{
// Stop if drive is not an NVME drive. This happens on all external drives.
if(drive.InterfaceType != "SCSI" || !drive.MediaType.ToLower().Contains("fixed"))
if (!drive.InterfaceType.Equals("NVMe", StringComparison.CurrentCultureIgnoreCase) && //VDS check
(drive.InterfaceType != "SCSI" || !drive.MediaType.ToLower().Contains("fixed"))) //Old method check
{
LogEvent($"Could not retrieve NVME Smart Data. Drive {drive.DeviceName} is not an NVME drive. Interface: {drive.InterfaceType}. Media type: {drive.MediaType}", Region.Hardware);
return drive;
}
// Get the drive letter to send to CreateFile()
string driveLetter = "";
foreach (var partition in drive.Partitions)
{
if (partition.PartitionLetter != null && partition.PartitionLetter.Length == 2)
{
driveLetter = partition.PartitionLetter;
break;
}
}

// If no drive letter was found, it is impossible to obtain a valid handle.
if (string.IsNullOrEmpty(driveLetter))
{
LogEvent($"Attempted to gather smart data from unlettered drive. {drive.DeviceName}", Region.Hardware, EventType.WARNING);
return drive;
}

// Find a valid handle.
driveLetter = $@"\\.\{driveLetter}" + '\0';
var handle = CreateFile(driveLetter, 0x40000000, 0x1 | 0x2, IntPtr.Zero, 0x3, 0, IntPtr.Zero);
// We can use DeviceId (Name in Windows) as a valid path to CreateFile (ex. \\?\PhysicalDrive0) instead of drive letter
var handle = CreateFile(drive.DeviceId, 0x40000000, 0x1 | 0x2, IntPtr.Zero, 0x3, 0, IntPtr.Zero);

// Verify the handle.
if (handle == new IntPtr(-1))
{
LogEvent($"NVMe Smart Data could not be retrieved. Invalid Handle. {driveLetter}", Region.Hardware, EventType.ERROR);
LogEvent($"NVMe Smart Data could not be retrieved. Invalid Handle. {drive.DeviceId}", Region.Hardware, EventType.ERROR);
LogEvent($"Interop Error: {new Win32Exception(Marshal.GetLastWin32Error()).Message}", Region.Hardware);
return drive;
}
Expand Down Expand Up @@ -1110,7 +1120,7 @@ private static DiskDrive GetNvmeSmart(DiskDrive drive)
if (!result)
{
string errorMessage = new Win32Exception(Marshal.GetLastWin32Error()).Message;
LogEvent($"Interop failure during NVMe SMART data retrieval. {Marshal.GetLastWin32Error()} - {errorMessage} on drive {driveLetter}", Region.Hardware, EventType.ERROR);
LogEvent($"Interop failure during NVMe SMART data retrieval. {Marshal.GetLastWin32Error()} - {errorMessage} on drive {drive.DiskNumber}", Region.Hardware, EventType.ERROR);
Marshal.FreeHGlobal(buffer);
return drive;
}
Expand All @@ -1123,7 +1133,7 @@ private static DiskDrive GetNvmeSmart(DiskDrive drive)
var driveTemperature = ((uint)smartInfo->Temperature[1] << 8 | smartInfo->Temperature[0]) - 273;
if (driveTemperature > 100)
{
LogEvent($"SMART data retrieval error - Data not valid on drive {driveLetter}", Region.Hardware, EventType.ERROR);
LogEvent($"SMART data retrieval error - Data not valid on drive {drive.DiskNumber}", Region.Hardware, EventType.ERROR);
Marshal.FreeHGlobal(buffer);
return drive;
}
Expand Down Expand Up @@ -1178,6 +1188,7 @@ private static DiskDrive GetNvmeSmart(DiskDrive drive)
Marshal.FreeHGlobal(buffer);
return drive;
}

private unsafe static SmartAttribute MakeNvmeAttribute(byte* attr, byte id, string name)
{
unsafe
Expand Down
Loading