serega404/SfeduSchedule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Небольшие улучшения логирования и проксирования
All checks were successful
Create and publish a Docker image / Publish image (push) Successful in 10m44s
Details

Browse Source
This commit is contained in:
Sergey Karmanov
2025-09-12 17:17:41 +03:00
parent f771dafcde
commit 39209a4713
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SfeduSchedule/Controllers/ScheduleController.cs
View File

@@ -29,7 +29,7 @@ namespace SfeduSchedule.Controllers
} }
catch (HttpRequestException e) catch (HttpRequestException e)
{ {
logger.LogError(e, "Ошибка при получении расписания"); logger.LogError("Ошибка при получении расписания\n\n" + e.Message);
return StatusCode((int)(e.StatusCode ?? HttpStatusCode.InternalServerError), e.Message); return StatusCode((int)(e.StatusCode ?? HttpStatusCode.InternalServerError), e.Message);
} }
return Ok(schedule); return Ok(schedule);
@@ -53,7 +53,7 @@ namespace SfeduSchedule.Controllers
} }
catch (HttpRequestException e) catch (HttpRequestException e)
{ {
logger.LogError(e, "Ошибка при поиске аудиторий"); logger.LogError("Ошибка при поиске аудиторий\n\n" + e.Message);
return StatusCode((int)(e.StatusCode ?? HttpStatusCode.InternalServerError), e.Message); return StatusCode((int)(e.StatusCode ?? HttpStatusCode.InternalServerError), e.Message);
} }
return Ok(rooms); return Ok(rooms);

11
SfeduSchedule/Program.cs
View File

@@ -1,6 +1,5 @@
using System.Threading.RateLimiting; using System.Threading.RateLimiting;
using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.Identity.Web; using Microsoft.Identity.Web;
using Quartz; using Quartz;
using SfeduSchedule; using SfeduSchedule;
@@ -144,13 +143,21 @@ builder.Services.Configure<ForwardedHeadersOptions>(options =>
ForwardedHeaders.XForwardedProto; ForwardedHeaders.XForwardedProto;
options.KnownNetworks.Clear(); options.KnownNetworks.Clear();
options.KnownProxies.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 app = builder.Build();
var logger = app.Services.GetRequiredService<ILogger<Program>>(); var logger = app.Services.GetRequiredService<ILogger<Program>>();
app.UseForwardedHeaders(); app.UseForwardedHeaders(new ForwardedHeadersOptions
{
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost
});
if (string.IsNullOrEmpty(preinstalledJwtToken)) if (string.IsNullOrEmpty(preinstalledJwtToken))
{ {