Removed temperature reading feature entirely from the client including the required LibreHardwareMonitor package.

This was in response to Windows tightening security around the ring0 driver making this feature unfeasible for now.

Author: XarahNCline

client/Monolith.cs

@@ -357,7 +357,6 @@ public class MonolithHardware
         public List<Dictionary<string, object>> Devices;
         public List<Dictionary<string, object>> BiosInfo;
         public List<DiskDrive> Storage;
-        public List<TempMeasurement> Temperatures;
         public List<BatteryData> Batteries;
         public bool WriteSuccess;
         public int ErrorCount;
@@ -374,7 +373,6 @@ public MonolithHardware()
             Devices = Cache.Devices;
             BiosInfo = Cache.BiosInfo;
             Storage = Cache.Disks;
-            Temperatures = Cache.Temperatures;
             Batteries = Cache.Batteries;
             WriteSuccess = Cache.HardwareWriteSuccess;
             ErrorCount = DebugLog.ErrorCount[(int)DebugLog.Region.Hardware];

client/data/Cache.cs

@@ -62,7 +62,6 @@ public static partial class Cache
     public static Dictionary<string, object> Tpm { get; private set; }
     public static List<Dictionary<string, object>> Drivers { get; private set; }
     public static List<Dictionary<string, object>> Devices { get; private set; }
-    public static List<TempMeasurement> Temperatures { get; private set; }
     public static List<BatteryData> Batteries { get; private set; }
     public static bool? SecureBootEnabled { get; private set; }
     public static List<IRegistryValue> ChoiceRegistryValues { get; private set; }

client/data/Methods/Hardware.cs

@@ -1,6 +1,3 @@
-#if !NORING
-using LibreHardwareMonitor.Hardware;
-#endif
 using Microsoft.Win32;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -34,7 +31,6 @@ public static async Task MakeHardwareData()
 
             List<Task> hardwareTaskList = new()
             {
-                DoTask(region, "GetTemps", GetTemps),
                 DoTask(region, "GetHardwareWmiData", GetHardwareWmiData),
                 DoTask(region, "GetMonitorInfo", GetMonitorInfo),
                 DoTask(region, "GetSMBiosMemoryInfo", GetSMBiosMemoryInfo),
@@ -1313,61 +1309,6 @@ private static string GetAttributeName(byte id)
         ;
     }
 
-    // TEMPERATURES
-    private static async Task GetTemps()
-    {
-        #if NORING
-            await LogEventAsync($"Specify No Ring 0 version running. Temperatures will not be collected.", Region.Hardware, EventType.WARNING);
-        #else
-        //Any temp sensor reading below 24 will be filtered out
-        //These sensors are either not reading in celsius, are in error, or we cannot interpret them properly here
-        var Temps = new List<TempMeasurement>();
-        var computer = new Computer
-        {
-            IsCpuEnabled = true,
-            IsGpuEnabled = true,
-            IsMotherboardEnabled = true
-        };
-
-        try
-        {
-            computer.Open();
-            computer.Accept(new SensorUpdateVisitor());
-
-            foreach (var hardware in computer.Hardware)
-            {
-                Temps.AddRange(
-                    from subhardware in hardware.SubHardware
-                    from sensor in subhardware.Sensors
-                    where sensor.SensorType.Equals(SensorType.Temperature) && sensor.Value > 24 || sensor.Name.ToLower().Contains("tjmax")
-                    select new TempMeasurement
-                    { Hardware = hardware.Name, SensorName = sensor.Name, SensorValue = sensor.Value.Value }
-                    );
-
-                Temps.AddRange(
-                    from sensor in hardware.Sensors
-                    where sensor.SensorType.Equals(SensorType.Temperature) && sensor.Value > 24 || sensor.Name.ToLower().Contains("tjmax")
-                    select new TempMeasurement
-                    { Hardware = hardware.Name, SensorName = sensor.Name, SensorValue = sensor.Value.Value }
-                    );
-            }
-        }
-        catch (OverflowException)
-        {
-            await LogEventAsync("Absolute value overflow occurred when fetching temperature data", Region.Hardware, EventType.ERROR);
-        }
-        catch (Exception ex)
-        {
-            await LogEventAsync($"Exception during temperature measurement: " + ex, Region.Hardware, EventType.ERROR);
-        }
-        finally
-        {
-            computer.Close();
-        }
-        Temperatures = Temps;
-#endif
-    }
-
     // BATTERIES
     private static async Task GetBatteryData()
     {

client/data/Structs.cs

@@ -118,13 +118,6 @@ public SmartAttribute(byte id, string name, string rawValue)
     }
 }
 
-public class TempMeasurement
-{
-    public string Hardware;
-    public string SensorName;
-    public float SensorValue;
-}
-
 public class TCPConnection
 {
     public string LocalIPAddress;
@@ -172,28 +165,6 @@ public class EdidData
     public string Checksum; // Byte 127
 }
 
-#if !NORING
-public class SensorUpdateVisitor : IVisitor
-{
-    public void VisitComputer(IComputer computer)
-    {
-        computer.Traverse(this);
-    }
-
-    public void VisitHardware(IHardware hardware)
-    {
-        hardware.Update();
-        foreach (var subHardware in hardware.SubHardware) subHardware.Accept(this);
-    }
-
-    public void VisitSensor(ISensor sensor)
-    { }
-
-    public void VisitParameter(IParameter parameter)
-    { }
-}
-#endif
-
 public interface IRegistryValue
 { }
 

client/packages.config

@@ -2,7 +2,6 @@
 <packages>
   <package id="HidSharp" version="2.1.0" targetFramework="net472" />
   <package id="ILRepack.Lib.MSBuild.Task" version="2.0.34.1" targetFramework="net472" developmentDependency="true" />
-  <package id="LibreHardwareMonitorLib" version="0.9.3" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.CodeDom" version="8.0.0" targetFramework="net472" />

client/specify_client.csproj

@@ -62,12 +62,6 @@
     <PlatformTarget>x64</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(Configuration)'=='Debug' Or '$(Configuration)'=='Release'">
-    <Reference Include="LibreHardwareMonitorLib, Version=0.9.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\LibreHardwareMonitorLib.0.9.3\lib\net472\LibreHardwareMonitorLib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="HidSharp, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\HidSharp.2.1.0\lib\net35\HidSharp.dll</HintPath>