Enhance Docker setup and user notification features
- Updated docker-compose.yml to include environment variables and health checks for the app service. - Modified Dockerfile to install curl for health checks and adjusted the build process for backend services. - Improved user notification handling in activation, blocking, and config revocation commands by integrating Telegram notifications. - Added new test cases to validate the updated command handlers and Telegram notifier functionality. - Enhanced documentation to reflect the new Telegram bot features and user management improvements.
This commit is contained in:
Leonid Pershin
@@ -0,0 +1,76 @@
|
||||
using System.Net;
|
||||
using PnvPanel.IntegrationTests.TestSupport;
|
||||
using Xunit;
|
||||
using static PnvPanel.IntegrationTests.TestSupport.AuthTestHelper;
|
||||
|
||||
namespace PnvPanel.IntegrationTests.Activation;
|
||||
|
||||
[Collection(IntegrationTestCollection.Name)]
|
||||
public class ActivationFlowTests(PnvPanelWebApplicationFactory factory)
|
||||
{
|
||||
private sealed record ActivationRequestResponse(Guid Id, string? Comment, DateTimeOffset CreatedAt);
|
||||
|
||||
[Fact]
|
||||
public async Task RequestThenAdminApprove_ActivatesUser()
|
||||
{
|
||||
using var userClient = factory.CreateClient();
|
||||
var userName = $"dave_{Guid.NewGuid():N}"[..20];
|
||||
var (userId, userToken) = await RegisterAndLoginAsync(userClient, userName, "P@ssw0rd123");
|
||||
userClient.UseBearerToken(userToken);
|
||||
|
||||
var requestResponse = await userClient.PostJsonAsync("/api/activation/request", new { comment = "Please activate me" });
|
||||
Assert.Equal(HttpStatusCode.OK, requestResponse.StatusCode);
|
||||
var request = await requestResponse.ReadAsAsync<ActivationRequestResponse>();
|
||||
Assert.NotNull(request);
|
||||
|
||||
using var adminClient = factory.CreateClient();
|
||||
var adminToken = await LoginAsAdminAsync(adminClient);
|
||||
adminClient.UseBearerToken(adminToken);
|
||||
|
||||
var approveResponse = await adminClient.PostAsync($"/api/admin/activation-requests/{request!.Id}/approve", content: null);
|
||||
Assert.Equal(HttpStatusCode.NoContent, approveResponse.StatusCode);
|
||||
|
||||
var meResponse = await userClient.GetAsync("/api/auth/me");
|
||||
var me = await meResponse.ReadAsAsync<CurrentUserResponse>();
|
||||
Assert.True(me!.IsActivated);
|
||||
Assert.Equal(userId, me.Id);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RequestThenAdminReject_KeepsUserNotActivated()
|
||||
{
|
||||
using var userClient = factory.CreateClient();
|
||||
var userName = $"erin_{Guid.NewGuid():N}"[..20];
|
||||
var (_, userToken) = await RegisterAndLoginAsync(userClient, userName, "P@ssw0rd123");
|
||||
userClient.UseBearerToken(userToken);
|
||||
|
||||
var requestResponse = await userClient.PostJsonAsync("/api/activation/request", new { comment = (string?)null });
|
||||
var request = await requestResponse.ReadAsAsync<ActivationRequestResponse>();
|
||||
|
||||
using var adminClient = factory.CreateClient();
|
||||
var adminToken = await LoginAsAdminAsync(adminClient);
|
||||
adminClient.UseBearerToken(adminToken);
|
||||
|
||||
var rejectResponse = await adminClient.PostJsonAsync($"/api/admin/activation-requests/{request!.Id}/reject", new { reason = "not enough info" });
|
||||
Assert.Equal(HttpStatusCode.NoContent, rejectResponse.StatusCode);
|
||||
|
||||
var meResponse = await userClient.GetAsync("/api/auth/me");
|
||||
var me = await meResponse.ReadAsAsync<CurrentUserResponse>();
|
||||
Assert.False(me!.IsActivated);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Request_WhenAlreadyPending_ReturnsConflict()
|
||||
{
|
||||
using var userClient = factory.CreateClient();
|
||||
var userName = $"frank_{Guid.NewGuid():N}"[..20];
|
||||
var (_, userToken) = await RegisterAndLoginAsync(userClient, userName, "P@ssw0rd123");
|
||||
userClient.UseBearerToken(userToken);
|
||||
|
||||
var first = await userClient.PostJsonAsync("/api/activation/request", new { comment = (string?)null });
|
||||
Assert.Equal(HttpStatusCode.OK, first.StatusCode);
|
||||
|
||||
var second = await userClient.PostJsonAsync("/api/activation/request", new { comment = (string?)null });
|
||||
Assert.Equal(HttpStatusCode.Conflict, second.StatusCode);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
using System.Net;
|
||||
using PnvPanel.IntegrationTests.TestSupport;
|
||||
using Xunit;
|
||||
using static PnvPanel.IntegrationTests.TestSupport.AuthTestHelper;
|
||||
|
||||
namespace PnvPanel.IntegrationTests.Admin;
|
||||
|
||||
[Collection(IntegrationTestCollection.Name)]
|
||||
public class NodeInboundCrudTests(PnvPanelWebApplicationFactory factory)
|
||||
{
|
||||
private sealed record NodeResponse(Guid Id, string Name, string BaseAddress, string Username, string? Location, int Status, bool IsEnabled);
|
||||
|
||||
private sealed record InboundResponse(
|
||||
Guid Id, Guid NodeId, string RemoteInboundId, int Protocol, string Remark, int Port,
|
||||
bool IsPublished, string? DisplayName, int? MaxClients, IReadOnlyList<Guid> AllowedRoleIds);
|
||||
|
||||
private sealed record SyncNodeResponse(int InboundsSynced, int Status);
|
||||
|
||||
[Fact]
|
||||
public async Task RegisterSyncListPublish_FullNodeInboundLifecycle_Succeeds()
|
||||
{
|
||||
using var adminClient = factory.CreateClient();
|
||||
var adminToken = await LoginAsAdminAsync(adminClient);
|
||||
adminClient.UseBearerToken(adminToken);
|
||||
|
||||
var registerResponse = await adminClient.PostJsonAsync("/api/admin/nodes", new
|
||||
{
|
||||
name = $"Node-{Guid.NewGuid():N}"[..20],
|
||||
baseAddress = "https://node.example.com:2053",
|
||||
username = "admin",
|
||||
password = "node-panel-password",
|
||||
location = "Germany",
|
||||
});
|
||||
Assert.Equal(HttpStatusCode.OK, registerResponse.StatusCode);
|
||||
var node = await registerResponse.ReadAsAsync<NodeResponse>();
|
||||
Assert.NotNull(node);
|
||||
|
||||
var listNodesResponse = await adminClient.GetAsync("/api/admin/nodes");
|
||||
Assert.Equal(HttpStatusCode.OK, listNodesResponse.StatusCode);
|
||||
var nodes = await listNodesResponse.ReadAsAsync<List<NodeResponse>>();
|
||||
Assert.Contains(nodes!, n => n.Id == node!.Id);
|
||||
|
||||
var syncResponse = await adminClient.PostAsync($"/api/admin/nodes/{node!.Id}/sync", content: null);
|
||||
Assert.Equal(HttpStatusCode.OK, syncResponse.StatusCode);
|
||||
var sync = await syncResponse.ReadAsAsync<SyncNodeResponse>();
|
||||
Assert.Equal(1, sync!.InboundsSynced);
|
||||
|
||||
var listInboundsResponse = await adminClient.GetAsync($"/api/admin/inbounds?nodeId={node.Id}");
|
||||
Assert.Equal(HttpStatusCode.OK, listInboundsResponse.StatusCode);
|
||||
var inbounds = await listInboundsResponse.ReadAsAsync<List<InboundResponse>>();
|
||||
var inbound = Assert.Single(inbounds!);
|
||||
Assert.False(inbound.IsPublished);
|
||||
|
||||
var publishResponse = await adminClient.SendPutJsonAsync($"/api/admin/inbounds/{inbound.Id}/publish", new
|
||||
{
|
||||
isPublished = true,
|
||||
displayName = "Germany (VLESS)",
|
||||
allowedRoleIds = Array.Empty<Guid>(),
|
||||
maxClients = (int?)null,
|
||||
});
|
||||
Assert.Equal(HttpStatusCode.OK, publishResponse.StatusCode);
|
||||
var published = await publishResponse.ReadAsAsync<InboundResponse>();
|
||||
Assert.True(published!.IsPublished);
|
||||
Assert.Equal("Germany (VLESS)", published.DisplayName);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RegisterNode_AsNonAdmin_ReturnsForbidden()
|
||||
{
|
||||
using var userClient = factory.CreateClient();
|
||||
var userName = $"greg_{Guid.NewGuid():N}"[..20];
|
||||
var (_, userToken) = await RegisterAndLoginAsync(userClient, userName, "P@ssw0rd123");
|
||||
userClient.UseBearerToken(userToken);
|
||||
|
||||
var response = await userClient.PostJsonAsync("/api/admin/nodes", new
|
||||
{
|
||||
name = "Node", baseAddress = "https://node.example.com", username = "admin", password = "pw", location = (string?)null,
|
||||
});
|
||||
|
||||
Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
using System.Net;
|
||||
using PnvPanel.IntegrationTests.TestSupport;
|
||||
using Xunit;
|
||||
using static PnvPanel.IntegrationTests.TestSupport.AuthTestHelper;
|
||||
|
||||
namespace PnvPanel.IntegrationTests.Configs;
|
||||
|
||||
[Collection(IntegrationTestCollection.Name)]
|
||||
public class ConfigQuotaTests(PnvPanelWebApplicationFactory factory)
|
||||
{
|
||||
private const int Quota = 2;
|
||||
private const int ConcurrentAttempts = 6;
|
||||
|
||||
private sealed record RoleResponse(Guid Id, string Name, int MaxConfigs, bool IsSystem);
|
||||
|
||||
private sealed record NodeResponse(Guid Id, string Name);
|
||||
|
||||
private sealed record SyncNodeResponse(int InboundsSynced, int Status);
|
||||
|
||||
private sealed record InboundResponse(Guid Id, Guid NodeId, string RemoteInboundId, int Protocol, string Remark, int Port, bool IsPublished);
|
||||
|
||||
private sealed record ActivationRequestResponse(Guid Id, string? Comment, DateTimeOffset CreatedAt);
|
||||
|
||||
/// <summary>
|
||||
/// Доказывает, что pg_advisory_xact_lock в CreateVpnConfigCommandHandler реально защищает
|
||||
/// от гонки: при параллельных запросах ровно Quota проходят, остальные — 409 QuotaExceeded.
|
||||
/// Это поведение невозможно проверить unit-тестами на InMemory-провайдере (см. Application.Tests).
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public async Task ConcurrentConfigCreation_AllowsExactlyQuotaSuccesses()
|
||||
{
|
||||
using var adminClient = factory.CreateClient();
|
||||
var adminToken = await LoginAsAdminAsync(adminClient);
|
||||
adminClient.UseBearerToken(adminToken);
|
||||
|
||||
var rolesResponse = await adminClient.GetAsync("/api/admin/roles");
|
||||
Assert.Equal(HttpStatusCode.OK, rolesResponse.StatusCode);
|
||||
var roles = await rolesResponse.ReadAsAsync<List<RoleResponse>>();
|
||||
var userRole = roles!.Single(r => r.Name == "user");
|
||||
|
||||
var updateRoleResponse = await adminClient.SendPutJsonAsync($"/api/admin/roles/{userRole.Id}", new { maxConfigs = Quota });
|
||||
Assert.Equal(HttpStatusCode.OK, updateRoleResponse.StatusCode);
|
||||
|
||||
var registerNodeResponse = await adminClient.PostJsonAsync("/api/admin/nodes", new
|
||||
{
|
||||
name = $"QuotaNode-{Guid.NewGuid():N}"[..24],
|
||||
baseAddress = "https://quota-node.example.com",
|
||||
username = "admin",
|
||||
password = "node-panel-password",
|
||||
location = (string?)null,
|
||||
});
|
||||
var node = await registerNodeResponse.ReadAsAsync<NodeResponse>();
|
||||
|
||||
var syncResponse = await adminClient.PostAsync($"/api/admin/nodes/{node!.Id}/sync", content: null);
|
||||
var sync = await syncResponse.ReadAsAsync<SyncNodeResponse>();
|
||||
Assert.Equal(1, sync!.InboundsSynced);
|
||||
|
||||
var inboundsResponse = await adminClient.GetAsync($"/api/admin/inbounds?nodeId={node.Id}");
|
||||
var inbound = (await inboundsResponse.ReadAsAsync<List<InboundResponse>>())!.Single();
|
||||
|
||||
var publishResponse = await adminClient.SendPutJsonAsync($"/api/admin/inbounds/{inbound.Id}/publish", new
|
||||
{
|
||||
isPublished = true,
|
||||
displayName = "Quota inbound",
|
||||
allowedRoleIds = new[] { userRole.Id },
|
||||
maxClients = (int?)null,
|
||||
});
|
||||
Assert.Equal(HttpStatusCode.OK, publishResponse.StatusCode);
|
||||
|
||||
using var userClient = factory.CreateClient();
|
||||
var userName = $"quota_{Guid.NewGuid():N}"[..20];
|
||||
var (_, userToken) = await RegisterAndLoginAsync(userClient, userName, "P@ssw0rd123");
|
||||
userClient.UseBearerToken(userToken);
|
||||
|
||||
var activationRequestResponse = await userClient.PostJsonAsync("/api/activation/request", new { comment = (string?)null });
|
||||
var activationRequest = await activationRequestResponse.ReadAsAsync<ActivationRequestResponse>();
|
||||
var approveResponse = await adminClient.PostAsync($"/api/admin/activation-requests/{activationRequest!.Id}/approve", content: null);
|
||||
Assert.Equal(HttpStatusCode.NoContent, approveResponse.StatusCode);
|
||||
|
||||
var tasks = Enumerable.Range(0, ConcurrentAttempts).Select(async i =>
|
||||
{
|
||||
using var attemptClient = factory.CreateClient();
|
||||
attemptClient.UseBearerToken(userToken);
|
||||
return await attemptClient.PostJsonAsync("/api/configs", new
|
||||
{
|
||||
inboundId = inbound.Id,
|
||||
label = $"device-{i}",
|
||||
deviceLimit = (int?)null,
|
||||
});
|
||||
});
|
||||
|
||||
var responses = await Task.WhenAll(tasks);
|
||||
|
||||
var succeeded = responses.Count(r => r.StatusCode == HttpStatusCode.OK);
|
||||
var quotaExceeded = responses.Count(r => r.StatusCode == HttpStatusCode.Conflict);
|
||||
|
||||
Assert.Equal(Quota, succeeded);
|
||||
Assert.Equal(ConcurrentAttempts - Quota, quotaExceeded);
|
||||
|
||||
var myConfigsResponse = await userClient.GetAsync("/api/configs");
|
||||
var myConfigs = await myConfigsResponse.ReadAsAsync<List<object>>();
|
||||
Assert.Equal(Quota, myConfigs!.Count);
|
||||
}
|
||||
}
|
||||
@@ -16,4 +16,7 @@ public static class HttpClientJsonExtensions
|
||||
|
||||
public static Task<HttpResponseMessage> PostJsonAsync(this HttpClient client, string url, object body)
|
||||
=> client.PostAsJsonAsync(url, body, JsonOptions);
|
||||
|
||||
public static Task<HttpResponseMessage> SendPutJsonAsync(this HttpClient client, string url, object body)
|
||||
=> client.PutAsJsonAsync(url, body, JsonOptions);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user