Improve authentication

EventStore · Jul 25, 2023 · fdf60c2 · fdf60c2
1 parent 69e4b0e
commit fdf60c2
Show file tree

Hide file tree

Showing 46 changed files with 256 additions and 47 deletions.
diff --git a/src/EventStore.Client.Common/EventStoreCallOptions.cs b/src/EventStore.Client.Common/EventStoreCallOptions.cs
@@ -12,6 +12,10 @@ public static CallOptions CreateStreaming(EventStoreClientSettings settings,
 			Create(settings, deadline, userCredentials, cancellationToken);
 
 		// deadline falls back to connection DefaultDeadline
+		public static CallOptions CreateNonStreaming(EventStoreClientSettings settings,
+			CancellationToken cancellationToken) => Create(settings, settings.DefaultDeadline,
+			settings.DefaultCredentials, cancellationToken);
+
 		public static CallOptions CreateNonStreaming(EventStoreClientSettings settings, TimeSpan? deadline,
 			UserCredentials? userCredentials, CancellationToken cancellationToken) => Create(settings,
 			deadline ?? settings.DefaultDeadline, userCredentials, cancellationToken);
@@ -28,10 +32,10 @@ private static CallOptions Create(EventStoreClientSettings settings, TimeSpan? d
 						: bool.FalseString
 				}
 			},
-			credentials: (settings.DefaultCredentials ?? userCredentials) == null
+			credentials: (userCredentials ?? settings.DefaultCredentials) == null
 				? null
 				: CallCredentials.FromInterceptor(async (_, metadata) => {
-					var credentials = settings.DefaultCredentials ?? userCredentials;
+					var credentials = userCredentials ?? settings.DefaultCredentials;
 
 					var authorizationHeader = await settings.OperationOptions
 						.GetAuthenticationHeaderValue(credentials!, CancellationToken.None)

diff --git a/src/EventStore.Client/ChannelSelector.cs b/src/EventStore.Client/ChannelSelector.cs
@@ -12,7 +12,7 @@ public ChannelSelector(
 			ChannelCache channelCache) {
 			_inner = settings.ConnectivitySettings.IsSingleNode
 				? new SingleNodeChannelSelector(settings, channelCache)
-				: new GossipChannelSelector(settings, channelCache, new GrpcGossipClient());
+				: new GossipChannelSelector(settings, channelCache, new GrpcGossipClient(settings));
 		}
 
 		public Task<ChannelBase> SelectChannelAsync(CancellationToken cancellationToken) =>

diff --git a/src/EventStore.Client/GrpcGossipClient.cs b/src/EventStore.Client/GrpcGossipClient.cs
@@ -6,11 +6,17 @@
 
 namespace EventStore.Client {
 	internal class GrpcGossipClient : IGossipClient {
-		public async ValueTask<ClusterMessages.ClusterInfo> GetAsync(ChannelBase channel,
-			CancellationToken cancellationToken) {
-			var client = new Gossip.Gossip.GossipClient(channel);
+		private readonly EventStoreClientSettings _settings;
+
+		public GrpcGossipClient(EventStoreClientSettings settings) {
+			_settings = settings;
+		}
 
-			using var call = client.ReadAsync(new Empty(), cancellationToken: cancellationToken);
+		public async ValueTask<ClusterMessages.ClusterInfo> GetAsync(ChannelBase channel, CancellationToken ct) {
+			var client = new Gossip.Gossip.GossipClient(channel);
+			using var call = client.ReadAsync(
+				new Empty(),
+				EventStoreCallOptions.CreateNonStreaming(_settings, ct));
 			var result = await call.ResponseAsync.ConfigureAwait(false);
 
 			return new(result.Members.Select(x =>

diff --git a/test/EventStore.Client.Operations.Tests/AuthenticationTests.cs b/test/EventStore.Client.Operations.Tests/AuthenticationTests.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace EventStore.Client {
+	public class AuthenticationTests : IClassFixture<AuthenticationTests.Fixture> {
+		private readonly Fixture _fixture;
+
+		public AuthenticationTests(Fixture fixture) {
+			_fixture = fixture;
+		}
+
+		public static IEnumerable<object?[]> AuthenticationCases() {
+			var fails = false;
+			var succeeds = true;
+
+			// no user credentials
+			yield return new object?[] {1, TestCredentials.Root,      null, succeeds};
+			yield return new object?[] {2, TestCredentials.TestUser1, null, fails};
+			yield return new object?[] {3, null,                      null, fails};
+
+			// unprivileged user credentials
+			yield return new object?[] {4, TestCredentials.Root,      TestCredentials.TestUser1, fails};
+			yield return new object?[] {5, TestCredentials.TestUser1, TestCredentials.TestUser1, fails};
+			yield return new object?[] {6, null,                      TestCredentials.TestUser1, fails};
+
+			// root user credentials
+			yield return new object?[] {7, TestCredentials.Root,      TestCredentials.Root, succeeds};
+			yield return new object?[] {8, TestCredentials.TestUser1, TestCredentials.Root, succeeds};
+			yield return new object?[] {9, null,                      TestCredentials.Root, succeeds};
+		}
+
+		[Theory, MemberData(nameof(AuthenticationCases))]
+		public async Task system_call(int caseNr, UserCredentials? defaultCreds, UserCredentials? user, bool succeeds) {
+
+			_fixture.Settings.DefaultCredentials = defaultCreds;
+			_fixture.Settings.ConnectionName = $"Authentication case #{caseNr}";
+
+			await using var client = new EventStoreOperationsClient(_fixture.Settings);
+
+			var result = await Record.ExceptionAsync(() =>
+				client.SetNodePriorityAsync(1, userCredentials: user));
+
+			if (succeeds) {
+				Assert.Null(result);
+				return;
+			}
+
+			Assert.NotNull(result);
+		}
+
+		public class Fixture : EventStoreClientFixture {
+			protected override Task Given() => Task.CompletedTask;
+			protected override Task When() => Task.CompletedTask;
+		}
+	}
+}
diff --git a/test/EventStore.Client.Operations.Tests/EventStoreClientFixture.cs b/test/EventStore.Client.Operations.Tests/EventStoreClientFixture.cs
@@ -4,8 +4,11 @@ namespace EventStore.Client {
 	public abstract class EventStoreClientFixture : EventStoreClientFixtureBase {
 		public EventStoreOperationsClient Client { get; }
 		public EventStoreClient StreamsClient { get; }
+		public new EventStoreClientSettings Settings => base.Settings;
 
-		protected EventStoreClientFixture(EventStoreClientSettings? settings = null) : base(settings) {
+		protected EventStoreClientFixture(EventStoreClientSettings? settings = null)
+			: base(settings, noDefaultCredentials: true) {
+
 			Client = new EventStoreOperationsClient(Settings);
 			StreamsClient = new EventStoreClient(Settings);
 		}

diff --git a/test/EventStore.Client.PersistentSubscriptions.Tests/EventStoreClientFixture.cs b/test/EventStore.Client.PersistentSubscriptions.Tests/EventStoreClientFixture.cs
@@ -8,7 +8,9 @@ public abstract class EventStoreClientFixture : EventStoreClientFixtureBase {
 		public EventStoreClient StreamsClient { get; }
 		public EventStoreUserManagementClient UserManagementClient { get; }
 
-		protected EventStoreClientFixture(EventStoreClientSettings? settings = null, bool skipPSWarmUp=false) : base(settings) {
+		protected EventStoreClientFixture(EventStoreClientSettings? settings = null, bool skipPSWarmUp=false, bool noDefaultCredentials=false)
+			: base(settings, noDefaultCredentials: noDefaultCredentials){
+
 			_skipPsWarmUp = skipPSWarmUp;
 
 			Client = new EventStorePersistentSubscriptionsClient(Settings);

diff --git a/...ersistentSubscriptions.Tests/SubscriptionToAll/connect_to_existing_without_permissions.cs b/...ersistentSubscriptions.Tests/SubscriptionToAll/connect_to_existing_without_permissions.cs
@@ -16,6 +16,9 @@ public Task throws_access_denied() =>
 			}).WithTimeout();
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override Task Given() =>
 				Client.CreateToAllAsync(
 					"agroupname55",

diff --git a/...Subscriptions.Tests/SubscriptionToAll/connect_to_existing_without_read_all_permissions.cs b/...Subscriptions.Tests/SubscriptionToAll/connect_to_existing_without_read_all_permissions.cs
@@ -16,6 +16,9 @@ public Task throws_access_denied() =>
 			}).WithTimeout();
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override Task Given() =>
 				Client.CreateToAllAsync(
 					"agroupname55",

diff --git a/...tore.Client.PersistentSubscriptions.Tests/SubscriptionToAll/create_without_permissions.cs b/...tore.Client.PersistentSubscriptions.Tests/SubscriptionToAll/create_without_permissions.cs
@@ -12,6 +12,9 @@ public create_without_permissions(Fixture fixture) {
 		private readonly Fixture _fixture;
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override Task Given() => Task.CompletedTask;
 			protected override Task When() => Task.CompletedTask;
 		}

diff --git a/...re.Client.PersistentSubscriptions.Tests/SubscriptionToAll/deleting_without_permissions.cs b/...re.Client.PersistentSubscriptions.Tests/SubscriptionToAll/deleting_without_permissions.cs
@@ -20,6 +20,9 @@ await Assert.ThrowsAsync<AccessDeniedException>(
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override Task Given() => Task.CompletedTask;
 			protected override Task When() => Task.CompletedTask;
 		}

diff --git a/test/EventStore.Client.PersistentSubscriptions.Tests/SubscriptionToAll/get_info.cs b/test/EventStore.Client.PersistentSubscriptions.Tests/SubscriptionToAll/get_info.cs
@@ -139,6 +139,9 @@ public async Task returns_result_with_normal_user_credentials() {
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override async Task Given() {
 				if (SupportsPSToAll.No) {
 					return;

diff --git a/...ent.PersistentSubscriptions.Tests/SubscriptionToAll/list_with_persistent_subscriptions.cs b/...ent.PersistentSubscriptions.Tests/SubscriptionToAll/list_with_persistent_subscriptions.cs
@@ -61,7 +61,7 @@ public async Task returns_result_with_normal_user_credentials() {
         }
 
 		public class Fixture : EventStoreClientFixture {
-			public Fixture () : base(skipPSWarmUp: true) {
+			public Fixture () : base(skipPSWarmUp: true, noDefaultCredentials: true) {
 			}
 
 			protected override async Task Given() {

diff --git a/test/EventStore.Client.PersistentSubscriptions.Tests/SubscriptionToAll/replay_parked.cs b/test/EventStore.Client.PersistentSubscriptions.Tests/SubscriptionToAll/replay_parked.cs
@@ -66,6 +66,9 @@ await Assert.ThrowsAsync<AccessDeniedException>(() =>
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true) {
+			}
+
 			protected override async Task Given() {
 				if (SupportsPSToAll.No) {
 					return;

diff --git a/...nt.PersistentSubscriptions.Tests/SubscriptionToAll/update_existing_without_permissions.cs b/...nt.PersistentSubscriptions.Tests/SubscriptionToAll/update_existing_without_permissions.cs
@@ -20,6 +20,9 @@ await Assert.ThrowsAsync<AccessDeniedException>(
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override async Task Given() {
 				await Client.CreateToAllAsync(Group, new PersistentSubscriptionSettings(),
 					userCredentials: TestCredentials.Root);

diff --git a/...istentSubscriptions.Tests/SubscriptionToStream/connect_to_existing_without_permissions.cs b/...istentSubscriptions.Tests/SubscriptionToStream/connect_to_existing_without_permissions.cs
@@ -16,6 +16,9 @@ public Task throws_access_denied() =>
 			}).WithTimeout();
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override Task Given() =>
 				Client.CreateToStreamAsync(
 					Stream,

diff --git a/...e.Client.PersistentSubscriptions.Tests/SubscriptionToStream/create_without_permissions.cs b/...e.Client.PersistentSubscriptions.Tests/SubscriptionToStream/create_without_permissions.cs
@@ -12,6 +12,9 @@ public create_without_permissions(Fixture fixture) {
 		private readonly Fixture _fixture;
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override Task Given() => Task.CompletedTask;
 			protected override Task When() => Task.CompletedTask;
 		}

diff --git a/...Client.PersistentSubscriptions.Tests/SubscriptionToStream/deleting_without_permissions.cs b/...Client.PersistentSubscriptions.Tests/SubscriptionToStream/deleting_without_permissions.cs
@@ -20,6 +20,9 @@ await Assert.ThrowsAsync<AccessDeniedException>(
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override Task Given() => Task.CompletedTask;
 			protected override Task When() => Task.CompletedTask;
 		}

diff --git a/test/EventStore.Client.PersistentSubscriptions.Tests/SubscriptionToStream/get_info.cs b/test/EventStore.Client.PersistentSubscriptions.Tests/SubscriptionToStream/get_info.cs
@@ -142,6 +142,9 @@ public async Task returns_result_for_normal_user() {
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true) {
+			}
+
 			protected override Task Given() =>
 				Client.CreateToStreamAsync(
 					groupName: GroupName,
@@ -174,7 +177,7 @@ await Client.SubscribeToStreamAsync(
 				for (int i = 0; i < 15; i++) {
 					await StreamsClient.AppendToStreamAsync(StreamName, StreamState.Any, new [] {
 						new EventData(Uuid.NewUuid(), "test-event", ReadOnlyMemory<byte>.Empty)
-					});
+					}, userCredentials: TestCredentials.Root);
 				}
 
 				await tcs.Task;

diff --git a/....PersistentSubscriptions.Tests/SubscriptionToStream/list_with_persistent_subscriptions.cs b/....PersistentSubscriptions.Tests/SubscriptionToStream/list_with_persistent_subscriptions.cs
@@ -56,7 +56,7 @@ public async Task returns_result_with_normal_user_credentials() {
 		}
 
 		public class Fixture : EventStoreClientFixture {
-			public Fixture () : base(skipPSWarmUp: true) {
+			public Fixture () : base(skipPSWarmUp: true, noDefaultCredentials: true) {
 			}
 
 			protected override async Task Given() {

diff --git a/test/EventStore.Client.PersistentSubscriptions.Tests/SubscriptionToStream/replay_parked.cs b/test/EventStore.Client.PersistentSubscriptions.Tests/SubscriptionToStream/replay_parked.cs
@@ -59,6 +59,9 @@ await Assert.ThrowsAsync<AccessDeniedException>(() =>
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true) {
+			}
+
 			protected override Task Given() =>
 				Client.CreateToStreamAsync(
 					StreamName,

diff --git a/...PersistentSubscriptions.Tests/SubscriptionToStream/update_existing_without_permissions.cs b/...PersistentSubscriptions.Tests/SubscriptionToStream/update_existing_without_permissions.cs
@@ -20,8 +20,12 @@ await Assert.ThrowsAsync<AccessDeniedException>(
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true){
+			}
+
 			protected override async Task Given() {
-				await StreamsClient.AppendToStreamAsync(Stream, StreamState.NoStream, CreateTestEvents());
+				await StreamsClient.AppendToStreamAsync(Stream, StreamState.NoStream, CreateTestEvents(),
+					userCredentials: TestCredentials.Root);
 				await Client.CreateToStreamAsync(Stream, Group, new PersistentSubscriptionSettings(),
 					userCredentials: TestCredentials.Root);
 			}

diff --git a/test/EventStore.Client.PersistentSubscriptions.Tests/restart_subsystem.cs b/test/EventStore.Client.PersistentSubscriptions.Tests/restart_subsystem.cs
@@ -33,6 +33,9 @@ await Assert.ThrowsAsync<AccessDeniedException>(async () =>
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true) {
+			}
+
 			protected override Task Given() => Task.CompletedTask;
 			protected override Task When() => Task.CompletedTask;
 		}

diff --git a/test/EventStore.Client.ProjectionManagement.Tests/EventStoreClientFixture.cs b/test/EventStore.Client.ProjectionManagement.Tests/EventStoreClientFixture.cs
@@ -9,11 +9,11 @@ public abstract class EventStoreClientFixture : EventStoreClientFixtureBase {
 		public EventStoreClient StreamsClient { get; }
 		public EventStoreProjectionManagementClient Client { get; }
 
-		protected EventStoreClientFixture(EventStoreClientSettings? settings = null) : base(settings,
-			new Dictionary<string, string> {
+		protected EventStoreClientFixture(EventStoreClientSettings? settings = null, bool noDefaultCredentials = false) :
+			base(settings, new Dictionary<string, string> {
 				["EVENTSTORE_RUN_PROJECTIONS"] = "ALL",
 				["EVENTSTORE_START_STANDARD_PROJECTIONS"] = "True"
-			}) {
+			}, noDefaultCredentials) {
 			Client = new EventStoreProjectionManagementClient(Settings);
 			UserManagementClient = new EventStoreUserManagementClient(Settings);
 			StreamsClient = new EventStoreClient(Settings);

diff --git a/test/EventStore.Client.ProjectionManagement.Tests/restart_subsystem.cs b/test/EventStore.Client.ProjectionManagement.Tests/restart_subsystem.cs
@@ -20,6 +20,9 @@ public async Task throws_when_given_no_credentials() {
 		}
 
 		public class Fixture : EventStoreClientFixture {
+			public Fixture () : base(noDefaultCredentials: true) {
+			}
+
 			protected override Task Given() => Task.CompletedTask;
 			protected override Task When() => Task.CompletedTask;
 		}

diff --git a/test/EventStore.Client.Streams.Tests/AnonymousAccess.cs b/test/EventStore.Client.Streams.Tests/AnonymousAccess.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace EventStore.Client;
+
+public class AnonymousAccess {
+	private static readonly Version LegacySince = new Version(23, 6);
+	private static readonly string SkipMessage = 
+		"Anonymous access is turned off since v23.6.0!";
+
+	internal class FactAttribute : Deprecation.FactAttribute {
+		public FactAttribute() : base(LegacySince, SkipMessage) { }
+	}
+
+	internal class TheoryAttribute : Deprecation.TheoryAttribute {
+		public TheoryAttribute() : base(LegacySince, SkipMessage) { }
+	}
+}
diff --git a/test/EventStore.Client.Streams.Tests/EventStoreClientFixture.cs b/test/EventStore.Client.Streams.Tests/EventStoreClientFixture.cs
@@ -5,7 +5,9 @@ namespace EventStore.Client {
 	public abstract class EventStoreClientFixture : EventStoreClientFixtureBase {
 		public EventStoreClient Client { get; }
 		protected EventStoreClientFixture(EventStoreClientSettings? settings = null,
-			Dictionary<string, string>? env = null) : base(settings, env) {
+			Dictionary<string, string>? env = null, bool noDefaultCredentials = false)
+			: base(settings, env, noDefaultCredentials) {
+
 			Client = new EventStoreClient(Settings);
 		}
 

diff --git a/test/EventStore.Client.Streams.Tests/Security/SecurityFixture.cs b/test/EventStore.Client.Streams.Tests/Security/SecurityFixture.cs
@@ -19,7 +19,7 @@ public abstract class SecurityFixture : EventStoreClientFixture {
 
 		public EventStoreUserManagementClient UserManagementClient { get; }
 
-		protected SecurityFixture() {
+		protected SecurityFixture() : base(noDefaultCredentials: true) {
 			UserManagementClient = new EventStoreUserManagementClient(Settings);
 		}
 

diff --git a/test/EventStore.Client.Streams.Tests/Security/delete_stream_security.cs b/test/EventStore.Client.Streams.Tests/Security/delete_stream_security.cs
@@ -16,7 +16,7 @@ public async Task delete_of_all_is_never_allowed() {
 			await Assert.ThrowsAsync<AccessDeniedException>(() => _fixture.DeleteStream(SecurityFixture.AllStream, userCredentials: TestCredentials.TestAdmin));
 		}
 
-		[Fact]
+		[AnonymousAccess.Fact]
 		public async Task deleting_normal_no_acl_stream_with_no_user_is_allowed() {
 			var streamId = await _fixture.CreateStreamWithMeta(new StreamMetadata());
 			await _fixture.DeleteStream(streamId);
@@ -89,7 +89,7 @@ await _fixture.CreateStreamWithMeta(
 		}
 
 
-		[Fact]
+		[AnonymousAccess.Fact]
 		public async Task deleting_normal_all_stream_with_no_user_is_allowed() {
 			var streamId =
 				await _fixture.CreateStreamWithMeta(
@@ -188,7 +188,7 @@ public async Task deleting_system_admin_stream_with_admin_user_is_allowed() {
 		}
 
 
-		[Fact]
+		[AnonymousAccess.Fact]
 		public async Task deleting_system_all_stream_with_no_user_is_allowed() {
 			var streamId = await _fixture.CreateStreamWithMeta(streamId: $"${_fixture.GetStreamName()}",
 				metadata: new StreamMetadata(acl: new StreamAcl(deleteRole: SystemRoles.All)));