Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion angular-admin/src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const environment = {
clientId: 'Exam_Admin_App',
responseType: 'code',
scope: 'offline_access Exam',
requireHttps: false
requireHttps: true
},
apis: {
default: {
Expand Down
31 changes: 25 additions & 6 deletions aspnet-core/src/SuperAbp.Exam.AuthServer/ExamAuthServerModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using OpenIddict.Server.AspNetCore;
Expand All @@ -16,6 +17,7 @@
using System;
using System.IO;
using System.Linq;
using System.Net;
using Volo.Abp;
using Volo.Abp.Account;
using Volo.Abp.Account.Localization;
Expand Down Expand Up @@ -185,22 +187,39 @@
{
var app = context.GetApplicationBuilder();
var env = context.GetEnvironment();
var configuration = context.GetConfiguration();

if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
}

// Configure forwarded headers for Cloudflare Tunnel
// Cloudflare forwards: X-Forwarded-For, X-Forwarded-Host, X-Forwarded-Proto
app.UseForwardedHeaders(new ForwardedHeadersOptions
var cloudflareEnabled = configuration.GetValue<bool>("Cloudflare:Enabled", false);
var forwardedHeadersOptions = new ForwardedHeadersOptions
{
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto,
// Only accept from Cloudflare (or remove this line to accept all proxies)
// KnownProxies = { IPAddress.Parse("173.245.48.0/20"), /* Add Cloudflare IP ranges */ }
// Allow all forwarded headers (for development with Cloudflare Tunnel)
RequireHeaderSymmetry = false
});
};

if (cloudflareEnabled)
{
// Configure Cloudflare IP ranges from configuration
var ipv4Ranges = configuration.GetSection("Cloudflare:IPv4Ranges").Get<string[]>() ?? Array.Empty<string>();
var ipv6Ranges = configuration.GetSection("Cloudflare:IPv6Ranges").Get<string[]>() ?? Array.Empty<string>();

foreach (var range in ipv4Ranges)
{
forwardedHeadersOptions.KnownNetworks.Add(IPNetwork.Parse(range));

Check failure on line 213 in aspnet-core/src/SuperAbp.Exam.AuthServer/ExamAuthServerModule.cs

View workflow job for this annotation

GitHub Actions / build-test

'IPNetwork' is an ambiguous reference between 'Microsoft.AspNetCore.HttpOverrides.IPNetwork' and 'System.Net.IPNetwork'

Check failure on line 213 in aspnet-core/src/SuperAbp.Exam.AuthServer/ExamAuthServerModule.cs

View workflow job for this annotation

GitHub Actions / build-test

'IPNetwork' is an ambiguous reference between 'Microsoft.AspNetCore.HttpOverrides.IPNetwork' and 'System.Net.IPNetwork'
}

foreach (var range in ipv6Ranges)
{
forwardedHeadersOptions.KnownNetworks.Add(IPNetwork.Parse(range));

Check failure on line 218 in aspnet-core/src/SuperAbp.Exam.AuthServer/ExamAuthServerModule.cs

View workflow job for this annotation

GitHub Actions / build-test

'IPNetwork' is an ambiguous reference between 'Microsoft.AspNetCore.HttpOverrides.IPNetwork' and 'System.Net.IPNetwork'

Check failure on line 218 in aspnet-core/src/SuperAbp.Exam.AuthServer/ExamAuthServerModule.cs

View workflow job for this annotation

GitHub Actions / build-test

'IPNetwork' is an ambiguous reference between 'Microsoft.AspNetCore.HttpOverrides.IPNetwork' and 'System.Net.IPNetwork'
}
}

app.UseForwardedHeaders(forwardedHeadersOptions);

app.UseAbpRequestLocalization();

Expand Down
Loading