From 20357c8e75c5b2f3d9951d9165a3de66a45af7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20B=C3=BCchel?= Date: Fri, 29 Jul 2022 13:49:26 +0200 Subject: [PATCH] SEBWIN-577: Implemented detection of BIOS manufacturer & name. --- .../ISystemInfo.cs | 17 ++- .../SystemInfo.cs | 105 +++++++++++++----- .../VirtualMachineDetector.cs | 18 +-- 3 files changed, 96 insertions(+), 44 deletions(-) diff --git a/SafeExamBrowser.SystemComponents.Contracts/ISystemInfo.cs b/SafeExamBrowser.SystemComponents.Contracts/ISystemInfo.cs index 1a63a220..8c379370 100644 --- a/SafeExamBrowser.SystemComponents.Contracts/ISystemInfo.cs +++ b/SafeExamBrowser.SystemComponents.Contracts/ISystemInfo.cs @@ -13,11 +13,21 @@ namespace SafeExamBrowser.SystemComponents.Contracts /// public interface ISystemInfo { + /// + /// The manufacturer and name of the BIOS. + /// + string BiosInfo { get; } + /// /// Reveals whether the computer system contains a battery. /// bool HasBattery { get; } + /// + /// The MAC address of the network adapter. + /// + string MacAddress { get; } + /// /// The manufacturer name of the computer system. /// @@ -44,12 +54,7 @@ namespace SafeExamBrowser.SystemComponents.Contracts string OperatingSystemInfo { get; } /// - /// The MAC address of the network adapter - /// - string MacAddress { get; } - - /// - /// Provides the DeviceID information of the user's Plug and Play devices + /// Provides the device ID information of the user's Plug and Play devices. /// string[] PlugAndPlayDeviceIds { get; } } diff --git a/SafeExamBrowser.SystemComponents/SystemInfo.cs b/SafeExamBrowser.SystemComponents/SystemInfo.cs index 2fa63fa2..96db3a4d 100644 --- a/SafeExamBrowser.SystemComponents/SystemInfo.cs +++ b/SafeExamBrowser.SystemComponents/SystemInfo.cs @@ -19,25 +19,23 @@ namespace SafeExamBrowser.SystemComponents { public class SystemInfo : ISystemInfo { + public string BiosInfo { get; private set; } public bool HasBattery { get; private set; } + public string MacAddress { get; private set; } public string Manufacturer { get; private set; } public string Model { get; private set; } public string Name { get; private set; } public OperatingSystem OperatingSystem { get; private set; } - public string MacAddress { get; private set; } + public string OperatingSystemInfo => $"{OperatingSystemName()}, {Environment.OSVersion.VersionString} ({Architecture()})"; public string[] PlugAndPlayDeviceIds { get; private set; } - public string OperatingSystemInfo - { - get { return $"{OperatingSystemName()}, {Environment.OSVersion.VersionString} ({Architecture()})"; } - } - public SystemInfo() { InitializeBattery(); + InitializeBiosInfo(); + InitializeMacAddress(); InitializeMachineInfo(); InitializeOperatingSystem(); - InitializeMacAddress(); InitializePnPDevices(); } @@ -45,7 +43,40 @@ namespace SafeExamBrowser.SystemComponents { var status = SystemInformation.PowerStatus.BatteryChargeStatus; - HasBattery = !status.HasFlag(BatteryChargeStatus.NoSystemBattery) && !status.HasFlag(BatteryChargeStatus.Unknown); + HasBattery = !status.HasFlag(BatteryChargeStatus.NoSystemBattery); + HasBattery &= !status.HasFlag(BatteryChargeStatus.Unknown); + } + + private void InitializeBiosInfo() + { + var manufacturer = default(string); + var name = default(string); + + try + { + using (var searcher = new ManagementObjectSearcher("SELECT * FROM Win32_BIOS")) + using (var results = searcher.Get()) + using (var bios = results.Cast().First()) + { + foreach (var property in bios.Properties) + { + if (property.Name.Equals("Manufacturer")) + { + manufacturer = Convert.ToString(property.Value); + } + else if (property.Name.Equals("Name")) + { + name = Convert.ToString(property.Value); + } + } + } + + BiosInfo = $"{manufacturer} {name}"; + } + catch (Exception) + { + BiosInfo = ""; + } } private void InitializeMachineInfo() @@ -80,7 +111,7 @@ namespace SafeExamBrowser.SystemComponents } } - Model = string.Join(" ", systemFamily, model); + Model = $"{systemFamily} {model}"; } catch (Exception) { @@ -93,8 +124,8 @@ namespace SafeExamBrowser.SystemComponents private void InitializeOperatingSystem() { // IMPORTANT: - // In order to be able to retrieve the correct operating system version via System.Environment.OSVersion, the executing - // assembly needs to define an application manifest where the supported Windows versions are specified! + // In order to be able to retrieve the correct operating system version via System.Environment.OSVersion, + // the executing assembly needs to define an application manifest specifying all supported Windows versions! var major = Environment.OSVersion.Version.Major; var minor = Environment.OSVersion.Version.Minor; var build = Environment.OSVersion.Version.Build; @@ -154,26 +185,35 @@ namespace SafeExamBrowser.SystemComponents private void InitializeMacAddress() { - using (var searcher = new ManagementObjectSearcher("SELECT MACAddress FROM Win32_NetworkAdapterConfiguration WHERE DNSDomain IS NOT NULL")) - using (var results = searcher.Get()) + const string UNDEFINED = "000000000000"; + + try { - if (results != null && results.Count > 0) + using (var searcher = new ManagementObjectSearcher("SELECT MACAddress FROM Win32_NetworkAdapterConfiguration WHERE DNSDomain IS NOT NULL")) + using (var results = searcher.Get()) { - using (var networkAdapter = results.Cast().First()) + if (results != null && results.Count > 0) { - foreach (var property in networkAdapter.Properties) + using (var networkAdapter = results.Cast().First()) { - if (property.Name.Equals("MACAddress")) + foreach (var property in networkAdapter.Properties) { - MacAddress = Convert.ToString(property.Value).Replace(":", "").ToUpper(); + if (property.Name.Equals("MACAddress")) + { + MacAddress = Convert.ToString(property.Value).Replace(":", "").ToUpper(); + } } } } + else + { + MacAddress = UNDEFINED; + } } - else - { - MacAddress = "000000000000"; - } + } + catch (Exception) + { + MacAddress = UNDEFINED; } } @@ -181,23 +221,28 @@ namespace SafeExamBrowser.SystemComponents { var deviceList = new List(); - using (var searcher = new ManagementObjectSearcher("root\\CIMV2", "SELECT DeviceID FROM Win32_PnPEntity")) - using (var results = searcher.Get()) + try { - foreach (ManagementObject queryObj in results) + using (var searcher = new ManagementObjectSearcher("root\\CIMV2", "SELECT DeviceID FROM Win32_PnPEntity")) + using (var results = searcher.Get()) { - using (queryObj) + foreach (ManagementObject queryObj in results) { - foreach (var property in queryObj.Properties) + using (queryObj) { - if (property.Name.Equals("DeviceID")) + foreach (var property in queryObj.Properties) { - deviceList.Add(Convert.ToString(property.Value).ToLower()); + if (property.Name.Equals("DeviceID")) + { + deviceList.Add(Convert.ToString(property.Value).ToLower()); + } } } } } - + } + finally + { PlugAndPlayDeviceIds = deviceList.ToArray(); } } diff --git a/SafeExamBrowser.SystemComponents/VirtualMachineDetector.cs b/SafeExamBrowser.SystemComponents/VirtualMachineDetector.cs index 6b78fa96..2cf3a4f7 100644 --- a/SafeExamBrowser.SystemComponents/VirtualMachineDetector.cs +++ b/SafeExamBrowser.SystemComponents/VirtualMachineDetector.cs @@ -15,16 +15,15 @@ namespace SafeExamBrowser.SystemComponents public class VirtualMachineDetector : IVirtualMachineDetector { /// - /// Virtualbox: VBOX, 80EE - /// RedHat: QUEMU, 1AF4, 1B36 + /// Virtualbox: VBOX, 80EE / RedHat: QUEMU, 1AF4, 1B36 /// private static readonly string[] PCI_VENDOR_BLACKLIST = { "vbox", "vid_80ee", "qemu", "ven_1af4", "ven_1b36", "subsys_11001af4" }; - private static readonly string VIRTUALBOX_MAC_PREFIX = "080027"; private static readonly string QEMU_MAC_PREFIX = "525400"; + private static readonly string VIRTUALBOX_MAC_PREFIX = "080027"; + + private readonly ILogger logger; + private readonly ISystemInfo systemInfo; - private ILogger logger; - private ISystemInfo systemInfo; - public VirtualMachineDetector(ILogger logger, ISystemInfo systemInfo) { this.logger = logger; @@ -33,12 +32,15 @@ namespace SafeExamBrowser.SystemComponents public bool IsVirtualMachine() { + var biosInfo = systemInfo.BiosInfo.ToLower(); var isVirtualMachine = false; + var macAddress = systemInfo.MacAddress; var manufacturer = systemInfo.Manufacturer.ToLower(); var model = systemInfo.Model.ToLower(); - var macAddress = systemInfo.MacAddress; var plugAndPlayDeviceIds = systemInfo.PlugAndPlayDeviceIds; + isVirtualMachine |= biosInfo.Contains("vmware"); + isVirtualMachine |= biosInfo.Contains("virtualbox"); isVirtualMachine |= manufacturer.Contains("microsoft corporation") && !model.Contains("surface"); isVirtualMachine |= manufacturer.Contains("vmware"); isVirtualMachine |= manufacturer.Contains("parallels software"); @@ -55,7 +57,7 @@ namespace SafeExamBrowser.SystemComponents isVirtualMachine |= PCI_VENDOR_BLACKLIST.Any(device.ToLower().Contains); } - logger.Debug($"Computer '{systemInfo.Name}' appears to {(isVirtualMachine ? "" : "not ")}be a virtual machine."); + logger.Debug($"Computer '{systemInfo.Name}' appears {(isVirtualMachine ? "" : "not ")}to be a virtual machine."); return isVirtualMachine; }