Merge pull request #58 from NerosoftDev/develop

Develop
NerosoftDev · Dec 12, 2023 · 8530e94 · 8530e94
2 parents 56c80a0 + ead9d75
commit 8530e94
Show file tree

Hide file tree

Showing 13 changed files with 138 additions and 13 deletions.
diff --git a/Source/Euonia.Bus.Abstract/DefaultIdentityProvider.cs b/Source/Euonia.Bus.Abstract/DefaultIdentityProvider.cs
@@ -0,0 +1,18 @@
+using System.Security.Principal;
+
+namespace Nerosoft.Euonia.Bus;
+
+internal class DefaultIdentityProvider : IIdentityProvider
+{
+	private readonly IdentityAccessor _accessor;
+
+	public DefaultIdentityProvider(IdentityAccessor accessor)
+	{
+		_accessor = accessor;
+	}
+
+	public IPrincipal GetIdentity(string authorization)
+	{
+		return _accessor(authorization);
+	}
+}
diff --git a/Source/Euonia.Bus.Abstract/IIdentityProvider.cs b/Source/Euonia.Bus.Abstract/IIdentityProvider.cs
@@ -0,0 +1,16 @@
+using System.Security.Principal;
+
+namespace Nerosoft.Euonia.Bus;
+
+/// <summary>
+/// Defines the identity provider.
+/// </summary>
+public interface IIdentityProvider
+{
+	/// <summary>
+	/// Get the identity from authorization header.
+	/// </summary>
+	/// <param name="authorization"></param>
+	/// <returns></returns>
+	IPrincipal GetIdentity(string authorization);
+}
diff --git a/Source/Euonia.Bus.Abstract/IMessageContext.cs b/Source/Euonia.Bus.Abstract/IMessageContext.cs
@@ -1,4 +1,6 @@
-namespace Nerosoft.Euonia.Bus;
+using System.Security.Principal;
+
+namespace Nerosoft.Euonia.Bus;
 
 /// <summary>
 /// Interface IMessageContext
@@ -35,6 +37,11 @@ public interface IMessageContext : IDisposable
 	/// </summary>
 	string Authorization { get; set; }
 
+	/// <summary>
+	/// Gets the current user.
+	/// </summary>
+	IPrincipal User { get; }
+
 	/// <summary>
 	/// Gets the message request headers.
 	/// </summary>

diff --git a/Source/Euonia.Bus.Abstract/IdentityAccessor.cs b/Source/Euonia.Bus.Abstract/IdentityAccessor.cs
@@ -0,0 +1,10 @@
+using System.Security.Principal;
+
+namespace Nerosoft.Euonia.Bus;
+
+/// <summary>
+/// The request context accessor.
+/// </summary>
+/// <param name="authorization"></param>
+/// <returns></returns>
+public delegate IPrincipal IdentityAccessor(string authorization);
diff --git a/Source/Euonia.Bus.Abstract/MessageContext.cs b/Source/Euonia.Bus.Abstract/MessageContext.cs
@@ -1,4 +1,6 @@
-namespace Nerosoft.Euonia.Bus;
+using System.Security.Principal;
+
+namespace Nerosoft.Euonia.Bus;
 
 /// <summary>
 /// The message context.
@@ -31,14 +33,16 @@ public MessageContext(object message)
 	/// Initializes a new instance of the <see cref="MessageContext"/> class.
 	/// </summary>
 	/// <param name="pack"></param>
-	public MessageContext(IRoutedMessage pack)
+	/// <param name="identity"></param>
+	public MessageContext(IRoutedMessage pack, IdentityAccessor identity = null)
 		: this(pack.Data)
 	{
 		MessageId = pack.MessageId;
 		CorrelationId = pack.CorrelationId;
 		ConversationId = pack.ConversationId;
 		RequestTraceId = pack.RequestTraceId;
 		Authorization = pack.Authorization;
+		User = identity?.Invoke(pack.Authorization);
 	}
 
 	/// <summary>
@@ -106,6 +110,9 @@ public string Authorization
 		set => _headers[nameof(Authorization)] = value;
 	}
 
+	/// <inheritdoc/>
+	public IPrincipal User { get; }
+
 	/// <inheritdoc />
 	public IReadOnlyDictionary<string, string> Headers => _headers;
 
@@ -136,7 +143,7 @@ public void Failure(Exception exception)
 	{
 		_events.HandleEvent(this, exception, nameof(Failed));
 	}
-	
+
 	/// <summary>
 	/// Called after the message has been handled.
 	/// This operate will raised up the <see cref="Completed"/> event.

diff --git a/Source/Euonia.Bus.InMemory/InMemoryDispatcher.cs b/Source/Euonia.Bus.InMemory/InMemoryDispatcher.cs
@@ -1,4 +1,6 @@
-namespace Nerosoft.Euonia.Bus.InMemory;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Nerosoft.Euonia.Bus.InMemory;
 
 /// <summary>
 /// 
@@ -8,11 +10,22 @@ public class InMemoryDispatcher : DisposableObject, IDispatcher
 	/// <inheritdoc />
 	public event EventHandler<MessageDispatchedEventArgs> Delivered;
 
+	private readonly IIdentityProvider _identity;
+
+	/// <summary>
+	/// Initialize a new instance of <see cref="InMemoryDispatcher"/>
+	/// </summary>
+	/// <param name="provider"></param>
+	public InMemoryDispatcher(IServiceProvider provider)
+	{
+		_identity = provider.GetService<IIdentityProvider>();
+	}
+
 	/// <inheritdoc />
 	public async Task PublishAsync<TMessage>(RoutedMessage<TMessage> message, CancellationToken cancellationToken = default)
 		where TMessage : class
 	{
-		var context = new MessageContext(message);
+		var context = new MessageContext(message, authorization => _identity?.GetIdentity(authorization));
 		var pack = new MessagePack(message, context)
 		{
 			Aborted = cancellationToken
@@ -26,7 +39,7 @@ public async Task PublishAsync<TMessage>(RoutedMessage<TMessage> message, Cancel
 	public async Task SendAsync<TMessage>(RoutedMessage<TMessage> message, CancellationToken cancellationToken = default)
 		where TMessage : class
 	{
-		var context = new MessageContext(message);
+		var context = new MessageContext(message, authorization => _identity?.GetIdentity(authorization));
 		var pack = new MessagePack(message, context)
 		{
 			Aborted = cancellationToken
@@ -60,7 +73,7 @@ public async Task SendAsync<TMessage>(RoutedMessage<TMessage> message, Cancellat
 	public async Task<TResponse> SendAsync<TMessage, TResponse>(RoutedMessage<TMessage, TResponse> message, CancellationToken cancellationToken = default)
 		where TMessage : class
 	{
-		var context = new MessageContext(message);
+		var context = new MessageContext(message, authorization => _identity?.GetIdentity(authorization));
 		var pack = new MessagePack(message, context)
 		{
 			Aborted = cancellationToken

diff --git a/Source/Euonia.Bus.RabbitMq/RabbitMqQueueConsumer.cs b/Source/Euonia.Bus.RabbitMq/RabbitMqQueueConsumer.cs
@@ -9,6 +9,8 @@ namespace Nerosoft.Euonia.Bus.RabbitMq;
 /// </summary>
 public class RabbitMqQueueConsumer : RabbitMqQueueRecipient, IQueueConsumer
 {
+	private readonly IIdentityProvider _identity;
+
 	/// <summary>
 	/// Initializes a new instance of the <see cref="RabbitMqQueueConsumer"/> class.
 	/// </summary>
@@ -20,6 +22,19 @@ public RabbitMqQueueConsumer(IPersistentConnection connection, IHandlerContext h
 	{
 	}
 
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RabbitMqQueueConsumer"/> class.
+	/// </summary>
+	/// <param name="connection"></param>
+	/// <param name="handler"></param>
+	/// <param name="options"></param>
+	/// <param name="identity"></param>
+	public RabbitMqQueueConsumer(IPersistentConnection connection, IHandlerContext handler, IOptions<RabbitMqMessageBusOptions> options, IIdentityProvider identity)
+		: this(connection, handler, options)
+	{
+		_identity = identity;
+	}
+
 	/// <inheritdoc />
 	public string Name => nameof(RabbitMqQueueConsumer);
 
@@ -61,7 +76,7 @@ protected override async void HandleMessageReceived(object sender, BasicDeliverE
 
 		var props = args.BasicProperties;
 
-		var context = new MessageContext();
+		var context = new MessageContext(message, authorization => _identity?.GetIdentity(authorization));
 
 		OnMessageReceived(new MessageReceivedEventArgs(message.Data, context));
 

diff --git a/Source/Euonia.Bus.RabbitMq/RabbitMqTopicSubscriber.cs b/Source/Euonia.Bus.RabbitMq/RabbitMqTopicSubscriber.cs
@@ -9,6 +9,8 @@ namespace Nerosoft.Euonia.Bus.RabbitMq;
 /// </summary>
 public class RabbitMqTopicSubscriber : RabbitMqQueueRecipient, ITopicSubscriber
 {
+	private readonly IIdentityProvider _identity;
+
 	/// <summary>
 	/// Initializes a new instance of the <see cref="RabbitMqTopicSubscriber"/> class.
 	/// </summary>
@@ -20,6 +22,19 @@ public RabbitMqTopicSubscriber(IPersistentConnection connection, IHandlerContext
 	{
 	}
 
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RabbitMqTopicSubscriber"/> class.
+	/// </summary>
+	/// <param name="connection"></param>
+	/// <param name="handler"></param>
+	/// <param name="options"></param>
+	/// <param name="identity"></param>
+	public RabbitMqTopicSubscriber(IPersistentConnection connection, IHandlerContext handler, IOptions<RabbitMqMessageBusOptions> options, IIdentityProvider identity)
+		: this(connection, handler, options)
+	{
+		_identity = identity;
+	}
+
 	/// <inheritdoc />
 	public string Name => nameof(RabbitMqTopicSubscriber);
 
@@ -68,7 +83,7 @@ protected override async void HandleMessageReceived(object sender, BasicDeliverE
 
 		var message = DeserializeMessage(args.Body.ToArray(), type);
 
-		var context = new MessageContext();
+		var context = new MessageContext(message, authorization => _identity?.GetIdentity(authorization));
 
 		OnMessageReceived(new MessageReceivedEventArgs(message.Data, context));
 

diff --git a/Source/Euonia.Bus/BusConfigurator.cs b/Source/Euonia.Bus/BusConfigurator.cs
@@ -168,4 +168,27 @@ public BusConfigurator SetConventions(Action<MessageConventionBuilder> configure
 		configure?.Invoke(ConventionBuilder);
 		return this;
 	}
+
+	/// <summary>
+	/// Register the message identity provider.
+	/// </summary>
+	/// <param name="accessor"></param>
+	/// <returns></returns>
+	public BusConfigurator SetIdentityProvider(IdentityAccessor accessor)
+	{
+		Service.TryAddSingleton<IIdentityProvider>(_ => new DefaultIdentityProvider(accessor));
+		return this;
+	}
+
+	/// <summary>
+	/// Register the message identity provider.
+	/// </summary>
+	/// <typeparam name="T"></typeparam>
+	/// <returns></returns>
+	public BusConfigurator SetIdentityProvider<T>()
+		where T : class, IIdentityProvider
+	{
+		Service.TryAddSingleton<IIdentityProvider, T>();
+		return this;
+	}
 }
diff --git a/Source/Euonia.Bus/Core/HandlerContext.cs b/Source/Euonia.Bus/Core/HandlerContext.cs
@@ -159,7 +159,7 @@ private void ConcurrentDictionarySafeRegister<TKey, TValue>(TKey key, TValue val
 		}
 	}
 
-	private static Expression[] GetArguments(MethodBase method, object message, MessageContext context, CancellationToken cancellationToken)
+	private static Expression[] GetArguments(MethodInfo method, object message, MessageContext context, CancellationToken cancellationToken)
 	{
 		var parameterInfos = method.GetParameters();
 		var arguments = new Expression[parameterInfos.Length];

diff --git a/Source/Euonia.Bus/Core/ServiceBus.cs b/Source/Euonia.Bus/Core/ServiceBus.cs
@@ -54,6 +54,7 @@ public Task PublishAsync<TMessage>(TMessage message, PublishOptions options, Act
 		{
 			MessageId = options.MessageId ?? Guid.NewGuid().ToString(),
 			RequestTraceId = context?.TraceIdentifier ?? options.RequestTraceId ?? Guid.NewGuid().ToString("N"),
+			Authorization = context?.Authorization,
 		};
 		metadataSetter?.Invoke(pack.Metadata);
 		return _dispatcher.PublishAsync(pack, cancellationToken);

diff --git a/Source/Euonia.Hosting/Middlewares/ExceptionHandlingMiddleware.cs b/Source/Euonia.Hosting/Middlewares/ExceptionHandlingMiddleware.cs
@@ -45,7 +45,7 @@ private static Task HandleExceptionAsync(HttpContext httpContext, Exception exce
 		var response = new
 		{
 			status = statusCode,
-			message = exception.Message,
+			message = exception is AggregateException ex ? ex.InnerException.Message : exception.Message,
 			details = GetErrors(exception)
 		};
 

diff --git a/project.props b/project.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>8.1.5</Version>
+        <Version>8.1.8</Version>
         <Authors>damon</Authors>
         <Company>Nerosoft Ltd.</Company>
         <Product>Euonia</Product>