Remove mvc (#316)

* Refactoring --------- Co-authored-by: Boris Ahrens <boris.ahrens@gdata.de>
GDATASoftwareAG · Mar 14, 2024 · 594ebb3 · 594ebb3
1 parent 50c7665
commit 594ebb3
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 79 deletions.
diff --git a/src/MalwareSampleExchange.Console/Controllers/SampleApiController.cs b/src/MalwareSampleExchange.Console/Controllers/SampleApiController.cs
@@ -1,16 +1,9 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using JWT.Algorithms;
 using Microsoft.AspNetCore.Mvc;
 using JWT.Builder;
 using JWT.Exceptions;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using MalwareSampleExchange.Console.Attributes;
 using MalwareSampleExchange.Console.Models;
@@ -52,7 +45,7 @@ public SampleApiController(ISampleStorageHandler sampleStorageHandler, ILogger<S
     /// <param name="token">download</param>
     /// <param name="cancellationToken"></param>
     [HttpGet]
-    [Route("downloads/v1/download")]
+    [Route("v1/download")]
     [AllowAnonymous]
     [ValidateModelState]
     [SwaggerResponse(StatusCodes.Status400BadRequest, "The token is expired.")]

diff --git a/src/MalwareSampleExchange.Console/Controllers/TokensApiController.cs b/src/MalwareSampleExchange.Console/Controllers/TokensApiController.cs
@@ -39,7 +39,7 @@ public TokensApiController(ILogger<TokensApiController> logger, IListRequester l
     /// <param name="end">(Default: today's date )</param>
     /// <param name="token"></param>
     [HttpGet]
-    [Route("lists/v1/list")]
+    [Route("v1/list")]
     [ValidateModelState]
     [SwaggerResponse(StatusCodes.Status400BadRequest, "Start Date has to be before end date")]
     [SwaggerResponse(StatusCodes.Status401Unauthorized, "Unauthorized!")]

diff --git a/src/MalwareSampleExchange.Console/Controllers/UploadApiController.cs b/src/MalwareSampleExchange.Console/Controllers/UploadApiController.cs
@@ -1,12 +1,7 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using MalwareSampleExchange.Console.Database;
 using MalwareSampleExchange.Console.Models;
 using MalwareSampleExchange.Console.SampleStorage;

diff --git a/src/MalwareSampleExchange.Console/Database/IPartnerProvider.cs b/src/MalwareSampleExchange.Console/Database/IPartnerProvider.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using MalwareSampleExchange.Console.Models;
-
 namespace MalwareSampleExchange.Console.Database;
 
 public interface IPartnerProvider

diff --git a/src/MalwareSampleExchange.Console/Database/MongoMetadataOptions.cs b/src/MalwareSampleExchange.Console/Database/MongoMetadataOptions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace MalwareSampleExchange.Console.Database;
 
 public class MongoMetadataOptions

diff --git a/src/MalwareSampleExchange.Console/ListRequester/Hashing.cs b/src/MalwareSampleExchange.Console/ListRequester/Hashing.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 

diff --git a/src/MalwareSampleExchange.Console/ListRequester/ListRequesterOptions.cs b/src/MalwareSampleExchange.Console/ListRequester/ListRequesterOptions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace MalwareSampleExchange.Console.ListRequester;
 
 public class ListRequesterOptions

diff --git a/src/MalwareSampleExchange.Console/LogEvents.cs b/src/MalwareSampleExchange.Console/LogEvents.cs
@@ -1,14 +1,10 @@
-using Microsoft.Extensions.Logging;
-
 #pragma warning disable 1591
 
 namespace MalwareSampleExchange.Console;
 
 public static class LogEvents
 {
     private static readonly int Id;
-    //Trace
-    public static EventId HashListResponse = new(++Id, nameof(HashListResponse));
     public static EventId HashListRequest = new(++Id, nameof(HashListRequest));
     public static EventId UnknownPartner = new(++Id, nameof(UnknownPartner));
     public static EventId TokenExpired = new(++Id, nameof(TokenExpired));

diff --git a/src/MalwareSampleExchange.Console/Models/Error.cs b/src/MalwareSampleExchange.Console/Models/Error.cs
@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 using System.Text;

diff --git a/src/MalwareSampleExchange.Console/Models/ExportSample.cs b/src/MalwareSampleExchange.Console/Models/ExportSample.cs
@@ -1,4 +1,3 @@
-using System;
 using MongoDB.Bson.Serialization.Attributes;
 
 namespace MalwareSampleExchange.Console.Models;

diff --git a/src/MalwareSampleExchange.Console/Models/RequestExportSample.cs b/src/MalwareSampleExchange.Console/Models/RequestExportSample.cs
@@ -1,6 +1,3 @@
-using System;
-using MongoDB.Bson.Serialization.Attributes;
-
 namespace MalwareSampleExchange.Console.Models;
 
 public record RequestExportSample

diff --git a/src/MalwareSampleExchange.Console/Models/Sample.cs b/src/MalwareSampleExchange.Console/Models/Sample.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.Serialization;
 using System.Text;
 using Newtonsoft.Json;

diff --git a/src/MalwareSampleExchange.Console/Models/Token.cs b/src/MalwareSampleExchange.Console/Models/Token.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.Serialization;
 using System.Text;
 using Newtonsoft.Json;

diff --git a/src/MalwareSampleExchange.Console/Partner/BasicAuthenticationHandler.cs b/src/MalwareSampleExchange.Console/Partner/BasicAuthenticationHandler.cs
@@ -1,15 +1,11 @@
-using System;
 using System.Net.Http.Headers;
 using System.Security.Claims;
 using System.Text;
 using System.Text.Encodings.Web;
-using System.Threading.Tasks;
 using MalwareSampleExchange.Console.AuthHandler;
 using MalwareSampleExchange.Console.Database;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace MalwareSampleExchange.Console.Partner;

diff --git a/src/MalwareSampleExchange.Console/Partner/PartnerProvider.cs b/src/MalwareSampleExchange.Console/Partner/PartnerProvider.cs
@@ -1,13 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
 using MalwareSampleExchange.Console.Database;
 using MalwareSampleExchange.Console.ListRequester;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;

diff --git a/src/MalwareSampleExchange.Console/Partner/PartnerProviderOptions.cs b/src/MalwareSampleExchange.Console/Partner/PartnerProviderOptions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace MalwareSampleExchange.Console.Database;
 
 public class PartnerProviderOptions

diff --git a/src/MalwareSampleExchange.Console/Program.cs b/src/MalwareSampleExchange.Console/Program.cs
@@ -88,8 +88,6 @@
 services.AddAuthentication("BasicAuthentication")
  .AddScheme<AuthenticationSchemeOptions, BasicAuthenticationHandler>("BasicAuthentication", null);
 
-//curl -u "gdata:pw" -X GET -k -i 'https://malware-sample-export.processing-orange.ptata.gdata.de/v1/list?start=2022-01-14'
-// Add OpenAPI generator
 services.AddSwaggerGen(c =>
 {
     c.EnableAnnotations();
@@ -127,10 +125,9 @@
 
 var app = builder.Build();
 
-
 app.UsePrometheusServer(q =>
 {
-    var options = new PrometheusOptions();
+    var options = new MalwareSampleExchange.Console.PrometheusOptions();
     builder.Configuration.GetSection("Prometheus").Bind(options);
     q.Port = options.Port;
 });
@@ -144,19 +141,22 @@
     q.IgnoreRoutesStartWith = ["/swagger"];
 });
 
-app.UseDefaultFiles()
-    .UseForwardedHeaders()
-    .UseRouting()
-    .UseStaticFiles()
-    .UseSwagger()
-    .UseSwaggerUI(options =>
+app.UseSwagger();
+app.UseSwaggerUI(options =>
     {
         options.DocumentTitle = "Malware Sample Exchange - V1";
         options.SwaggerEndpoint("/swagger/v1/swagger.json", "Malware Sample Exchange - V1");
     });
 
+app.UseForwardedHeaders();
+app.UseRouting();
+app.UseStaticFiles();
 app.UseAuthentication();
 app.UseAuthorization();
+app.UseCors(x => x
+    .AllowAnyOrigin()
+    .AllowAnyMethod()
+    .AllowAnyHeader());
 app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
 
 if (app.Environment.IsDevelopment())
@@ -165,4 +165,3 @@
 }
 
 app.Run();
-
diff --git a/src/MalwareSampleExchange.Console/SampleStorage/FileSampleStorageHandler.cs b/src/MalwareSampleExchange.Console/SampleStorage/FileSampleStorageHandler.cs
@@ -1,9 +1,4 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace MalwareSampleExchange.Console.SampleStorage;

diff --git a/src/MalwareSampleExchange.Console/SampleStorage/ISampleStorageHandler.cs b/src/MalwareSampleExchange.Console/SampleStorage/ISampleStorageHandler.cs
@@ -1,6 +1,3 @@
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
 namespace MalwareSampleExchange.Console.SampleStorage;

diff --git a/src/MalwareSampleExchange.Console/SampleStorage/S3SampleStorageHandler.cs b/src/MalwareSampleExchange.Console/SampleStorage/S3SampleStorageHandler.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using Amazon.S3;
 using Amazon.S3.Model;
 using Microsoft.AspNetCore.Mvc;

diff --git a/src/MalwareSampleExchange.Console/SampleStorage/UrlSampleStorageHandler.cs b/src/MalwareSampleExchange.Console/SampleStorage/UrlSampleStorageHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace MalwareSampleExchange.Console.SampleStorage;