Add clientID parameter to the IAuthenticator interface (breaks compatibility).
This commit is contained in:
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* Class responsible to handle the logic of MQTT protocol it's the director of
|
||||
* the protocol execution.
|
||||
* the protocol execution.
|
||||
*
|
||||
* Used by the front facing class SimpleMessaging.
|
||||
*
|
||||
@@ -167,7 +167,7 @@ public class ProtocolProcessor {
|
||||
failedCredentials(channel);
|
||||
return;
|
||||
}
|
||||
if (!m_authenticator.checkValid(msg.getUsername(), pwd)) {
|
||||
if (!m_authenticator.checkValid(msg.getClientID(), msg.getUsername(), pwd)) {
|
||||
failedCredentials(channel);
|
||||
channel.close();
|
||||
return;
|
||||
|
||||
@@ -6,7 +6,7 @@ import io.moquette.spi.security.IAuthenticator;
|
||||
* Created by andrea on 8/23/14.
|
||||
*/
|
||||
public class AcceptAllAuthenticator implements IAuthenticator {
|
||||
public boolean checkValid(String username, byte[] password) {
|
||||
public boolean checkValid(String clientId, String username, byte[] password) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ public class DBAuthenticator implements IAuthenticator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized boolean checkValid(String username, byte[] password) {
|
||||
public synchronized boolean checkValid(String clientId, String username, byte[] password) {
|
||||
// Check Username / Password in DB using sqlQuery
|
||||
if (username == null || password == null) {
|
||||
LOG.info("username or password was null");
|
||||
|
||||
@@ -106,8 +106,9 @@ public class FileAuthenticator implements IAuthenticator {
|
||||
throw new ParseException("Failed to read", 1);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean checkValid(String username, byte[] password) {
|
||||
|
||||
@Override
|
||||
public boolean checkValid(String clientId, String username, byte[] password) {
|
||||
if (username == null || password == null) {
|
||||
LOG.info("username or password was null");
|
||||
return false;
|
||||
|
||||
@@ -22,5 +22,5 @@ package io.moquette.spi.security;
|
||||
*/
|
||||
public interface IAuthenticator {
|
||||
|
||||
boolean checkValid(String username, byte[] password);
|
||||
boolean checkValid(String clientId, String username, byte[] password);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user