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

broker/Topic: class added

Browse Source 
broker/Topic: String Topics replaced by Topic class
broker/Topic#parseTopic: access set to private
broker/SubscriptionsStoreTest: topic tests moved to own class
broker/TopicTest: containsExactly used
broker/TopicTest: TopicAssert class added
broker/TopicTest$TopicAssert#containsToken: method added
broker/TopicTest$TopicAssert#matches: method added
This commit is contained in:
Andreas Mager
2017-02-19 18:29:37 +01:00
committed by Andi
parent 8688a9d098
commit a2e51b2c31
34 changed files with 589 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/spi/impl/security/Authorization.java
+4 -3
View File
@@ -17,6 +17,7 @@
package io.moquette.spi.impl.security;
import static io.moquette.spi.impl.security.Authorization.Permission.READWRITE;
import io.moquette.spi.impl.subscriptions.Topic;
/**
* Carries the read/write authorization to topics for the users.
@@ -25,7 +26,7 @@ import static io.moquette.spi.impl.security.Authorization.Permission.READWRITE;
*/
public class Authorization {
protected final String topic;
protected final Topic topic;
protected final Permission permission;
/**
@@ -35,11 +36,11 @@ public class Authorization {
READ, WRITE, READWRITE
}
Authorization(String topic) {
Authorization(Topic topic) {
this(topic, Permission.READWRITE);
}
Authorization(String topic, Permission permission) {
Authorization(Topic topic, Permission permission) {
this.topic = topic;
this.permission = permission;
}
broker/src/main/java/io/moquette/spi/impl/security/AuthorizationsCollector.java
+10 -10
View File
@@ -16,7 +16,7 @@
package io.moquette.spi.impl.security;
import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
import io.moquette.spi.impl.subscriptions.Topic;
import io.moquette.spi.security.IAuthorizator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,37 +98,37 @@ class AuthorizationsCollector implements IAuthorizator {
try {
Authorization.Permission permission = Authorization.Permission.valueOf(tokens[1].toUpperCase());
// bring topic with all original spacing
String topic = line.substring(line.indexOf(tokens[2]));
Topic topic = new Topic(line.substring(line.indexOf(tokens[2])));
return new Authorization(topic, permission);
} catch (IllegalArgumentException iaex) {
throw new ParseException("invalid permission token", 1);
}
}
String topic = tokens[1];
Topic topic = new Topic(tokens[1]);
return new Authorization(topic);
}
@Override
public boolean canWrite(String topic, String user, String client) {
public boolean canWrite(Topic topic, String user, String client) {
return canDoOperation(topic, Authorization.Permission.WRITE, user, client);
}
@Override
public boolean canRead(String topic, String user, String client) {
public boolean canRead(Topic topic, String user, String client) {
return canDoOperation(topic, Authorization.Permission.READ, user, client);
}
private boolean canDoOperation(String topic, Authorization.Permission permission, String username, String client) {
private boolean canDoOperation(Topic topic, Authorization.Permission permission, String username, String client) {
if (matchACL(m_globalAuthorizations, topic, permission)) {
return true;
}
if (isNotEmpty(client) || isNotEmpty(username)) {
for (Authorization auth : m_patternAuthorizations) {
String substitutedTopic = auth.topic.replace("%c", client).replace("%u", username);
Topic substitutedTopic = new Topic(auth.topic.toString().replace("%c", client).replace("%u", username));
if (auth.grant(permission)) {
if (SubscriptionsStore.matchTopics(topic, substitutedTopic)) {
if (topic.match(substitutedTopic)) {
return true;
}
}
@@ -146,10 +146,10 @@ class AuthorizationsCollector implements IAuthorizator {
return false;
}
private boolean matchACL(List<Authorization> auths, String topic, Authorization.Permission permission) {
private boolean matchACL(List<Authorization> auths, Topic topic, Authorization.Permission permission) {
for (Authorization auth : auths) {
if (auth.grant(permission)) {
if (SubscriptionsStore.matchTopics(topic, auth.topic)) {
if (topic.match(auth.topic)) {
return true;
}
}
broker/src/main/java/io/moquette/spi/impl/security/DenyAllAuthorizator.java
+3 -2
View File
@@ -16,6 +16,7 @@
package io.moquette.spi.impl.security;
import io.moquette.spi.impl.subscriptions.Topic;
import io.moquette.spi.security.IAuthorizator;
/**
@@ -24,12 +25,12 @@ import io.moquette.spi.security.IAuthorizator;
public class DenyAllAuthorizator implements IAuthorizator {
@Override
public boolean canWrite(String topic, String user, String client) {
public boolean canWrite(Topic topic, String user, String client) {
return true;
}
@Override
public boolean canRead(String topic, String user, String client) {
public boolean canRead(Topic topic, String user, String client) {
return true;
}
}
broker/src/main/java/io/moquette/spi/impl/security/PermitAllAuthorizator.java
+3 -2
View File
@@ -16,6 +16,7 @@
package io.moquette.spi.impl.security;
import io.moquette.spi.impl.subscriptions.Topic;
import io.moquette.spi.security.IAuthorizator;
/**
@@ -24,12 +25,12 @@ import io.moquette.spi.security.IAuthorizator;
public class PermitAllAuthorizator implements IAuthorizator {
@Override
public boolean canWrite(String topic, String user, String client) {
public boolean canWrite(Topic topic, String user, String client) {
return true;
}
@Override
public boolean canRead(String topic, String user, String client) {
public boolean canRead(Topic topic, String user, String client) {
return true;
}
}