Skip to content
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

Fall back to message file from modern provider #149

Merged
merged 1 commit into from
May 31, 2023
Merged

Fall back to message file from modern provider #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 33 additions & 17 deletions src/EventLogExpert.Library/Providers/EventMessageProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,27 @@ public EventMessageProvider(string providerName, string computerName, Action<str

public ProviderDetails? LoadProviderDetails()
{
var provider = LoadMessagesFromModernProvider();
provider.Messages = LoadMessagesFromLegacyProvider()?.ToList();
ProviderMetadata providerMetadata = null;
try
{
providerMetadata = new ProviderMetadata(_providerName);
}
catch (Exception ex)
{
_traceAction($"Couldn't get metadata for provider {_providerName}. Exception: {ex}.");
}

ProviderDetails provider;
if (providerMetadata != null)
{
provider = LoadMessagesFromModernProvider(providerMetadata);
}
else
{
provider = new ProviderDetails { ProviderName = _providerName };
}

provider.Messages = LoadMessagesFromLegacyProvider(providerMetadata?.MessageFilePath)?.ToList();
if (provider.Events == null && provider.Messages == null)
{
return null;
Expand All @@ -56,16 +75,24 @@ public EventMessageProvider(string providerName, string computerName, Action<str
/// the registry. This information is stored at HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\EventLog
/// </summary>
/// <returns></returns>
private IEnumerable<MessageModel>? LoadMessagesFromLegacyProvider()
private IEnumerable<MessageModel>? LoadMessagesFromLegacyProvider(string? messageFilePath)
{
_traceAction($"LoadMessagesFromLegacyProvider called for provider {_providerName}");

var legacyProviderFiles = _registryProvider.GetMessageFilesForLegacyProvider(_providerName);

if (legacyProviderFiles == null)
{
_traceAction($"No message files found for provider {_providerName}. Returning null.");
return null;
if (messageFilePath == null)
{
_traceAction($"No message files found for provider {_providerName}. Returning null.");
return null;
}
else
{
_traceAction($"No message files found for provider {_providerName}. Using message file from modern provider.");
legacyProviderFiles = new[] {messageFilePath};
}
}

var messages = new List<MessageModel>();
Expand Down Expand Up @@ -188,7 +215,7 @@ private bool GetMessagesFromOneResource(IntPtr hModule, string lpszType, IntPtr
/// Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\WINEVT
/// </summary>
/// <returns></returns>
private ProviderDetails LoadMessagesFromModernProvider()
private ProviderDetails LoadMessagesFromModernProvider(ProviderMetadata providerMetadata)
{
_traceAction($"LoadMessagesFromModernProvider called for provider {_providerName}");

Expand All @@ -200,17 +227,6 @@ private ProviderDetails LoadMessagesFromModernProvider()
return provider;
}

ProviderMetadata providerMetadata;
try
{
providerMetadata = new ProviderMetadata(_providerName);
}
catch (Exception ex)
{
_traceAction($"Couldn't get metadata for provider {_providerName}. Exception: {ex}. Returning empty provider.");
return provider;
}

try
{
provider.Events = providerMetadata.Events.Select(e => new EventModel
Expand Down