aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-05 22:34:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Allow bind and port for http too (#4031)"

Browse Source 
This reverts commit a51c9d2b2d.
This commit is contained in:
Kukks
2022-08-18 13:12:29 +02:00
parent 1a4a3714c7
commit b0253e11bf
2 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
BTCPayServer/Hosting/Startup.cs
View File

@@ -167,53 +167,40 @@ namespace BTCPayServer.Hosting
bool hasCertPath = !String.IsNullOrEmpty(httpsCertificateFilePath);
services.Configure<KestrelServerOptions>(kestrel =>
{
kestrel.Limits.MaxRequestLineSize =
8_192 * 10 * 5; // Around 500K, transactions passed in URI should not be bigger than this
kestrel.Limits.MaxRequestLineSize = 8_192 * 10 * 5; // Around 500K, transactions passed in URI should not be bigger than this
});
if (hasCertPath || useDefaultCertificate)
{
var bindAddress = Configuration.GetOrDefault<IPAddress>("bind", IPAddress.Any);
int bindPort = Configuration.GetOrDefault<int>("port", 443);
var bindAddress = Configuration.GetOrDefault<IPAddress>("bind", null);
int? bindPort = Configuration.GetOrDefault("port", -1);
bindPort = bindPort == -1 ? null : bindPort;
if (hasCertPath || useDefaultCertificate)
services.Configure<KestrelServerOptions>(kestrel =>
{
bindAddress ??= IPAddress.Any;
bindPort ??= 443;
if (hasCertPath && !File.Exists(httpsCertificateFilePath))
{
// Note that by design this is a fatal error condition that will cause the process to exit.
throw new ConfigException(
$"The https certificate file could not be found at {httpsCertificateFilePath}.");
throw new ConfigException($"The https certificate file could not be found at {httpsCertificateFilePath}.");
}
if (hasCertPath && useDefaultCertificate)
{
throw new ConfigException(
$"Conflicting settings: if HttpsUseDefaultCertificate is true, HttpsCertificateFilePath should not be used");
throw new ConfigException($"Conflicting settings: if HttpsUseDefaultCertificate is true, HttpsCertificateFilePath should not be used");
}
}
if (bindAddress is not null && bindPort is not null)
{
kestrel.Listen(bindAddress, bindPort.Value, l =>
kestrel.Listen(bindAddress, bindPort, l =>
{
if (hasCertPath || useDefaultCertificate)
if (hasCertPath)
{
if (hasCertPath)
{
Logs.Configuration.LogInformation(
$"Using HTTPS with the certificate located in {httpsCertificateFilePath}.");
l.UseHttps(httpsCertificateFilePath,
Configuration.GetOrDefault<string>("HttpsCertificateFilePassword", null));
}
else
{
Logs.Configuration.LogInformation($"Using HTTPS with the default certificate");
l.UseHttps();
}
Logs.Configuration.LogInformation($"Using HTTPS with the certificate located in {httpsCertificateFilePath}.");
l.UseHttps(httpsCertificateFilePath, Configuration.GetOrDefault<string>("HttpsCertificateFilePassword", null));
}
else
{
Logs.Configuration.LogInformation($"Using HTTPS with the default certificate");
l.UseHttps();
}
});
}
});
});
}
}
public void Configure(
IApplicationBuilder app,

6
BTCPayServer/Properties/launchSettings.json
View File

@@ -31,7 +31,7 @@
"BTCPAY_CHEATMODE": "true",
"BTCPAY_EXPLORERPOSTGRES": "User ID=postgres;Include Error Detail=true;Host=127.0.0.1;Port=39372;Database=nbxplorer"
},
"applicationUrl": "http://localhost:14142/"
"applicationUrl": "http://0.0.0.0:14142/"
},
"Bitcoin-HTTPS": {
"commandName": "Project",
@@ -68,7 +68,7 @@
"BTCPAY_CHEATMODE": "true",
"BTCPAY_EXPLORERPOSTGRES": "User ID=postgres;Include Error Detail=true;Host=127.0.0.1;Port=39372;Database=nbxplorer"
},
"applicationUrl": "https://localhost:14142/"
"applicationUrl": "https://0.0.0.0:14142/"
},
"Altcoins-HTTPS": {
"commandName": "Project",
@@ -107,7 +107,7 @@
"BTCPAY_CHEATMODE": "true",
"BTCPAY_EXPLORERPOSTGRES": "User ID=postgres;Include Error Detail=true;Host=127.0.0.1;Port=39372;Database=nbxplorer"
},
"applicationUrl": "https://localhost:14142/"
"applicationUrl": "https://0.0.0.0:14142/"
}
}
}