refactoring and adding clamav scanning backend

This commit is contained in:
Volodymyr Smirnov
2020-10-20 17:08:40 +03:00
parent 7e63c77419
commit b1a2357b50
15 changed files with 128 additions and 46 deletions

View File

@@ -12,7 +12,12 @@ namespace MalwareMultiScan.Backends.Backends.Abstracts
public abstract class AbstractLocalProcessScanBackend : AbstractScanBackend
{
private readonly ILogger _logger;
protected AbstractLocalProcessScanBackend(ILogger logger)
{
_logger = logger;
}
protected virtual Regex MatchRegex { get; }
protected virtual string BackendPath { get; }
protected virtual bool ParseStdErr { get; }
@@ -22,11 +27,6 @@ namespace MalwareMultiScan.Backends.Backends.Abstracts
throw new NotImplementedException();
}
protected AbstractLocalProcessScanBackend(ILogger logger)
{
_logger = logger;
}
public override async Task<string[]> ScanAsync(string path, CancellationToken cancellationToken)
{
var process = new Process
@@ -38,12 +38,12 @@ namespace MalwareMultiScan.Backends.Backends.Abstracts
WorkingDirectory = Path.GetDirectoryName(BackendPath) ?? Directory.GetCurrentDirectory()
}
};
_logger.LogInformation(
$"Starting process {process.StartInfo.FileName} " +
$"with arguments {process.StartInfo.Arguments} " +
$"in working directory {process.StartInfo.WorkingDirectory}");
process.Start();
cancellationToken.Register(() =>
@@ -51,14 +51,14 @@ namespace MalwareMultiScan.Backends.Backends.Abstracts
if (!process.HasExited)
process.Kill(true);
});
process.WaitForExit();
_logger.LogInformation($"Process has exited with code {process.ExitCode}");
var standardOutput = await process.StandardOutput.ReadToEndAsync();
var standardError = await process.StandardError.ReadToEndAsync();
_logger.LogDebug($"Process standard output: {standardOutput}");
_logger.LogDebug($"Process standard error: {standardError}");

View File

@@ -11,9 +11,9 @@ namespace MalwareMultiScan.Backends.Backends.Abstracts
public abstract class AbstractScanBackend : IScanBackend
{
public virtual string Name => throw new NotImplementedException();
public virtual DateTime DatabaseLastUpdate => throw new NotImplementedException();
public virtual Task<string[]> ScanAsync(string path, CancellationToken cancellationToken)
{
throw new NotImplementedException();
@@ -23,14 +23,14 @@ namespace MalwareMultiScan.Backends.Backends.Abstracts
{
using var httpClient = new HttpClient();
await using var uriStream = await httpClient.GetStreamAsync(uri);
return await ScanAsync(uriStream, cancellationToken);
}
public async Task<string[]> ScanAsync(IFormFile file, CancellationToken cancellationToken)
{
await using var fileStream = file.OpenReadStream();
return await ScanAsync(fileStream, cancellationToken);
}
@@ -41,7 +41,9 @@ namespace MalwareMultiScan.Backends.Backends.Abstracts
try
{
await using (var tempFileStream = File.OpenWrite(tempFile))
{
await stream.CopyToAsync(tempFileStream, cancellationToken);
}
return await ScanAsync(tempFile, cancellationToken);
}