diff --git a/Asa/Program.cs b/Asa/Program.cs index 553e8bb19..764594439 100644 --- a/Asa/Program.cs +++ b/Asa/Program.cs @@ -18,6 +18,7 @@ using System.Globalization; using System.IO; using System.Linq; +using System.Net; using System.Reflection; using System.Runtime.InteropServices; using System.Text; @@ -78,6 +79,9 @@ private static int RunGuiCommand(GuiCommandOptions opts) WebHost.CreateDefaultBuilder(Array.Empty()) .UseStartup() + .UseKestrel(options => { + options.Listen(IPAddress.Loopback, 5000); //HTTP port + }) .Build() .Run(); diff --git a/Asa/Startup.cs b/Asa/Startup.cs index e26099e26..3ae1b8203 100644 --- a/Asa/Startup.cs +++ b/Asa/Startup.cs @@ -1,8 +1,14 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Hosting; +using Serilog; +using System; +using System.IO; +using System.Reflection; namespace Asa { @@ -34,11 +40,27 @@ public static void Configure(IApplicationBuilder app, IWebHostEnvironment env) { app.UseExceptionHandler("/Home/Error"); } - app.UseStaticFiles(); app.UseRouting(); - app.UseAuthorization(); + string codeBase = Assembly.GetExecutingAssembly().CodeBase; + UriBuilder uri = new UriBuilder(codeBase); + string path = Path.Combine(Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path)),"wwwroot"); + + try + { + app.UseStaticFiles(new StaticFileOptions + { + FileProvider = new PhysicalFileProvider(path), + RequestPath = new PathString("") + }); + } + catch(Exception e) + { + Log.Debug("Had an issue setting static file path. Reverting to default."); + app.UseStaticFiles(); + } + app.UseEndpoints(endpoints => {