Skip to content

Fix the auth data is NPE error #1531

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
Technoboy- merged 2 commits into from
Nov 14, 2024
Merged

Fix the auth data is NPE error #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f04489
Fix the auth data is NPE error
Technoboy- Nov 14, 2024
4196f37
fix checkstyle
Technoboy- Nov 14, 2024
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
7 changes: 7 additions & 0 deletions ...oker/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/channel/MQTTServerCnx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
*/
package io.streamnative.pulsar.handlers.mqtt.broker.channel;

import static io.streamnative.pulsar.handlers.mqtt.common.Constants.AUTH_DATA_ATTRIBUTE_KEY;
import io.netty.channel.ChannelHandlerContext;
import io.streamnative.pulsar.handlers.mqtt.broker.impl.consumer.MQTTConsumer;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
import org.apache.pulsar.broker.loadbalance.extensions.data.BrokerLookupData;
import org.apache.pulsar.broker.service.Consumer;
import org.apache.pulsar.broker.service.ServerCnx;
Expand Down Expand Up @@ -65,4 +67,9 @@ private void safelyRemoveConsumer(Consumer consumer) {
});
}
}

@Override
public AuthenticationDataSource getAuthenticationData() {
return ctx.channel().attr(AUTH_DATA_ATTRIBUTE_KEY).get();
}
}
4 changes: 4 additions & 0 deletions mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import static io.streamnative.pulsar.handlers.mqtt.common.Connection.ConnectionState.CONNECT_ACK;
import static io.streamnative.pulsar.handlers.mqtt.common.Connection.ConnectionState.DISCONNECTED;
import static io.streamnative.pulsar.handlers.mqtt.common.Connection.ConnectionState.ESTABLISHED;
import static io.streamnative.pulsar.handlers.mqtt.common.Constants.AUTH_DATA_ATTRIBUTE_KEY;
import static io.streamnative.pulsar.handlers.mqtt.common.utils.MqttMessageUtils.getAuthMethod;
import static io.streamnative.pulsar.handlers.mqtt.common.utils.NettyUtils.ATTR_KEY_CONNECTION;
import static java.util.concurrent.atomic.AtomicReferenceFieldUpdater.newUpdater;
Expand Down Expand Up @@ -101,6 +102,7 @@ public class Connection {

static ChannelException channelInactiveException = new ChannelException("Channel is inactive");


Connection(ConnectionBuilder builder) {
this.clientId = builder.clientId;
this.protocolVersion = builder.protocolVersion;
Expand All @@ -116,6 +118,7 @@ public class Connection {
this.processor = builder.processor;
this.fromProxy = builder.fromProxy;
this.authData = builder.authData;
this.channel.attr(AUTH_DATA_ATTRIBUTE_KEY).set(authData);
this.addIdleStateHandler();
this.manager.addConnection(this);
this.topicAliasManager = new TopicAliasManager(clientRestrictions.getTopicAliasMaximum());
Expand Down Expand Up @@ -162,6 +165,7 @@ public CompletableFuture<Void> sendAck(MqttAck mqttAck) {

public void updateAuthData(AuthenticationDataSource authData) {
this.authData = authData;
this.channel.attr(AUTH_DATA_ATTRIBUTE_KEY).set(authData);
}

public CompletableFuture<Void> sendAckThenClose(MqttAck mqttAck) {
Expand Down
6 changes: 6 additions & 0 deletions mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
*/
package io.streamnative.pulsar.handlers.mqtt.common;

import io.netty.util.AttributeKey;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;

/**
* Server constants keeper.
*/
Expand Down Expand Up @@ -47,6 +50,9 @@ public final class Constants {

public static final String MQTT_SUB_PROTOCOL_CSV_LIST = "mqtt, mqttv3.1, mqttv3.1.1, mqttv5.0";

public static final AttributeKey<AuthenticationDataSource> AUTH_DATA_ATTRIBUTE_KEY =
AttributeKey.valueOf("authData");

private Constants() {
}
}
Loading