Mirrors/MalwareMultiScan
1
0
Fork 0
mirror of https://github.com/volodymyrsmirnov/MalwareMultiScan.git synced 2025-10-10 20:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

finalize refactoring & ready for the PR

Browse Source
This commit is contained in:
Volodymyr Smirnov
2020-10-26 21:24:40 +02:00
parent 14c9c26979
commit 62cdcdbb49
34 changed files with 229 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MalwareMultiScan.Scanner/Dockerfile
View File

@@ -2,11 +2,10 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS builder
WORKDIR /src
COPY MalwareMultiScan.Worker /src/MalwareMultiScan.Worker
COPY MalwareMultiScan.Shared /src/MalwareMultiScan.Shared
COPY MalwareMultiScan.Worker /src/MalwareMultiScan.Scanner
COPY MalwareMultiScan.Backends /src/MalwareMultiScan.Backends
RUN dotnet publish -c Release -r linux-x64 -o ./publish MalwareMultiScan.Worker/MalwareMultiScan.Worker.csproj
RUN dotnet publish -c Release -r linux-x64 -o ./publish MalwareMultiScan.Scanner/MalwareMultiScan.Scanner.csproj
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1
@@ -14,7 +13,4 @@ WORKDIR /worker
COPY --from=builder /src/publish /worker
ENV ASPNETCORE_ENVIRONMENT=Production
ENV ASPNETCORE_URLS=http://+:9901
ENTRYPOINT ["/worker/MalwareMultiScan.Worker"]
ENTRYPOINT ["/worker/MalwareMultiScan.Scanner"]

5
MalwareMultiScan.Scanner/MalwareMultiScan.Scanner.csproj
View File

@@ -11,10 +11,5 @@
<ItemGroup>
<ProjectReference Include="..\MalwareMultiScan.Backends\MalwareMultiScan.Backends.csproj" />
<ProjectReference Include="..\MalwareMultiScan.Shared\MalwareMultiScan.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="Properties\launchSettings.json" />
</ItemGroup>
</Project>

25
MalwareMultiScan.Scanner/Services/ScanHostedService.cs
View File

@@ -56,28 +56,35 @@ namespace MalwareMultiScan.Scanner.Services
var cancellationTokenSource = new CancellationTokenSource(
TimeSpan.FromSeconds(_configuration.GetValue<int>("MaxScanningTime")));
var result = new ScanResultMessage
{
Id = message.Id,
Backend = _backend.Id
};
try
{
var result = new ScanResultMessage
{
Id = message.Id,
Backend = _backend.Id,
result.Threats = await _backend.ScanAsync(
message.Uri, cancellationTokenSource.Token);
Threats = await _backend.ScanAsync(
message.Uri, cancellationTokenSource.Token)
};
result.Succeeded = true;
_logger.LogInformation(
$"Backend {_backend.Id} completed a scan of {message.Id} " +
$"with result '{string.Join(", ", result.Threats)}'");
await _bus.SendAsync(_configuration.GetValue<string>("ResultsSubscriptionId"), result);
}
catch (Exception exception)
{
result.Succeeded = false;
_logger.LogError(
exception, "Scanning failed with exception");
}
finally
{
await _bus.SendAsync(
_configuration.GetValue<string>("ResultsSubscriptionId"), result);
}
}
}
}