From 691a87b5ea32378db4d54cf51467ccaea9d67cf7 Mon Sep 17 00:00:00 2001 From: powercas_gamer Date: Tue, 17 Mar 2026 22:10:56 +0100 Subject: [PATCH] Add support for NATS token authentication (#4238) --- bukkit/src/main/resources/config.yml | 1 + bungee/src/main/resources/config.yml | 1 + .../me/lucko/luckperms/common/config/ConfigKeys.java | 5 +++++ .../luckperms/common/messaging/MessagingFactory.java | 6 +++++- .../luckperms/common/messaging/nats/NatsMessenger.java | 6 +++++- fabric/src/main/resources/luckperms.conf | 1 + forge/src/main/resources/luckperms.conf | 10 ++++++++++ hytale/src/main/resources/config.yml | 1 + neoforge/src/main/resources/luckperms.conf | 10 ++++++++++ nukkit/src/main/resources/config.yml | 1 + sponge/src/main/resources/luckperms.conf | 1 + standalone/src/main/resources/config.yml | 1 + velocity/src/main/resources/config.yml | 1 + 13 files changed, 43 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml index 8080ba260..89159830f 100644 --- a/bukkit/src/main/resources/config.yml +++ b/bukkit/src/main/resources/config.yml @@ -276,6 +276,7 @@ nats: address: localhost username: '' password: '' + token: '' # Settings for RabbitMQ. # Port 5672 is used by default; set address to "host:port" if differs diff --git a/bungee/src/main/resources/config.yml b/bungee/src/main/resources/config.yml index a1ee2f959..878b9a82c 100644 --- a/bungee/src/main/resources/config.yml +++ b/bungee/src/main/resources/config.yml @@ -274,6 +274,7 @@ nats: address: localhost username: '' password: '' + token: '' # Settings for RabbitMQ. # Port 5672 is used by default; set address to "host:port" if differs diff --git a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java index 00cfbb3cf..a7ce1e80f 100644 --- a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java +++ b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java @@ -725,6 +725,11 @@ public final class ConfigKeys { */ public static final ConfigKey NATS_PASSWORD = notReloadable(stringKey("nats.password", "")); + /** + * The token in use by the nats server, or an empty string if there is no token + */ + public static final ConfigKey NATS_TOKEN = notReloadable(stringKey("nats.token", "")); + /** * If the nats connection should use SSL */ diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java b/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java index 7a2800779..dda65225b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/MessagingFactory.java @@ -170,15 +170,19 @@ public class MessagingFactory

{ String address = configuration.get(ConfigKeys.NATS_ADDRESS); String username = configuration.get(ConfigKeys.NATS_USERNAME); String password = configuration.get(ConfigKeys.NATS_PASSWORD); + String token = configuration.get(ConfigKeys.NATS_TOKEN); if (password.isEmpty()) { password = null; } if (username.isEmpty()) { username = null; } + if (token.isEmpty()) { + token = null; + } boolean ssl = configuration.get(ConfigKeys.NATS_SSL); - natsMessenger.init(address, username, password, ssl); + natsMessenger.init(address, username, password, token, ssl); return natsMessenger; } } diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java b/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java index a5b7667f3..9a9e7c690 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/nats/NatsMessenger.java @@ -69,7 +69,7 @@ public class NatsMessenger implements Messenger { this.connection.publish(CHANNEL, output.toByteArray()); } - public void init(String address, String username, String password, boolean ssl) { + public void init(String address, String username, String password, String token, boolean ssl) { HostAndPort hostAndPort = new HostAndPort(address) .requireBracketsForIPv6() .withDefaultPort(Options.DEFAULT_PORT); @@ -86,6 +86,10 @@ public class NatsMessenger implements Messenger { builder.userInfo(username, password); } + if (token != null) { + builder.token(token.toCharArray()); + } + if (ssl) { builder.secure(); } diff --git a/fabric/src/main/resources/luckperms.conf b/fabric/src/main/resources/luckperms.conf index c18869d91..4fb177ba1 100644 --- a/fabric/src/main/resources/luckperms.conf +++ b/fabric/src/main/resources/luckperms.conf @@ -280,6 +280,7 @@ nats { address = "localhost" username = "" password = "" + token = "" } # Settings for RabbitMQ. diff --git a/forge/src/main/resources/luckperms.conf b/forge/src/main/resources/luckperms.conf index 27f01eb38..dce36da4a 100644 --- a/forge/src/main/resources/luckperms.conf +++ b/forge/src/main/resources/luckperms.conf @@ -271,6 +271,16 @@ redis { password = "" } +# Settings for nats. +# Port 4222 is used by default; set address to "host:port" if differs +nats { + enabled = false + address = "localhost" + username = "" + password = "" + token = "" +} + # Settings for RabbitMQ. # Port 5672 is used by default; set address to "host:port" if differs rabbitmq { diff --git a/hytale/src/main/resources/config.yml b/hytale/src/main/resources/config.yml index a0241e6b2..8fdd78218 100644 --- a/hytale/src/main/resources/config.yml +++ b/hytale/src/main/resources/config.yml @@ -276,6 +276,7 @@ nats: address: localhost username: '' password: '' + token: '' # Settings for RabbitMQ. # Port 5672 is used by default; set address to "host:port" if differs diff --git a/neoforge/src/main/resources/luckperms.conf b/neoforge/src/main/resources/luckperms.conf index 27f01eb38..dce36da4a 100644 --- a/neoforge/src/main/resources/luckperms.conf +++ b/neoforge/src/main/resources/luckperms.conf @@ -271,6 +271,16 @@ redis { password = "" } +# Settings for nats. +# Port 4222 is used by default; set address to "host:port" if differs +nats { + enabled = false + address = "localhost" + username = "" + password = "" + token = "" +} + # Settings for RabbitMQ. # Port 5672 is used by default; set address to "host:port" if differs rabbitmq { diff --git a/nukkit/src/main/resources/config.yml b/nukkit/src/main/resources/config.yml index 33ca323f5..fb00372c4 100644 --- a/nukkit/src/main/resources/config.yml +++ b/nukkit/src/main/resources/config.yml @@ -271,6 +271,7 @@ nats: address: localhost username: '' password: '' + token: '' # Settings for RabbitMQ. # Port 5672 is used by default; set address to "host:port" if differs diff --git a/sponge/src/main/resources/luckperms.conf b/sponge/src/main/resources/luckperms.conf index f7f2d3c8b..14a99f461 100644 --- a/sponge/src/main/resources/luckperms.conf +++ b/sponge/src/main/resources/luckperms.conf @@ -280,6 +280,7 @@ nats { address = "localhost" username = "" password = "" + token = "" } # Settings for RabbitMQ. diff --git a/standalone/src/main/resources/config.yml b/standalone/src/main/resources/config.yml index d7c041854..091351d1c 100644 --- a/standalone/src/main/resources/config.yml +++ b/standalone/src/main/resources/config.yml @@ -261,6 +261,7 @@ nats: address: localhost username: '' password: '' + token: '' # Settings for RabbitMQ. # Port 5672 is used by default; set address to "host:port" if differs diff --git a/velocity/src/main/resources/config.yml b/velocity/src/main/resources/config.yml index ab0b9d75e..805116d52 100644 --- a/velocity/src/main/resources/config.yml +++ b/velocity/src/main/resources/config.yml @@ -265,6 +265,7 @@ nats: address: localhost username: '' password: '' + token: '' # Settings for RabbitMQ. # Port 5672 is used by default; set address to "host:port" if differs