zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-830, #747, #777: Fixed issue with registry monitoring and minor improvements.

Browse source
This commit is contained in:
Damian Büchel 2024-01-15 12:16:30 +01:00
parent ef267ef186
commit 1e9d37ac13
1 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
SafeExamBrowser.SystemComponents/Registry/Registry.cs
View file

@ -19,6 +19,8 @@ namespace SafeExamBrowser.SystemComponents.Registry
{ {
public class Registry : IRegistry public class Registry : IRegistry
{ {
private const int ONE_SECOND = 1000;
private readonly ILogger logger; private readonly ILogger logger;
private readonly ConcurrentDictionary<(string key, string name), object> values; private readonly ConcurrentDictionary<(string key, string name), object> values;
@ -34,8 +36,6 @@ namespace SafeExamBrowser.SystemComponents.Registry
public void StartMonitoring(string key, string name) public void StartMonitoring(string key, string name)
{ {
const int ONE_SECOND = 1000;
if (timer?.Enabled != true) if (timer?.Enabled != true)
{ {
timer = new Timer(ONE_SECOND); timer = new Timer(ONE_SECOND);
@ -44,14 +44,17 @@ namespace SafeExamBrowser.SystemComponents.Registry
timer.Start(); timer.Start();
} }
if (TryRead(key, name, out var value)) var success = TryRead(key, name, out var value);
values.TryAdd((key, name), value);
if (success)
{ {
values.TryAdd((key, name), value);
logger.Debug($"Started monitoring value '{name}' from registry key '{key}'. Initial value: '{value}'."); logger.Debug($"Started monitoring value '{name}' from registry key '{key}'. Initial value: '{value}'.");
} }
else else
{ {
logger.Error($"Failed to start monitoring value '{name}' from registry key '{key}'!"); logger.Debug($"Started monitoring value '{name}' from registry key '{key}'. Value does currently not exist or initial read failed.");
} }
} }
@ -74,7 +77,7 @@ namespace SafeExamBrowser.SystemComponents.Registry
public bool TryRead(string key, string name, out object value) public bool TryRead(string key, string name, out object value)
{ {
var defaultValue = new object(); var defaultValue = new object();
value = default; value = default;
try try
@ -86,7 +89,7 @@ namespace SafeExamBrowser.SystemComponents.Registry
logger.Error($"Failed to read value '{name}' from registry key '{key}'!", e); logger.Error($"Failed to read value '{name}' from registry key '{key}'!", e);
} }
return value != default && !ReferenceEquals(value, defaultValue); return value != default && value != defaultValue;
} }
public bool TryGetNames(string keyName, out IEnumerable<string> names) public bool TryGetNames(string keyName, out IEnumerable<string> names)
@ -141,21 +144,41 @@ namespace SafeExamBrowser.SystemComponents.Registry
return subKeys != default; return subKeys != default;
} }
private bool Exists(string key, string name)
{
var defaultValue = new object();
var value = default(object);
try
{
value = Microsoft.Win32.Registry.GetValue(key, name, defaultValue);
}
catch (Exception e)
{
logger.Error($"Failed to read value '{name}' from registry key '{key}'!", e);
}
return value != default && value != defaultValue;
}
private void Timer_Elapsed(object sender, ElapsedEventArgs e) private void Timer_Elapsed(object sender, ElapsedEventArgs e)
{ {
foreach (var item in values) foreach (var item in values)
{ {
if (TryRead(item.Key.key, item.Key.name, out var value)) if (Exists(item.Key.key, item.Key.name))
{ {
if (!Equals(item.Value, value)) if (TryRead(item.Key.key, item.Key.name, out var value))
{ {
logger.Debug($"Value '{item.Key.name}' from registry key '{item.Key.key}' has changed from '{item.Value}' to '{value}'!"); if (!Equals(item.Value, value))
ValueChanged?.Invoke(item.Key.key, item.Key.name, item.Value, value); {
logger.Debug($"Value '{item.Key.name}' from registry key '{item.Key.key}' has changed from '{item.Value}' to '{value}'!");
ValueChanged?.Invoke(item.Key.key, item.Key.name, item.Value, value);
}
}
else
{
logger.Error($"Failed to monitor value '{item.Key.name}' from registry key '{item.Key.key}'!");
} }
}
else
{
logger.Error($"Failed to monitor value '{item.Key.name}' from registry key '{item.Key.key}'!");
} }
} }
} }