anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ported the config for SSL and websocket into new broker

Browse Source
This commit is contained in:
andsel
2018-11-02 17:21:35 +01:00
parent 176b986c47
commit 5efbe8e8bf
9 changed files with 216 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/broker/Authorizator.java
-1
View File
@@ -1,6 +1,5 @@
package io.moquette.broker; package io.moquette.broker;
import io.moquette.spi.ClientSession;
import io.moquette.spi.impl.subscriptions.Topic; import io.moquette.spi.impl.subscriptions.Topic;
import io.moquette.spi.security.IAuthorizatorPolicy; import io.moquette.spi.security.IAuthorizatorPolicy;
import io.netty.handler.codec.mqtt.MqttQoS; import io.netty.handler.codec.mqtt.MqttQoS;
broker/src/main/java/io/moquette/broker/NewNettyAcceptor.java
+142 -134
View File
@@ -33,14 +33,22 @@ import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.handler.codec.MessageToMessageDecoder;
import io.netty.handler.codec.MessageToMessageEncoder; import io.netty.handler.codec.MessageToMessageEncoder;
import io.netty.handler.codec.http.HttpObjectAggregator;
import io.netty.handler.codec.http.HttpRequestDecoder;
import io.netty.handler.codec.http.HttpResponseEncoder;
import io.netty.handler.codec.http.HttpServerCodec;
import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame; import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
import io.netty.handler.codec.mqtt.MqttDecoder; import io.netty.handler.codec.mqtt.MqttDecoder;
import io.netty.handler.codec.mqtt.MqttEncoder; import io.netty.handler.codec.mqtt.MqttEncoder;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslHandler;
import io.netty.handler.timeout.IdleStateHandler; import io.netty.handler.timeout.IdleStateHandler;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLEngine;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -144,18 +152,18 @@ public class NewNettyAcceptor {
this.errorsCather = Optional.empty(); this.errorsCather = Optional.empty();
} }
initializePlainTCPTransport(mqttHandler, props); initializePlainTCPTransport(mqttHandler, props);
// initializeWebSocketTransport(mqttHandler, props); initializeWebSocketTransport(mqttHandler, props);
// String sslTcpPortProp = props.getProperty(BrokerConstants.SSL_PORT_PROPERTY_NAME); String sslTcpPortProp = props.getProperty(BrokerConstants.SSL_PORT_PROPERTY_NAME);
// String wssPortProp = props.getProperty(BrokerConstants.WSS_PORT_PROPERTY_NAME); String wssPortProp = props.getProperty(BrokerConstants.WSS_PORT_PROPERTY_NAME);
// if (sslTcpPortProp != null || wssPortProp != null) { if (sslTcpPortProp != null || wssPortProp != null) {
// SslContext sslContext = sslCtxCreator.initSSLContext(); SslContext sslContext = sslCtxCreator.initSSLContext();
// if (sslContext == null) { if (sslContext == null) {
// LOG.error("Can't initialize SSLHandler layer! Exiting, check your configuration of jks"); LOG.error("Can't initialize SSLHandler layer! Exiting, check your configuration of jks");
// return; return;
// } }
// initializeSSLTCPTransport(mqttHandler, props, sslContext); initializeSSLTCPTransport(mqttHandler, props, sslContext);
// initializeWSSTransport(mqttHandler, props, sslContext); initializeWSSTransport(mqttHandler, props, sslContext);
// } }
} }
private void initFactory(String host, int port, String protocol, final PipelineInitializer pipeliner) { private void initFactory(String host, int port, String protocol, final PipelineInitializer pipeliner) {
@@ -219,117 +227,117 @@ public class NewNettyAcceptor {
}); });
} }
// private void initializeWebSocketTransport(final NettyMQTTHandler handler, IConfig props) { private void initializeWebSocketTransport(final NewNettyMQTTHandler handler, IConfig props) {
// LOG.debug("Configuring Websocket MQTT transport"); LOG.debug("Configuring Websocket MQTT transport");
// String webSocketPortProp = props.getProperty(WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND); String webSocketPortProp = props.getProperty(WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
// if (DISABLED_PORT_BIND.equals(webSocketPortProp)) { if (DISABLED_PORT_BIND.equals(webSocketPortProp)) {
// // Do nothing no WebSocket configured // Do nothing no WebSocket configured
// LOG.info("Property {} has been setted to {}. Websocket MQTT will be disabled", LOG.info("Property {} has been setted to {}. Websocket MQTT will be disabled",
// BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND); BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
// return; return;
// } }
// int port = Integer.parseInt(webSocketPortProp); int port = Integer.parseInt(webSocketPortProp);
//
// final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler(); final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
//
// String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME); String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
// initFactory(host, port, "Websocket MQTT", new PipelineInitializer() { initFactory(host, port, "Websocket MQTT", new PipelineInitializer() {
//
// @Override @Override
// void init(SocketChannel channel) { void init(SocketChannel channel) {
// ChannelPipeline pipeline = channel.pipeline(); ChannelPipeline pipeline = channel.pipeline();
// pipeline.addLast(new HttpServerCodec()); pipeline.addLast(new HttpServerCodec());
// pipeline.addLast("aggregator", new HttpObjectAggregator(65536)); pipeline.addLast("aggregator", new HttpObjectAggregator(65536));
// pipeline.addLast("webSocketHandler", pipeline.addLast("webSocketHandler",
// new WebSocketServerProtocolHandler("/mqtt", MQTT_SUBPROTOCOL_CSV_LIST)); new WebSocketServerProtocolHandler("/mqtt", MQTT_SUBPROTOCOL_CSV_LIST));
// pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder()); pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder());
// pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder()); pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder());
// pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0)); pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0));
// pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler); pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
// pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector)); pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
// pipeline.addLast("decoder", new MqttDecoder(maxBytesInMessage)); pipeline.addLast("decoder", new MqttDecoder(maxBytesInMessage));
// pipeline.addLast("encoder", MqttEncoder.INSTANCE); pipeline.addLast("encoder", MqttEncoder.INSTANCE);
// pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector)); pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector));
// pipeline.addLast("messageLogger", new MQTTMessageLogger()); pipeline.addLast("messageLogger", new MQTTMessageLogger());
// pipeline.addLast("handler", handler); pipeline.addLast("handler", handler);
// } }
// }); });
// } }
//
// private void initializeSSLTCPTransport(NettyMQTTHandler handler, IConfig props, SslContext sslContext) { private void initializeSSLTCPTransport(NewNettyMQTTHandler handler, IConfig props, SslContext sslContext) {
// LOG.debug("Configuring SSL MQTT transport"); LOG.debug("Configuring SSL MQTT transport");
// String sslPortProp = props.getProperty(SSL_PORT_PROPERTY_NAME, DISABLED_PORT_BIND); String sslPortProp = props.getProperty(SSL_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
// if (DISABLED_PORT_BIND.equals(sslPortProp)) { if (DISABLED_PORT_BIND.equals(sslPortProp)) {
// // Do nothing no SSL configured // Do nothing no SSL configured
// LOG.info("Property {} has been set to {}. SSL MQTT will be disabled", LOG.info("Property {} has been set to {}. SSL MQTT will be disabled",
// BrokerConstants.SSL_PORT_PROPERTY_NAME, DISABLED_PORT_BIND); BrokerConstants.SSL_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
// return; return;
// } }
//
// int sslPort = Integer.parseInt(sslPortProp); int sslPort = Integer.parseInt(sslPortProp);
// LOG.debug("Starting SSL on port {}", sslPort); LOG.debug("Starting SSL on port {}", sslPort);
//
// final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler(); final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
// String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME); String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
// String sNeedsClientAuth = props.getProperty(BrokerConstants.NEED_CLIENT_AUTH, "false"); String sNeedsClientAuth = props.getProperty(BrokerConstants.NEED_CLIENT_AUTH, "false");
// final boolean needsClientAuth = Boolean.valueOf(sNeedsClientAuth); final boolean needsClientAuth = Boolean.valueOf(sNeedsClientAuth);
// initFactory(host, sslPort, "SSL MQTT", new PipelineInitializer() { initFactory(host, sslPort, "SSL MQTT", new PipelineInitializer() {
//
// @Override @Override
// void init(SocketChannel channel) throws Exception { void init(SocketChannel channel) throws Exception {
// ChannelPipeline pipeline = channel.pipeline(); ChannelPipeline pipeline = channel.pipeline();
// pipeline.addLast("ssl", createSslHandler(channel, sslContext, needsClientAuth)); pipeline.addLast("ssl", createSslHandler(channel, sslContext, needsClientAuth));
// pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0)); pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0));
// pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler); pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
// // pipeline.addLast("logger", new LoggingHandler("Netty", LogLevel.ERROR)); // pipeline.addLast("logger", new LoggingHandler("Netty", LogLevel.ERROR));
// pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector)); pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
// pipeline.addLast("decoder", new MqttDecoder(maxBytesInMessage)); pipeline.addLast("decoder", new MqttDecoder(maxBytesInMessage));
// pipeline.addLast("encoder", MqttEncoder.INSTANCE); pipeline.addLast("encoder", MqttEncoder.INSTANCE);
// pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector)); pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector));
// pipeline.addLast("messageLogger", new MQTTMessageLogger()); pipeline.addLast("messageLogger", new MQTTMessageLogger());
// pipeline.addLast("handler", handler); pipeline.addLast("handler", handler);
// } }
// }); });
// } }
//
// private void initializeWSSTransport(NettyMQTTHandler handler, IConfig props, SslContext sslContext) { private void initializeWSSTransport(NewNettyMQTTHandler handler, IConfig props, SslContext sslContext) {
// LOG.debug("Configuring secure websocket MQTT transport"); LOG.debug("Configuring secure websocket MQTT transport");
// String sslPortProp = props.getProperty(WSS_PORT_PROPERTY_NAME, DISABLED_PORT_BIND); String sslPortProp = props.getProperty(WSS_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
// if (DISABLED_PORT_BIND.equals(sslPortProp)) { if (DISABLED_PORT_BIND.equals(sslPortProp)) {
// // Do nothing no SSL configured // Do nothing no SSL configured
// LOG.info("Property {} has been set to {}. Secure websocket MQTT will be disabled", LOG.info("Property {} has been set to {}. Secure websocket MQTT will be disabled",
// BrokerConstants.WSS_PORT_PROPERTY_NAME, DISABLED_PORT_BIND); BrokerConstants.WSS_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
// return; return;
// } }
// int sslPort = Integer.parseInt(sslPortProp); int sslPort = Integer.parseInt(sslPortProp);
// final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler(); final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
// String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME); String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
// String sNeedsClientAuth = props.getProperty(BrokerConstants.NEED_CLIENT_AUTH, "false"); String sNeedsClientAuth = props.getProperty(BrokerConstants.NEED_CLIENT_AUTH, "false");
// final boolean needsClientAuth = Boolean.valueOf(sNeedsClientAuth); final boolean needsClientAuth = Boolean.valueOf(sNeedsClientAuth);
// initFactory(host, sslPort, "Secure websocket", new PipelineInitializer() { initFactory(host, sslPort, "Secure websocket", new PipelineInitializer() {
//
// @Override @Override
// void init(SocketChannel channel) throws Exception { void init(SocketChannel channel) throws Exception {
// ChannelPipeline pipeline = channel.pipeline(); ChannelPipeline pipeline = channel.pipeline();
// pipeline.addLast("ssl", createSslHandler(channel, sslContext, needsClientAuth)); pipeline.addLast("ssl", createSslHandler(channel, sslContext, needsClientAuth));
// pipeline.addLast("httpEncoder", new HttpResponseEncoder()); pipeline.addLast("httpEncoder", new HttpResponseEncoder());
// pipeline.addLast("httpDecoder", new HttpRequestDecoder()); pipeline.addLast("httpDecoder", new HttpRequestDecoder());
// pipeline.addLast("aggregator", new HttpObjectAggregator(65536)); pipeline.addLast("aggregator", new HttpObjectAggregator(65536));
// pipeline.addLast("webSocketHandler", pipeline.addLast("webSocketHandler",
// new WebSocketServerProtocolHandler("/mqtt", MQTT_SUBPROTOCOL_CSV_LIST)); new WebSocketServerProtocolHandler("/mqtt", MQTT_SUBPROTOCOL_CSV_LIST));
// pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder()); pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder());
// pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder()); pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder());
// pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0)); pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0));
// pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler); pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
// pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector)); pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
// pipeline.addLast("decoder", new MqttDecoder(maxBytesInMessage)); pipeline.addLast("decoder", new MqttDecoder(maxBytesInMessage));
// pipeline.addLast("encoder", MqttEncoder.INSTANCE); pipeline.addLast("encoder", MqttEncoder.INSTANCE);
// pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector)); pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector));
// pipeline.addLast("messageLogger", new MQTTMessageLogger()); pipeline.addLast("messageLogger", new MQTTMessageLogger());
// pipeline.addLast("handler", handler); pipeline.addLast("handler", handler);
// } }
// }); });
// } }
@SuppressWarnings("FutureReturnValueIgnored") @SuppressWarnings("FutureReturnValueIgnored")
public void close() { public void close() {
@@ -369,15 +377,15 @@ public class NewNettyAcceptor {
metrics.messagesWrote(), bytesMetrics.readBytes(), bytesMetrics.wroteBytes()); metrics.messagesWrote(), bytesMetrics.readBytes(), bytesMetrics.wroteBytes());
} }
// private ChannelHandler createSslHandler(SocketChannel channel, SslContext sslContext, boolean needsClientAuth) { private ChannelHandler createSslHandler(SocketChannel channel, SslContext sslContext, boolean needsClientAuth) {
// SSLEngine sslEngine = sslContext.newEngine( SSLEngine sslEngine = sslContext.newEngine(
// channel.alloc(), channel.alloc(),
// channel.remoteAddress().getHostString(), channel.remoteAddress().getHostString(),
// channel.remoteAddress().getPort()); channel.remoteAddress().getPort());
// sslEngine.setUseClientMode(false); sslEngine.setUseClientMode(false);
// if (needsClientAuth) { if (needsClientAuth) {
// sslEngine.setNeedClientAuth(true); sslEngine.setNeedClientAuth(true);
// } }
// return new SslHandler(sslEngine); return new SslHandler(sslEngine);
// } }
} }
broker/src/main/java/io/moquette/broker/Server.java
+67 -16
View File
@@ -3,12 +3,12 @@ package io.moquette.broker;
import io.moquette.BrokerConstants; import io.moquette.BrokerConstants;
import io.moquette.interception.InterceptHandler; import io.moquette.interception.InterceptHandler;
import io.moquette.persistence.MemoryStorageService; import io.moquette.persistence.MemoryStorageService;
import io.moquette.server.DefaultMoquetteSslContextCreator;
import io.moquette.server.config.*; import io.moquette.server.config.*;
import io.moquette.spi.ISessionsStore; import io.moquette.spi.ISessionsStore;
import io.moquette.spi.impl.BrokerInterceptor; import io.moquette.spi.impl.BrokerInterceptor;
import io.moquette.spi.impl.SessionsRepository; import io.moquette.spi.impl.SessionsRepository;
import io.moquette.spi.impl.security.AcceptAllAuthenticator; import io.moquette.spi.impl.security.*;
import io.moquette.spi.impl.security.PermitAllAuthorizatorPolicy;
import io.moquette.spi.impl.subscriptions.CTrieSubscriptionDirectory; import io.moquette.spi.impl.subscriptions.CTrieSubscriptionDirectory;
import io.moquette.spi.impl.subscriptions.ISubscriptionsDirectory; import io.moquette.spi.impl.subscriptions.ISubscriptionsDirectory;
import io.moquette.spi.security.IAuthenticator; import io.moquette.spi.security.IAuthenticator;
@@ -21,6 +21,7 @@ import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -136,24 +137,17 @@ public class Server {
config.setProperty(BrokerConstants.INTERCEPT_HANDLER_PROPERTY_NAME, handlerProp); config.setProperty(BrokerConstants.INTERCEPT_HANDLER_PROPERTY_NAME, handlerProp);
} }
final String persistencePath = config.getProperty(BrokerConstants.PERSISTENT_STORE_PROPERTY_NAME); final String persistencePath = config.getProperty(BrokerConstants.PERSISTENT_STORE_PROPERTY_NAME);
LOG.debug("Configuring Using persistent store file, path={}", persistencePath); LOG.debug("Configuring Using persistent store file, path: {}", persistencePath);
// m_processorBootstrapper = new ProtocolProcessorBootstrapper();
// final ProtocolProcessor processor = m_processorBootstrapper.init(config, handlers, authenticator, authorizator,
// this);
initInterceptors(config, handlers); initInterceptors(config, handlers);
LOG.debug("Initialized MQTT protocol processor"); LOG.debug("Initialized MQTT protocol processor");
// if (sslCtxCreator == null) { if (sslCtxCreator == null) {
// LOG.info("Using default SSL context creator"); LOG.info("Using default SSL context creator");
// sslCtxCreator = new DefaultMoquetteSslContextCreator(config); sslCtxCreator = new DefaultMoquetteSslContextCreator(config);
// }
// DBG
if (authenticator == null) {
authenticator = new AcceptAllAuthenticator();
}
if (authorizatorPolicy == null) {
authorizatorPolicy = new PermitAllAuthorizatorPolicy();
} }
authenticator = initializeAuthenticator(authenticator, config);
authorizatorPolicy = initializeAuthorizatorPolicy(authorizatorPolicy, config);
// TODO user real implementation DBG
MemoryStorageService memStorage = new MemoryStorageService(null, null); MemoryStorageService memStorage = new MemoryStorageService(null, null);
ISessionsStore sessionStore = memStorage.sessionsStore(); ISessionsStore sessionStore = memStorage.sessionsStore();
SessionsRepository sessionsRepository = new SessionsRepository(sessionStore, null); SessionsRepository sessionsRepository = new SessionsRepository(sessionStore, null);
@@ -177,6 +171,63 @@ public class Server {
initialized = true; initialized = true;
} }
private IAuthorizatorPolicy initializeAuthorizatorPolicy(IAuthorizatorPolicy authorizatorPolicy, IConfig props) {
// if (authorizatorPolicy == null) {
// authorizatorPolicy = new PermitAllAuthorizatorPolicy();
// }
// return authorizatorPolicy;
LOG.debug("Configuring MQTT authorizator policy");
String authorizatorClassName = props.getProperty(BrokerConstants.AUTHORIZATOR_CLASS_NAME, "");
if (authorizatorPolicy == null && !authorizatorClassName.isEmpty()) {
authorizatorPolicy = loadClass(authorizatorClassName, IAuthorizatorPolicy.class, IConfig.class, props);
}
if (authorizatorPolicy == null) {
String aclFilePath = props.getProperty(BrokerConstants.ACL_FILE_PROPERTY_NAME, "");
if (aclFilePath != null && !aclFilePath.isEmpty()) {
authorizatorPolicy = new DenyAllAuthorizatorPolicy();
try {
LOG.info("Parsing ACL file. Path = {}", aclFilePath);
IResourceLoader resourceLoader = props.getResourceLoader();
authorizatorPolicy = ACLFileParser.parse(resourceLoader.loadResource(aclFilePath));
} catch (ParseException pex) {
LOG.error("Unable to parse ACL file. path=" + aclFilePath, pex);
}
} else {
authorizatorPolicy = new PermitAllAuthorizatorPolicy();
}
LOG.info("Authorizator policy {} instance will be used", authorizatorPolicy.getClass().getName());
}
return authorizatorPolicy;
}
private IAuthenticator initializeAuthenticator(IAuthenticator authenticator, IConfig props) {
// if (authenticator == null) {
// authenticator = new AcceptAllAuthenticator();
// }
// return authenticator;
LOG.debug("Configuring MQTT authenticator");
String authenticatorClassName = props.getProperty(BrokerConstants.AUTHENTICATOR_CLASS_NAME, "");
if (authenticator == null && !authenticatorClassName.isEmpty()) {
authenticator = loadClass(authenticatorClassName, IAuthenticator.class, IConfig.class, props);
}
IResourceLoader resourceLoader = props.getResourceLoader();
if (authenticator == null) {
String passwdPath = props.getProperty(BrokerConstants.PASSWORD_FILE_PROPERTY_NAME, "");
if (passwdPath.isEmpty()) {
authenticator = new AcceptAllAuthenticator();
} else {
authenticator = new ResourceAuthenticator(resourceLoader, passwdPath);
}
LOG.info("An {} authenticator instance will be used", authenticator.getClass().getName());
}
return authenticator;
}
private void initInterceptors(IConfig props, List<? extends InterceptHandler> embeddedObservers) { private void initInterceptors(IConfig props, List<? extends InterceptHandler> embeddedObservers) {
LOG.info("Configuring message interceptors..."); LOG.info("Configuring message interceptors...");
broker/src/main/java/io/moquette/server/DefaultMoquetteSslContextCreator.java
+2 -2
View File
@@ -49,13 +49,13 @@ import org.slf4j.LoggerFactory;
* Moquette server implementation to load SSL certificate from local filesystem path configured in * Moquette server implementation to load SSL certificate from local filesystem path configured in
* config file. * config file.
*/ */
class DefaultMoquetteSslContextCreator implements ISslContextCreator { public class DefaultMoquetteSslContextCreator implements ISslContextCreator {
private static final Logger LOG = LoggerFactory.getLogger(DefaultMoquetteSslContextCreator.class); private static final Logger LOG = LoggerFactory.getLogger(DefaultMoquetteSslContextCreator.class);
private final IConfig props; private final IConfig props;
DefaultMoquetteSslContextCreator(IConfig props) { public DefaultMoquetteSslContextCreator(IConfig props) {
this.props = Objects.requireNonNull(props); this.props = Objects.requireNonNull(props);
} }
broker/src/main/java/io/moquette/spi/ClientSession.java
+1
View File
@@ -38,6 +38,7 @@ import java.util.Set;
* <li>Optionally, QoS 0 messages pending transmission to the Client.</li> * <li>Optionally, QoS 0 messages pending transmission to the Client.</li>
* </ul> * </ul>
*/ */
@Deprecated
public abstract class ClientSession { public abstract class ClientSession {
public final String clientID; public final String clientID;
broker/src/main/java/io/moquette/spi/DurableSession.java
+1
View File
@@ -30,6 +30,7 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
@Deprecated
public class DurableSession extends ClientSession { public class DurableSession extends ClientSession {
class OutboundFlightZone { class OutboundFlightZone {
broker/src/main/java/io/moquette/spi/EnqueuedMessage.java
+1
View File
@@ -16,6 +16,7 @@
package io.moquette.spi; package io.moquette.spi;
@Deprecated
public class EnqueuedMessage { public class EnqueuedMessage {
public final IMessagesStore.StoredMessage msg; public final IMessagesStore.StoredMessage msg;
broker/src/main/java/io/moquette/spi/InboundFlightZone.java
+1
View File
@@ -18,6 +18,7 @@ package io.moquette.spi;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@Deprecated
class InboundFlightZone { class InboundFlightZone {
private final Map<Integer, IMessagesStore.StoredMessage> inboundFlightMessages = new ConcurrentHashMap<>(); private final Map<Integer, IMessagesStore.StoredMessage> inboundFlightMessages = new ConcurrentHashMap<>();
broker/src/main/java/io/moquette/spi/TransientSession.java
+1
View File
@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@Deprecated
public class TransientSession extends ClientSession { public class TransientSession extends ClientSession {
private static final Logger LOG = LoggerFactory.getLogger(TransientSession.class); private static final Logger LOG = LoggerFactory.getLogger(TransientSession.class);