aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 22:44:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add torrc files in tests

Browse Source
This commit is contained in:
nicolas.dorier
2019-11-08 16:10:49 +09:00
parent 13c8372329
commit 9d3026f676
17 changed files with 79 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer.Tests/BTCPayServer.Tests.csproj
View File

@@ -45,4 +45,8 @@
<ProjectReference Include="..\BTCPayServer\BTCPayServer.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="TestData\Tor\" />
</ItemGroup>
</Project>

1
BTCPayServer.Tests/BTCPayServerTester.cs
View File

@@ -118,6 +118,7 @@ namespace BTCPayServer.Tests
config.AppendLine($"ltc.explorer.url={LTCNBXplorerUri.AbsoluteUri}");
config.AppendLine($"ltc.explorer.cookiefile=0");
config.AppendLine($"btc.lightning={IntegratedLightning.AbsoluteUri}");
config.AppendLine($"torrcfile={TestUtils.GetTestDataFullPath("Tor/torrc")}");
config.AppendLine($"debuglog=debug.log");
if (!string.IsNullOrEmpty(SSHPassword) && string.IsNullOrEmpty(SSHKeyFile))
config.AppendLine($"sshpassword={SSHPassword}");

2
BTCPayServer.Tests/SeleniumTests.cs
View File

@@ -47,6 +47,8 @@ namespace BTCPayServer.Tests
s.Driver.FindElement(By.Id("Logout")).Click();
s.Driver.AssertNoError();
Assert.Contains("Account/Login", s.Driver.Url);
// Should show the Tor address
Assert.Contains("wsaxew3qa5ljfuenfebmaf3m5ykgatct3p6zjrqwoouj3foererde3id.onion", s.Driver.PageSource);
s.Driver.Navigate().GoToUrl(s.Link("/invoices"));
Assert.Contains("ReturnUrl=%2Finvoices", s.Driver.Url);

1
BTCPayServer.Tests/TestData/Tor/hidden_services/BTC-P2P/hostname Normal file
View File

@@ -0,0 +1 @@
rhrk7ncuqfcbkt7deaysn7st32hrf2tzztoumkj2vp3cqzy2d2arvdad.onion

1
BTCPayServer.Tests/TestData/Tor/hidden_services/BTC-RPC/hostname Normal file
View File

@@ -0,0 +1 @@
r32tqfpchpiptrfltyd4ku7q3ir4yidyfe4em63iz2g5wjcauyvyj4id.onion

1
BTCPayServer.Tests/TestData/Tor/hidden_services/BTCPayServer/hostname Normal file
View File

@@ -0,0 +1 @@
wsaxew3qa5ljfuenfebmaf3m5ykgatct3p6zjrqwoouj3foererde3id.onion

1
BTCPayServer.Tests/TestData/Tor/hidden_services/BTCTransmuter/hostname Normal file
View File

@@ -0,0 +1 @@
wzaq2ek6a5g6jyhr7giqsz2gbr6qdtcuwywcyvfplvrk7ugup3virvad.onion

1
BTCPayServer.Tests/TestData/Tor/hidden_services/BitcoinP2P/hostname Normal file
View File

@@ -0,0 +1 @@
jzebv74oaugje6aeykzcypzxs6pvt27wdmrcpe4pkjfprxgem2vyi7qd.onion

1
BTCPayServer.Tests/TestData/Tor/hidden_services/WooCommerce/hostname Normal file
View File

@@ -0,0 +1 @@
aeyn6mou5himgmog4tlnbjlgx5bwtwsqttd7sn7hay6lksvlfwmtkqyd.onion

1
BTCPayServer.Tests/TestData/Tor/hidden_services/c-lightning/hostname Normal file
View File

@@ -0,0 +1 @@
uewlcjmuuwcgs43lpcc7d64k2pf4xs7yyer7ztsq6cblyjxue3bc35qd.onion

1
BTCPayServer.Tests/TestData/Tor/hidden_services/clightning/hostname Normal file
View File

@@ -0,0 +1 @@
4iz3q7dp5xn5isqxsslrvbjrltqoqqocq25zmjgzvvxm5yp57jj4buid.onion

1
BTCPayServer.Tests/TestData/Tor/hidden_services/lnd/hostname Normal file
View File

@@ -0,0 +1 @@
ii3kqeayarsxr2jqkmr2l5np2f4vn6lznk55upd3udfbfskbjdzoq4yd.onion

24
BTCPayServer.Tests/TestData/Tor/torrc Normal file
View File

@@ -0,0 +1,24 @@
# For the hidden service BTC-P2P
HiddenServiceDir hidden_services/BTC-P2P
# Redirecting to btcpayserver_bitcoind
HiddenServicePort 8333 172.19.0.2:39388
# For the hidden service BTC-RPC
HiddenServiceDir hidden_services/BTC-RPC
# Redirecting to btcpayserver_bitcoind
HiddenServicePort 8332 172.19.0.2:43782
# For the hidden service BTCPayServer
HiddenServiceDir hidden_services/BTCPayServer
# Redirecting to nginx
HiddenServicePort 80 172.19.0.13:80
# For the hidden service BTCTransmuter
HiddenServiceDir hidden_services/BTCTransmuter
# Redirecting to nginx
HiddenServicePort 80 172.19.0.13:80
# For the hidden service WooCommerce
HiddenServiceDir hidden_services/WooCommerce
# Redirecting to generated_woocommerce_1
HiddenServicePort 80 172.19.0.15:80
# For the hidden service c-lightning
HiddenServiceDir hidden_services/c-lightning
# Redirecting to btcpayserver_clightning_bitcoin
HiddenServicePort 9735 172.19.0.10:9735

12
BTCPayServer.Tests/TestUtils.cs
View File

@@ -30,6 +30,18 @@ namespace BTCPayServer.Tests
}
return directory;
}
public static string GetTestDataFullPath(string relativeFilePath)
{
var directory = new DirectoryInfo(Directory.GetCurrentDirectory());
while (directory != null && !directory.GetFiles("*.csproj").Any())
{
directory = directory.Parent;
}
return Path.Combine(directory.FullName, "TestData", relativeFilePath);
}
public static FormFile GetFormFile(string filename, string content)
{
File.WriteAllText(filename, content);

16
BTCPayServer.Tests/UnitTest1.cs
View File

@@ -532,6 +532,22 @@ namespace BTCPayServer.Tests
}
}
[Fact]
[Trait("Fast", "Fast")]
public async Task CanEnumerateTorServices()
{
var tor = new TorServices(new BTCPayNetworkProvider(NetworkType.Regtest), new BTCPayServerOptions()
{
TorrcFile = TestUtils.GetTestDataFullPath("Tor/torrc")
});
await tor.Refresh();
Assert.Single(tor.Services.Where(t => t.ServiceType == TorServiceType.BTCPayServer));
Assert.Single(tor.Services.Where(t => t.ServiceType == TorServiceType.P2P));
Assert.Single(tor.Services.Where(t => t.ServiceType == TorServiceType.RPC));
Assert.True(tor.Services.Where(t => t.ServiceType == TorServiceType.Other).Count() > 1);
}
[Fact(Timeout = 60 * 2 * 1000)]
[Trait("Integration", "Integration")]
public async Task CanSetLightningServer()

2
BTCPayServer/Program.cs
View File

@@ -16,7 +16,9 @@ using System.Collections;
using Microsoft.AspNetCore.Hosting.Server.Features;
using System.Threading;
using Serilog;
using System.Runtime.CompilerServices;
[assembly:InternalsVisibleTo("BTCPayServer.Tests")]
namespace BTCPayServer
{
class Program

11
BTCPayServer/Services/TorServices.cs
View File

@@ -41,8 +41,8 @@ namespace BTCPayServer.Services
Services = Array.Empty<TorService>();
return;
}
var services = torrc.ServiceDirectories.SelectMany(d => d.ServicePorts.Select(p => (Directory: new DirectoryInfo(d.DirectoryPath), VirtualPort: p.VirtualPort)))
var torrcDir = Path.GetDirectoryName(_Options.TorrcFile);
var services = torrc.ServiceDirectories.SelectMany(d => d.ServicePorts.Select(p => (Directory: GetDirectory(d, torrcDir), VirtualPort: p.VirtualPort)))
.Select(d => (ServiceName: d.Directory.Name,
ReadingLines: System.IO.File.ReadAllLinesAsync(Path.Combine(d.Directory.FullName, "hostname")),
VirtualPort: d.VirtualPort))
@@ -80,6 +80,13 @@ namespace BTCPayServer.Services
Services = result.ToArray();
}
private static DirectoryInfo GetDirectory(HiddenServiceDir hs, string relativeTo)
{
if (Path.IsPathRooted(hs.DirectoryPath))
return new DirectoryInfo(hs.DirectoryPath);
return new DirectoryInfo(Path.Combine(relativeTo, hs.DirectoryPath));
}
private bool TryParseP2PService(string name, out BTCPayNetworkBase network, out TorServiceType serviceType)
{
network = null;