Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle auth change while already connected. #841

Merged
merged 1 commit into from
Nov 8, 2023
Merged

Handle auth change while already connected. #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/NATS.Client/Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@ internal bool connect(Srv s, out Exception exToThrow)
{
exToThrow = null;

NATSConnectionException natsAuthEx = null;
String lastAuthExMessage = null;

for(var i = 0; i < 6; i++) //Precaution to not end up in server returning ExTypeA, ExTypeB, ExTypeA etc.
{
Expand All @@ -1196,16 +1196,18 @@ internal bool connect(Srv s, out Exception exToThrow)
}
catch (NATSConnectionException ex)
{
if (!ex.IsAuthenticationOrAuthorizationError())
string message = ex.Message.ToLower();
if (!NATSException.IsAuthenticationOrAuthorizationError(message, true))
{
throw;
}

ScheduleErrorEvent(s, ex);

if (natsAuthEx == null || !natsAuthEx.Message.Equals(ex.Message, StringComparison.OrdinalIgnoreCase))
// avoiding double the same
if (lastAuthExMessage == null || !lastAuthExMessage.Equals(message))
{
natsAuthEx = ex;
lastAuthExMessage = message;
continue;
}

Expand Down Expand Up @@ -2448,9 +2450,6 @@ public Exception LastError
// sets the connection's lastError.
internal void processErr(MemoryStream errorStream)
{
bool invokeDelegates = false;
Exception ex = null;

string s = getNormalizedError(errorStream);

if (IC.STALE_CONNECTION.Equals(s))
Expand All @@ -2466,7 +2465,9 @@ internal void processErr(MemoryStream errorStream)
}
else
{
ex = new NATSException("Error from processErr(): " + s);
NATSException ex = new NATSException("Error from processErr(): " + s);
bool invokeDelegates = false;

lock (mu)
{
lastEx = ex;
Expand All @@ -2478,6 +2479,11 @@ internal void processErr(MemoryStream errorStream)
}

close(ConnState.CLOSED, invokeDelegates, ex);

if (NATSException.IsAuthenticationOrAuthorizationError(s))
{
processReconnect();
}
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/NATS.Client/Exceptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ public class NATSException : Exception
public NATSException() : base() { }
public NATSException(string err) : base (err) {}
public NATSException(string err, Exception innerEx) : base(err, innerEx) { }

public static bool IsAuthenticationOrAuthorizationError(string message, bool alreadyLowered = false)
{
string lowerMessage = alreadyLowered ? message : message.ToLower();
return lowerMessage.Contains("user authentication")
|| lowerMessage.Contains("authorization violation")
|| lowerMessage.Contains("authentication expired");
}
}

/// <summary>
Expand All @@ -33,14 +41,6 @@ public class NATSConnectionException : NATSException
{
public NATSConnectionException(string err) : base(err) { }
public NATSConnectionException(string err, Exception innerEx) : base(err, innerEx) { }

public bool IsAuthenticationOrAuthorizationError()
{
string lowerMessage = Message.ToLower();
return lowerMessage.Contains("user authentication")
|| lowerMessage.Contains("authorization violation")
|| lowerMessage.Contains("authentication expired");
}
}

/// <summary>
Expand Down
33 changes: 27 additions & 6 deletions src/Tests/IntegrationTests/TestAuthorization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
using System.Threading;
using NATS.Client;
using NATS.Client.Internals;
using UnitTests;
using Xunit;
using Xunit.Abstractions;

namespace IntegrationTests
{
Expand All @@ -27,7 +29,15 @@ namespace IntegrationTests
/// </summary>
public class TestAuthorization : TestSuite<AuthorizationSuiteContext>
{
public TestAuthorization(AuthorizationSuiteContext context) : base(context) {}
private readonly ITestOutputHelper output;

public TestAuthorization(ITestOutputHelper output, AuthorizationSuiteContext context) : base(context)
{
this.output = output;
Console.SetOut(new TestBase.ConsoleWriter(output));
}

// public TestAuthorization(AuthorizationSuiteContext context) : base(context) {}

int hitDisconnect;

Expand Down Expand Up @@ -261,23 +271,34 @@ public void TestRealUserAuthenticationExpired()
string credsFile = Path.GetTempFileName();
File.WriteAllText(credsFile, cred);

CountdownEvent userAuthenticationExpired = new CountdownEvent(1);
CountdownEvent userAuthenticationExpiredCde = new CountdownEvent(1);
CountdownEvent reconnectCde = new CountdownEvent(1);

using (NATSServer.CreateWithConfig(Context.Server3.Port, "operatorJnatsTest.conf"))
{
var opts = Context.GetTestOptionsWithDefaultTimeout(Context.Server3.Port);
opts.SetUserCredentials(credsFile);
opts.MaxReconnect = 1;
opts.DisconnectedEventHandler += (sender, e) =>
{
if (e.Error.ToString().Contains("user authentication expired"))
{
userAuthenticationExpired.Signal();
userAuthenticationExpiredCde.Signal();
}
};
opts.ReconnectedEventHandler += (sender, e) =>
{
if (userAuthenticationExpiredCde.IsSet)
{
reconnectCde.Signal();
}
};

IConnection c = Context.ConnectionFactory.CreateConnection(opts);
userAuthenticationExpired.Wait(wait);
Assert.True(userAuthenticationExpired.IsSet);
IConnection c = Context.ConnectionFactory.CreateConnection(opts, true);
userAuthenticationExpiredCde.Wait(wait);
Assert.True(userAuthenticationExpiredCde.IsSet);
reconnectCde.Wait(wait);
Assert.True(reconnectCde.IsSet);
}
}

Expand Down
Loading