notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/core] Add support for HTTP proxy authentication

Browse source
This commit is contained in:
Laura Hausmann 2025-01-12 08:34:07 +01:00
parent ea7bcfa652
commit 09919bdc77
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Iceshrimp.Backend/Core/Configuration/Config.cs
View file

@ -71,6 +71,8 @@ public sealed class Config
public sealed class NetworkSection public sealed class NetworkSection
{ {
public string? HttpProxy { get; init; } = null; public string? HttpProxy { get; init; } = null;
public string? HttpProxyUser { get; init; } = null!;
public string? HttpProxyPass { get; init; } = null!;
} }
public sealed class DatabaseSection public sealed class DatabaseSection

11
Iceshrimp.Backend/Core/Services/CustomHttpClient.cs
View file

@ -37,7 +37,16 @@ public class CustomHttpClient : HttpClient, IService<HttpClient>, ISingletonServ
ILoggerFactory loggerFactory ILoggerFactory loggerFactory
) )
{ {
var proxy = network.Value.HttpProxy != null ? new WebProxy(network.Value.HttpProxy) : null; // Configure HTTP proxy, if enabled
WebProxy? proxy = null;
if (network.Value.HttpProxy != null)
{
var creds = network.Value.HttpProxyUser != null || network.Value.HttpProxyPass != null
? new NetworkCredential(network.Value.HttpProxyUser, network.Value.HttpProxyPass)
: null;
proxy = new WebProxy(network.Value.HttpProxy, false, null, creds);
}
var fastFallback = new FastFallback(loggerFactory.CreateLogger<FastFallback>(), security, proxy != null); var fastFallback = new FastFallback(loggerFactory.CreateLogger<FastFallback>(), security, proxy != null);
var innerHandler = new SocketsHttpHandler var innerHandler = new SocketsHttpHandler
{ {

2
Iceshrimp.Backend/configuration.ini
View file

@ -80,6 +80,8 @@ PublicPreview = Public
[Network] [Network]
;; Uncomment to use the specified HTTP proxy for all outgoing requests. Backend restart is required to apply changes. ;; Uncomment to use the specified HTTP proxy for all outgoing requests. Backend restart is required to apply changes.
;HttpProxy = 127.0.0.1:8080 ;HttpProxy = 127.0.0.1:8080
;HttpProxyUser =
;HttpProxyPass =
[Performance] [Performance]
;; Maximum number of incoming federation requests to handle concurrently. ;; Maximum number of incoming federation requests to handle concurrently.