micialware/mROA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Untrusted channel works, but it breaks trusted channel

Browse Source
This commit is contained in:
micialware
2025-05-03 22:27:40 +03:00
parent 4f18f41389
commit 8010677a8b
8 changed files with 147 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Example.Backend/Program.cs
+6 -5
View File
@@ -19,9 +19,10 @@ class Program
builder.Modules.Add(new BackendIdentityGenerator());
// builder.UseNetworkGateway(new IPEndPoint(IPAddress.Loopback, 4567), typeof(NextGenerationInteractionModule),
// builder.GetModule<IIdentityGenerator>()!);
builder.UseNetworkGateway(new IPEndPoint(IPAddress.Loopback, 4567), typeof(ChannelInteractionModule),
var listening = new IPEndPoint(IPAddress.Loopback, 4567);
builder.UseNetworkGateway(listening, typeof(ChannelInteractionModule),
builder.GetModule<IIdentityGenerator>()!);
builder.Modules.Add(new UdpGateway(listening));
builder.Modules.Add(new ConnectionHub());
builder.Modules.Add(new HubRequestExtractor(typeof(RequestExtractor)));
@@ -45,12 +46,12 @@ class Program
builder.Build();
new RemoteTypeBinder();
TransmissionConfig.RealContextRepository = builder.GetModule<MultiClientContextRepository>();
TransmissionConfig.RemoteEndpointContextRepository = builder.GetModule<RemoteContextRepository>();
TransmissionConfig.RealContextRepository = builder.GetModule<MultiClientContextRepository>()!;
TransmissionConfig.RemoteEndpointContextRepository = builder.GetModule<RemoteContextRepository>()!;
TransmissionConfig.OwnershipRepository = new MultiClientOwnershipRepository();
_ = builder.GetModule<UdpGateway>()!.Start();
var gateway = builder.GetModule<IGatewayModule>();
gateway.Run();
}
}
Example.Frontend/Program.cs
+14 -5
View File
@@ -25,8 +25,10 @@ class Program
builder.Modules.Add(new RemoteContextRepository());
builder.Modules.Add(new ChannelInteractionModule());
builder.Modules.Add(new UdpUntrustedInteraction());
builder.Modules.Add(new RepresentationModule());
builder.Modules.Add(new NetworkFrontendBridge(new IPEndPoint(IPAddress.Loopback, 4567)));
var serverEndPoint = new IPEndPoint(IPAddress.Loopback, 4567);
builder.Modules.Add(new NetworkFrontendBridge(serverEndPoint));
builder.Modules.Add(new StaticRepresentationModuleProducer());
builder.Modules.Add(new RequestExtractor());
builder.Modules.Add(new BasicExecutionModule());
@@ -43,10 +45,13 @@ class Program
var frontendBridge = builder.GetModule<IFrontendBridge>()!;
frontendBridge.Connect();
_ = builder.GetModule<RequestExtractor>()!.StartExtraction();
_ = builder.GetModule<UdpUntrustedInteraction>().Start(serverEndPoint);
Console.WriteLine(TransmissionConfig.OwnershipRepository.GetOwnershipId());
var context = builder.GetModule<RemoteContextRepository>();
var factory = context.GetSingleObject(typeof(IPrinterFactory), -TransmissionConfig.OwnershipRepository.GetHostOwnershipId()) as IPrinterFactory;
var factory =
context.GetSingleObject(typeof(IPrinterFactory),
-TransmissionConfig.OwnershipRepository.GetHostOwnershipId()) as IPrinterFactory;
using (var disposingPrinter = factory.Create("Test"))
{
@@ -66,6 +71,9 @@ class Program
Thread.Sleep(100);
disposingPrinter.SomeoneIsApproaching("Mikhail");
Console.WriteLine("Approaching detected");
factory.Register(new ClientBasedPrinter());
DemoCheck.ClientBasedImplementation = true;
Console.WriteLine("Registered printer");
@@ -102,6 +110,7 @@ class Program
Console.WriteLine("Dispose printer");
}
DemoCheck.Dispose = true;
@@ -116,12 +125,12 @@ class Program
cts.Cancel();
Console.WriteLine($"Token state {cts.Token.IsCancellationRequested}");
DemoCheck.TaskCancelation = true;
frontendBridge.Disconnect();
DemoCheck.Show();
Console.ReadKey();
//
// const int iterations = 10000;
// var timer = Stopwatch.StartNew();
mROA/Abstract/IUntrustedGateway.cs
+11
View File
@@ -0,0 +1,11 @@
using System;
using System.Net;
using System.Threading.Tasks;
namespace mROA.Abstract
{
public interface IUntrustedGateway : IInjectableModule, IDisposable
{
Task Start();
}
}
mROA/Implementation/Backend/NetworkGatewayModule.cs
+3 -1
View File
@@ -18,6 +18,8 @@ namespace mROA.Implementation.Backend
private ISerializationToolkit? _serialization;
private Dictionary<int, CancellationTokenSource> _extractorsCTS = new();
public NetworkGatewayModule(IPEndPoint endpoint, Type interactionModuleType,
IInjectableModule[] injectableModules)
{
@@ -124,7 +126,7 @@ namespace mROA.Implementation.Backend
}
}
}
private void ThrowIfNotInjected()
{
if (_hub is null)
mROA/Implementation/Backend/UdpGateway.cs
+92
View File
@@ -0,0 +1,92 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Channels;
using System.Threading.Tasks;
using mROA.Abstract;
namespace mROA.Implementation.Backend
{
public class UdpGateway : IUntrustedGateway
{
private IConnectionHub _hub;
private UdpClient _client;
private Dictionary<IPEndPoint, int> _reservedPorts = new();
private CancellationTokenSource _tokenSource = new();
private ISerializationToolkit _serializationToolkit;
public UdpGateway(IPEndPoint listeningEndpoint)
{
_client = new UdpClient(listeningEndpoint);
}
public void Inject<T>(T dependency)
{
switch (dependency)
{
case IConnectionHub hub:
_hub = hub;
break;
case ISerializationToolkit serializationToolkit:
_serializationToolkit = serializationToolkit;
break;
}
}
public void Dispose()
{
_tokenSource.Cancel();
_client.Close();
}
public Task Start()
{
var token = _tokenSource.Token;
return Task.Run(async () =>
{
while (token.IsCancellationRequested == false)
{
var incoming = await _client.ReceiveAsync();
var parsed = _serializationToolkit.Deserialize<NetworkMessageHeader>(incoming.Buffer);
try
{
int channelId;
switch (parsed.MessageType)
{
case EMessageType.UntrustedConnect:
channelId = BitConverter.ToInt32(parsed.Data);
_reservedPorts[incoming.RemoteEndPoint] = channelId;
_ = UntrustedSend(_hub.GetInteraction(channelId), incoming.RemoteEndPoint);
break;
default:
channelId = _reservedPorts[incoming.RemoteEndPoint];
var interaction = _hub.GetInteraction(channelId);
await interaction.ReceiveChanel.Writer.WriteAsync(parsed, token);
break;
}
}
catch (Exception e)
{
Console.WriteLine(e);
}
}
}, token);
}
private Task UntrustedSend(IChannelInteractionModule interaction, IPEndPoint endpoint)
{
return Task.Run(async () =>
{
await foreach (var post in interaction.UntrustedPostChanel.ReadAllAsync())
{
var parsed = _serializationToolkit.Serialize(post);
await _client.SendAsync(parsed, parsed.Length, endpoint);
}
}
);
}
}
}
mROA/Implementation/EMessageType.cs
+1
View File
@@ -12,5 +12,6 @@ namespace mROA.Implementation
ClientRecovery,
ClientConnect,
ClientDisconnect,
UntrustedConnect,
}
}
mROA/Implementation/UdpUntrustedInteraction.cs
+19 -1
View File
@@ -12,6 +12,7 @@ namespace mROA.Implementation
private ISerializationToolkit _serializationToolkit;
private IChannelInteractionModule _channelInteractionModule;
private CancellationTokenSource _tokenSource = new CancellationTokenSource();
public void Dispose()
{
_tokenSource.Cancel();
@@ -35,19 +36,36 @@ namespace mROA.Implementation
{
var message = new Memory<byte>((await udpClient.ReceiveAsync()).Buffer);
var parsed = _serializationToolkit.Deserialize<NetworkMessageHeader>(message.Span)!;
await writer.WriteAsync(parsed, token);
}
}
private async Task Posting(UdpClient udpClient, CancellationToken token)
{
var initMessage = new NetworkMessageHeader
{
MessageType = EMessageType.UntrustedConnect, Id = Guid.NewGuid(),
Data = BitConverter.GetBytes(Math.Abs(_channelInteractionModule.ConnectionId))
};
var initParsed = _serializationToolkit.Serialize(initMessage);
await udpClient.SendAsync(initParsed, initParsed.Length);
await foreach (var post in _channelInteractionModule.UntrustedPostChanel.ReadAllAsync(token))
{
var serialized = _serializationToolkit.Serialize(post);
#if TRACE
Console.WriteLine("Untrusted write start");
#endif
await udpClient.SendAsync(serialized, serialized.Length);
#if TRACE
Console.WriteLine("Untrusted write finished");
#endif
}
}
public void Inject<T>(T dependency)
{
switch (dependency)
mROA/mROA.csproj
+1 -1
View File
@@ -21,7 +21,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>;</DefineConstants>
<DefineConstants></DefineConstants>
</PropertyGroup>
<ItemGroup>