Skip to content

Addition validation and test for token / token supplier #1325

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

Merged
merged 1 commit into from
Jun 9, 2025
Merged

Addition validation and test for token / token supplier #1325

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
8 changes: 3 additions & 5 deletions src/main/java/io/nats/client/Options.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@
package io.nats.client;

import io.nats.client.impl.*;
import io.nats.client.support.HttpRequest;
import io.nats.client.support.NatsConstants;
import io.nats.client.support.NatsUri;
import io.nats.client.support.SSLUtils;
import io.nats.client.support.*;

import javax.net.ssl.SSLContext;
import java.io.File;
Expand Down Expand Up @@ -708,10 +705,11 @@ public DefaultTokenSupplier() {
}

public DefaultTokenSupplier(char[] token) {
this.token = token;
this.token = token == null || token.length == 0 ? null : token;
}

public DefaultTokenSupplier(String token) {
token = Validator.emptyAsNull(token);
this.token = token == null ? null : token.toCharArray();
}

Expand Down
38 changes: 29 additions & 9 deletions src/test/java/io/nats/client/OptionsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import io.nats.client.utils.CloseOnUpgradeAttempt;
import io.nats.client.utils.CoverageServerPool;
import io.nats.client.utils.ResourceUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.net.ssl.SSLContext;
Expand Down Expand Up @@ -862,16 +861,37 @@ public void testTokenInURL() {
@Test
public void testTokenSupplier() {
String serverURI = "nats://localhost:2222";
Options o = new Options.Builder().build();
String connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString();
assertFalse(connectString.contains("\"auth_token\""));

//noinspection deprecation
o = new Options.Builder().token((String)null).build();
connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString();
assertFalse(connectString.contains("\"auth_token\""));

//noinspection deprecation
o = new Options.Builder().token(" ").build();
connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString();
assertFalse(connectString.contains("\"auth_token\""));

o = new Options.Builder().token((char[])null).build();
connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString();
assertFalse(connectString.contains("\"auth_token\""));

o = new Options.Builder().token(new char[0]).build();
connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString();
assertFalse(connectString.contains("\"auth_token\""));

AtomicInteger counter = new AtomicInteger(0);
Supplier<char[]> tokenSupplier = () -> {
counter.incrementAndGet();
return "short-lived-token".toCharArray();
};
Options o = new Options.Builder().tokenSupplier(tokenSupplier).build();
Supplier<char[]> tokenSupplier = () -> ("short-lived-token-" + counter.incrementAndGet()).toCharArray();
o = new Options.Builder().tokenSupplier(tokenSupplier).build();

String connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString();
assertTrue(connectString.contains("\"auth_token\":\"short-lived-token\""));
assertEquals(1, counter.get());
connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString();
assertTrue(connectString.contains("\"auth_token\":\"short-lived-token-1\""));

connectString = o.buildProtocolConnectOptionsString(serverURI, true, null).toString();
assertTrue(connectString.contains("\"auth_token\":\"short-lived-token-2\""));
}

@Test
Expand Down
Loading