Implemented the part of parsing and accessing the user specific ACLs
This commit is contained in:
@@ -29,11 +29,13 @@ import org.eclipse.moquette.server.ServerChannel;
|
|||||||
public class NettyChannel implements ServerChannel {
|
public class NettyChannel implements ServerChannel {
|
||||||
|
|
||||||
private ChannelHandlerContext m_channel;
|
private ChannelHandlerContext m_channel;
|
||||||
|
|
||||||
|
public static final String ATTR_USERNAME = "username";
|
||||||
|
|
||||||
public static final AttributeKey<Object> ATTR_KEY_KEEPALIVE = AttributeKey.valueOf(Constants.KEEP_ALIVE);
|
public static final AttributeKey<Object> ATTR_KEY_KEEPALIVE = AttributeKey.valueOf(Constants.KEEP_ALIVE);
|
||||||
public static final AttributeKey<Object> ATTR_KEY_CLEANSESSION = AttributeKey.valueOf(Constants.CLEAN_SESSION);
|
public static final AttributeKey<Object> ATTR_KEY_CLEANSESSION = AttributeKey.valueOf(Constants.CLEAN_SESSION);
|
||||||
public static final AttributeKey<Object> ATTR_KEY_CLIENTID = AttributeKey.valueOf(Constants.ATTR_CLIENTID);
|
public static final AttributeKey<Object> ATTR_KEY_CLIENTID = AttributeKey.valueOf(Constants.ATTR_CLIENTID);
|
||||||
|
public static final AttributeKey<Object> ATTR_KEY_USERNAME = AttributeKey.valueOf(ATTR_USERNAME);
|
||||||
|
|
||||||
NettyChannel(ChannelHandlerContext ctx) {
|
NettyChannel(ChannelHandlerContext ctx) {
|
||||||
m_channel = ctx;
|
m_channel = ctx;
|
||||||
@@ -48,7 +50,7 @@ public class NettyChannel implements ServerChannel {
|
|||||||
Attribute<Object> attr = m_channel.attr(key);
|
Attribute<Object> attr = m_channel.attr(key);
|
||||||
attr.set(value);
|
attr.set(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setIdleTime(int idleTime) {
|
public void setIdleTime(int idleTime) {
|
||||||
if (m_channel.pipeline().names().contains("idleStateHandler")) {
|
if (m_channel.pipeline().names().contains("idleStateHandler")) {
|
||||||
m_channel.pipeline().remove("idleStateHandler");
|
m_channel.pipeline().remove("idleStateHandler");
|
||||||
|
|||||||
@@ -215,6 +215,7 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
|
|||||||
failedCredetials(session);
|
failedCredetials(session);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
session.setAttribute(NettyChannel.ATTR_KEY_USERNAME, msg.getUsername());
|
||||||
} else if (!this.allowAnonymous) {
|
} else if (!this.allowAnonymous) {
|
||||||
failedCredetials(session);
|
failedCredetials(session);
|
||||||
return;
|
return;
|
||||||
@@ -297,7 +298,8 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
|
|||||||
final ByteBuffer message = msg.getPayload();
|
final ByteBuffer message = msg.getPayload();
|
||||||
boolean retain = msg.isRetainFlag();
|
boolean retain = msg.isRetainFlag();
|
||||||
//check if the topic can be wrote
|
//check if the topic can be wrote
|
||||||
if (m_authorizator.canWrite(topic)) {
|
String user = (String) session.getAttribute(NettyChannel.ATTR_KEY_USERNAME);
|
||||||
|
if (m_authorizator.canWrite(topic, user)) {
|
||||||
processPublish(clientID, topic, qos, message, retain, msg.getMessageID());
|
processPublish(clientID, topic, qos, message, retain, msg.getMessageID());
|
||||||
} else {
|
} else {
|
||||||
LOG.debug("topic {} doesn't have write credentials", topic);
|
LOG.debug("topic {} doesn't have write credentials", topic);
|
||||||
@@ -373,11 +375,7 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
|
|||||||
if (qos.ordinal() > sub.getRequestedQos().ordinal()) {
|
if (qos.ordinal() > sub.getRequestedQos().ordinal()) {
|
||||||
qos = sub.getRequestedQos();
|
qos = sub.getRequestedQos();
|
||||||
}
|
}
|
||||||
if (!m_authorizator.canRead(topic)) {
|
|
||||||
LOG.debug("topic {} doesn't have read credentials", topic);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
LOG.debug("Broker republishing to client <{}> topic <{}> qos <{}>, active {}",
|
LOG.debug("Broker republishing to client <{}> topic <{}> qos <{}>, active {}",
|
||||||
sub.getClientId(), sub.getTopicFilter(), qos, sub.isActive());
|
sub.getClientId(), sub.getTopicFilter(), qos, sub.isActive());
|
||||||
ByteBuffer message = origMessage.duplicate();
|
ByteBuffer message = origMessage.duplicate();
|
||||||
@@ -437,9 +435,16 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
|
|||||||
if (m_clientIDs.get(clientId) == null) {
|
if (m_clientIDs.get(clientId) == null) {
|
||||||
throw new RuntimeException(String.format("Can't find a ConnectionDescriptor for client <%s> in cache <%s>", clientId, m_clientIDs));
|
throw new RuntimeException(String.format("Can't find a ConnectionDescriptor for client <%s> in cache <%s>", clientId, m_clientIDs));
|
||||||
}
|
}
|
||||||
LOG.debug("Session for clientId {} is {}", clientId, m_clientIDs.get(clientId).getSession());
|
ServerChannel session = m_clientIDs.get(clientId).getSession();
|
||||||
// m_clientIDs.get(clientId).getSession().write(pubMessage);
|
LOG.debug("Session for clientId {} is {}", clientId, session);
|
||||||
disruptorPublish(new OutputMessagingEvent(m_clientIDs.get(clientId).getSession(), pubMessage));
|
|
||||||
|
String user = (String) session.getAttribute(NettyChannel.ATTR_KEY_USERNAME);
|
||||||
|
if (!m_authorizator.canRead(topic, user)) {
|
||||||
|
LOG.debug("topic {} doesn't have read credentials", topic);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
disruptorPublish(new OutputMessagingEvent(session, pubMessage));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sendPubRec(String clientID, int messageID) {
|
private void sendPubRec(String clientID, int messageID) {
|
||||||
|
|||||||
+77
-40
@@ -20,9 +20,7 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import static org.eclipse.moquette.spi.impl.security.Authorization.Permission.READ;
|
import static org.eclipse.moquette.spi.impl.security.Authorization.Permission.READ;
|
||||||
import static org.eclipse.moquette.spi.impl.security.Authorization.Permission.READWRITE;
|
import static org.eclipse.moquette.spi.impl.security.Authorization.Permission.READWRITE;
|
||||||
@@ -40,55 +38,94 @@ class AuthorizationsCollector implements IAuthorizator {
|
|||||||
|
|
||||||
private static final Logger LOG = LoggerFactory.getLogger(AuthorizationsCollector.class);
|
private static final Logger LOG = LoggerFactory.getLogger(AuthorizationsCollector.class);
|
||||||
|
|
||||||
private List<Authorization> m_authorizations = new ArrayList();
|
private List<Authorization> m_globalAuthorizations = new ArrayList();
|
||||||
|
private List<Authorization> m_patternAuthorizations = new ArrayList();
|
||||||
|
private Map<String, List<Authorization>> m_userAuthorizations = new HashMap();
|
||||||
|
private boolean m_parsingUsersSpecificSection = false;
|
||||||
|
private String m_currentUser = "";
|
||||||
|
|
||||||
static final AuthorizationsCollector emptyImmutableCollector() {
|
static final AuthorizationsCollector emptyImmutableCollector() {
|
||||||
AuthorizationsCollector coll = new AuthorizationsCollector();
|
AuthorizationsCollector coll = new AuthorizationsCollector();
|
||||||
coll.m_authorizations = Collections.emptyList();
|
coll.m_globalAuthorizations = Collections.emptyList();
|
||||||
|
coll.m_patternAuthorizations = Collections.emptyList();
|
||||||
|
coll.m_userAuthorizations = Collections.emptyMap();
|
||||||
return coll;
|
return coll;
|
||||||
}
|
}
|
||||||
|
|
||||||
void parse(String line) throws ParseException {
|
void parse(String line) throws ParseException {
|
||||||
m_authorizations.add(parseAuthLine(line));
|
Authorization acl = parseAuthLine(line);
|
||||||
|
if (acl == null) {
|
||||||
|
//skip it's a user
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (m_parsingUsersSpecificSection) {
|
||||||
|
//TODO in java 8 switch to m_userAuthorizations.putIfAbsent(m_currentUser, new ArrayList());
|
||||||
|
if (!m_userAuthorizations.containsKey(m_currentUser)) {
|
||||||
|
m_userAuthorizations.put(m_currentUser, new ArrayList());
|
||||||
|
}
|
||||||
|
List<Authorization> userAuths = m_userAuthorizations.get(m_currentUser);
|
||||||
|
userAuths.add(acl);
|
||||||
|
} else {
|
||||||
|
m_globalAuthorizations.add(acl);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static Authorization parseAuthLine(String line) throws ParseException {
|
protected Authorization parseAuthLine(String line) throws ParseException {
|
||||||
String[] tokens = line.split("\\s+");
|
String[] tokens = line.split("\\s+");
|
||||||
String keyword = tokens[0];
|
String keyword = tokens[0].toLowerCase();
|
||||||
if ("topic".equalsIgnoreCase(keyword)) {
|
switch (keyword) {
|
||||||
if (tokens.length > 2) {
|
case "topic":
|
||||||
//if the tokenized lines has 3 token the second must be the permission
|
if (tokens.length > 2) {
|
||||||
try {
|
//if the tokenized lines has 3 token the second must be the permission
|
||||||
Authorization.Permission permission = Authorization.Permission.valueOf(tokens[1].toUpperCase());
|
try {
|
||||||
//bring topic with all original spacing
|
Authorization.Permission permission = Authorization.Permission.valueOf(tokens[1].toUpperCase());
|
||||||
String topic = line.substring(line.indexOf(tokens[2]));
|
//bring topic with all original spacing
|
||||||
|
String topic = line.substring(line.indexOf(tokens[2]));
|
||||||
|
|
||||||
return new Authorization(topic, permission);
|
return new Authorization(topic, permission);
|
||||||
} catch (IllegalArgumentException iaex) {
|
} catch (IllegalArgumentException iaex) {
|
||||||
throw new ParseException("invalid permission token", 1);
|
throw new ParseException("invalid permission token", 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
String topic = tokens[1];
|
||||||
|
return new Authorization(topic);
|
||||||
|
case "user":
|
||||||
|
m_parsingUsersSpecificSection = true;
|
||||||
|
m_currentUser = tokens[1];
|
||||||
|
return null;
|
||||||
|
case "pattern":
|
||||||
|
//TODO implement the part for patter matching
|
||||||
|
return null;
|
||||||
|
default:
|
||||||
|
throw new ParseException(String.format("invalid line definition found %s", line), 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canWrite(String topic, String user) {
|
||||||
|
return canDoOperation(topic, WRITE, user);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canRead(String topic, String user) {
|
||||||
|
return canDoOperation(topic, READ, user);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean canDoOperation(String topic, Authorization.Permission permission, String username) {
|
||||||
|
if (username == null || username.isEmpty()) {
|
||||||
|
for (Authorization auth : m_globalAuthorizations) {
|
||||||
|
if (auth.permission == permission || auth.permission == READWRITE) {
|
||||||
|
if (SubscriptionsStore.matchTopics(topic, auth.topic)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
String topic = tokens[1];
|
} else if (m_userAuthorizations.containsKey(username)) {
|
||||||
return new Authorization(topic);
|
for (Authorization auth : m_userAuthorizations.get(username)) {
|
||||||
}
|
if (auth.permission == permission || auth.permission == READWRITE) {
|
||||||
return null;
|
if (SubscriptionsStore.matchTopics(topic, auth.topic)) {
|
||||||
}
|
return true;
|
||||||
|
}
|
||||||
@Override
|
|
||||||
public boolean canWrite(String topic) {
|
|
||||||
return canDoOperation(topic, WRITE);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean canRead(String topic) {
|
|
||||||
return canDoOperation(topic, READ);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean canDoOperation(String topic, Authorization.Permission permission) {
|
|
||||||
for (Authorization auth : m_authorizations) {
|
|
||||||
if (auth.permission == permission || auth.permission == READWRITE) {
|
|
||||||
if (SubscriptionsStore.matchTopics(topic, auth.topic)) {
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -96,6 +133,6 @@ class AuthorizationsCollector implements IAuthorizator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEmpty() {
|
public boolean isEmpty() {
|
||||||
return m_authorizations.isEmpty();
|
return m_globalAuthorizations.isEmpty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -20,12 +20,12 @@ package org.eclipse.moquette.spi.impl.security;
|
|||||||
*/
|
*/
|
||||||
public class DenyAllAuthorizator implements IAuthorizator {
|
public class DenyAllAuthorizator implements IAuthorizator {
|
||||||
@Override
|
@Override
|
||||||
public boolean canWrite(String topic) {
|
public boolean canWrite(String topic, String user) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canRead(String topic) {
|
public boolean canRead(String topic, String user) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,7 +29,7 @@ public interface IAuthorizator {
|
|||||||
/**
|
/**
|
||||||
* Ask the implementation of the authorizator if the topic can be used in a publish.
|
* Ask the implementation of the authorizator if the topic can be used in a publish.
|
||||||
* */
|
* */
|
||||||
boolean canWrite(String topic);
|
boolean canWrite(String topic, String user);
|
||||||
|
|
||||||
boolean canRead(String topic);
|
boolean canRead(String topic, String user);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -20,12 +20,12 @@ package org.eclipse.moquette.spi.impl.security;
|
|||||||
*/
|
*/
|
||||||
public class PermitAllAuthorizator implements IAuthorizator {
|
public class PermitAllAuthorizator implements IAuthorizator {
|
||||||
@Override
|
@Override
|
||||||
public boolean canWrite(String topic) {
|
public boolean canWrite(String topic, String user) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canRead(String topic) {
|
public boolean canRead(String topic, String user) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Properties;
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
import java.util.concurrent.CountDownLatch;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ public class ProtocolProcessorTest {
|
|||||||
throw new AssertionError("Wrong return code");
|
throw new AssertionError("Wrong return code");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This a synchronous channel that avoid output ring buffer from Processor
|
* This a synchronous channel that avoid output ring buffer from Processor
|
||||||
@@ -141,7 +141,7 @@ public class ProtocolProcessorTest {
|
|||||||
throw new AssertionError("Wrong return code");
|
throw new AssertionError("Wrong return code");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() throws InterruptedException {
|
public void setUp() throws InterruptedException {
|
||||||
|
|||||||
@@ -20,8 +20,6 @@ import org.junit.Test;
|
|||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
import java.io.StringReader;
|
import java.io.StringReader;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.util.List;
|
|
||||||
import static org.eclipse.moquette.spi.impl.security.Authorization.*;
|
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
@@ -60,8 +58,8 @@ public class ACLFileParserTest {
|
|||||||
AuthorizationsCollector authorizations = ACLFileParser.parse(conf);
|
AuthorizationsCollector authorizations = ACLFileParser.parse(conf);
|
||||||
|
|
||||||
//Verify
|
//Verify
|
||||||
assertTrue(authorizations.canRead("/weather/italy/anemometer"));
|
assertTrue(authorizations.canRead("/weather/italy/anemometer", ""));
|
||||||
assertTrue(authorizations.canWrite("/weather/italy/anemometer"));
|
assertTrue(authorizations.canWrite("/weather/italy/anemometer", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+22
-13
@@ -20,7 +20,6 @@ import org.junit.Test;
|
|||||||
|
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
|
|
||||||
import static org.eclipse.moquette.spi.impl.security.AuthorizationsCollector.*;
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -41,7 +40,7 @@ public class AuthorizationsCollectorTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testParseAuthLineValid() throws ParseException {
|
public void testParseAuthLineValid() throws ParseException {
|
||||||
Authorization authorization = parseAuthLine("topic /weather/italy/anemometer");
|
Authorization authorization = authorizator.parseAuthLine("topic /weather/italy/anemometer");
|
||||||
|
|
||||||
//Verify
|
//Verify
|
||||||
assertEquals(RW_ANEMOMETER, authorization);
|
assertEquals(RW_ANEMOMETER, authorization);
|
||||||
@@ -49,7 +48,7 @@ public class AuthorizationsCollectorTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testParseAuthLineValid_read() throws ParseException {
|
public void testParseAuthLineValid_read() throws ParseException {
|
||||||
Authorization authorization = parseAuthLine("topic read /weather/italy/anemometer");
|
Authorization authorization = authorizator.parseAuthLine("topic read /weather/italy/anemometer");
|
||||||
|
|
||||||
//Verify
|
//Verify
|
||||||
assertEquals(R_ANEMOMETER, authorization);
|
assertEquals(R_ANEMOMETER, authorization);
|
||||||
@@ -57,7 +56,7 @@ public class AuthorizationsCollectorTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testParseAuthLineValid_write() throws ParseException {
|
public void testParseAuthLineValid_write() throws ParseException {
|
||||||
Authorization authorization = parseAuthLine("topic write /weather/italy/anemometer");
|
Authorization authorization = authorizator.parseAuthLine("topic write /weather/italy/anemometer");
|
||||||
|
|
||||||
//Verify
|
//Verify
|
||||||
assertEquals(W_ANEMOMETER, authorization);
|
assertEquals(W_ANEMOMETER, authorization);
|
||||||
@@ -65,7 +64,7 @@ public class AuthorizationsCollectorTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testParseAuthLineValid_readwrite() throws ParseException {
|
public void testParseAuthLineValid_readwrite() throws ParseException {
|
||||||
Authorization authorization = parseAuthLine("topic readwrite /weather/italy/anemometer");
|
Authorization authorization = authorizator.parseAuthLine("topic readwrite /weather/italy/anemometer");
|
||||||
|
|
||||||
//Verify
|
//Verify
|
||||||
assertEquals(RW_ANEMOMETER, authorization);
|
assertEquals(RW_ANEMOMETER, authorization);
|
||||||
@@ -75,7 +74,7 @@ public class AuthorizationsCollectorTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testParseAuthLineValid_topic_with_space() throws ParseException {
|
public void testParseAuthLineValid_topic_with_space() throws ParseException {
|
||||||
Authorization expected = new Authorization("/weather/eastern italy/anemometer");
|
Authorization expected = new Authorization("/weather/eastern italy/anemometer");
|
||||||
Authorization authorization = parseAuthLine("topic readwrite /weather/eastern italy/anemometer");
|
Authorization authorization = authorizator.parseAuthLine("topic readwrite /weather/eastern italy/anemometer");
|
||||||
|
|
||||||
//Verify
|
//Verify
|
||||||
assertEquals(expected, authorization);
|
assertEquals(expected, authorization);
|
||||||
@@ -83,7 +82,7 @@ public class AuthorizationsCollectorTest {
|
|||||||
|
|
||||||
@Test(expected = ParseException.class)
|
@Test(expected = ParseException.class)
|
||||||
public void testParseAuthLineValid_invalid() throws ParseException {
|
public void testParseAuthLineValid_invalid() throws ParseException {
|
||||||
parseAuthLine("topic faker /weather/italy/anemometer");
|
authorizator.parseAuthLine("topic faker /weather/italy/anemometer");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -91,7 +90,7 @@ public class AuthorizationsCollectorTest {
|
|||||||
authorizator.parse("topic write /sensors");
|
authorizator.parse("topic write /sensors");
|
||||||
|
|
||||||
//verify
|
//verify
|
||||||
assertTrue(authorizator.canWrite("/sensors"));
|
assertTrue(authorizator.canWrite("/sensors", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -99,7 +98,7 @@ public class AuthorizationsCollectorTest {
|
|||||||
authorizator.parse("topic read /sensors");
|
authorizator.parse("topic read /sensors");
|
||||||
|
|
||||||
//verify
|
//verify
|
||||||
assertTrue(authorizator.canRead("/sensors"));
|
assertTrue(authorizator.canRead("/sensors", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -108,8 +107,8 @@ public class AuthorizationsCollectorTest {
|
|||||||
authorizator.parse("topic read /sensors/anemometer");
|
authorizator.parse("topic read /sensors/anemometer");
|
||||||
|
|
||||||
//verify
|
//verify
|
||||||
assertTrue(authorizator.canWrite("/sensors"));
|
assertTrue(authorizator.canWrite("/sensors", ""));
|
||||||
assertFalse(authorizator.canRead("/sensors"));
|
assertFalse(authorizator.canRead("/sensors", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -117,7 +116,7 @@ public class AuthorizationsCollectorTest {
|
|||||||
authorizator.parse("topic write /sensors/#");
|
authorizator.parse("topic write /sensors/#");
|
||||||
|
|
||||||
//verify
|
//verify
|
||||||
assertTrue(authorizator.canWrite("/sensors/anemometer/wind"));
|
assertTrue(authorizator.canWrite("/sensors/anemometer/wind", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -125,6 +124,16 @@ public class AuthorizationsCollectorTest {
|
|||||||
authorizator.parse("topic write /sensors/+");
|
authorizator.parse("topic write /sensors/+");
|
||||||
|
|
||||||
//verify
|
//verify
|
||||||
assertTrue(authorizator.canWrite("/sensors/anemometer"));
|
assertTrue(authorizator.canWrite("/sensors/anemometer", ""));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCanWriteUserTopic() throws ParseException {
|
||||||
|
authorizator.parse("user john");
|
||||||
|
authorizator.parse("topic write /sensors");
|
||||||
|
|
||||||
|
//verify
|
||||||
|
assertTrue(authorizator.canWrite("/sensors", "john"));
|
||||||
|
assertFalse(authorizator.canWrite("/sensors", "jack"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user