diff --git a/SfeduSchedule/Controllers/ScheduleController.cs b/SfeduSchedule/Controllers/ScheduleController.cs index d5c7183..cde5b31 100644 --- a/SfeduSchedule/Controllers/ScheduleController.cs +++ b/SfeduSchedule/Controllers/ScheduleController.cs @@ -29,7 +29,7 @@ namespace SfeduSchedule.Controllers } catch (HttpRequestException e) { - logger.LogError(e, "Ошибка при получении расписания"); + logger.LogError("Ошибка при получении расписания\n\n" + e.Message); return StatusCode((int)(e.StatusCode ?? HttpStatusCode.InternalServerError), e.Message); } return Ok(schedule); @@ -53,7 +53,7 @@ namespace SfeduSchedule.Controllers } catch (HttpRequestException e) { - logger.LogError(e, "Ошибка при поиске аудиторий"); + logger.LogError("Ошибка при поиске аудиторий\n\n" + e.Message); return StatusCode((int)(e.StatusCode ?? HttpStatusCode.InternalServerError), e.Message); } return Ok(rooms); diff --git a/SfeduSchedule/Program.cs b/SfeduSchedule/Program.cs index 05c2913..955691c 100644 --- a/SfeduSchedule/Program.cs +++ b/SfeduSchedule/Program.cs @@ -1,6 +1,5 @@ using System.Threading.RateLimiting; using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Identity.Web; using Quartz; using SfeduSchedule; @@ -144,13 +143,21 @@ builder.Services.Configure(options => ForwardedHeaders.XForwardedProto; options.KnownNetworks.Clear(); options.KnownProxies.Clear(); + + options.KnownNetworks.Add(new IPNetwork(System.Net.IPAddress.Parse("127.0.0.1"), 8)); // localhost + options.KnownNetworks.Add(new IPNetwork(System.Net.IPAddress.Parse("10.0.0.0"), 8)); // 10.x.x.x + options.KnownNetworks.Add(new IPNetwork(System.Net.IPAddress.Parse("192.168.0.0"), 16)); // 192.168.x.x + options.KnownNetworks.Add(new IPNetwork(System.Net.IPAddress.Parse("172.16.0.0"), 12)); // 172.16.x.x - 172.31.x.x }); var app = builder.Build(); var logger = app.Services.GetRequiredService>(); -app.UseForwardedHeaders(); +app.UseForwardedHeaders(new ForwardedHeadersOptions +{ + ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost +}); if (string.IsNullOrEmpty(preinstalledJwtToken)) {