From 2257ae6919c170d73a3f3804b169d51ffc5f68fa Mon Sep 17 00:00:00 2001 From: Andreas Mager Date: Wed, 1 Feb 2017 16:02:46 +0100 Subject: [PATCH] broker/DBAuthenticator: code formatter used --- .../spi/impl/security/DBAuthenticator.java | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/broker/src/main/java/io/moquette/spi/impl/security/DBAuthenticator.java b/broker/src/main/java/io/moquette/spi/impl/security/DBAuthenticator.java index e1cd774f..4e92b68d 100644 --- a/broker/src/main/java/io/moquette/spi/impl/security/DBAuthenticator.java +++ b/broker/src/main/java/io/moquette/spi/impl/security/DBAuthenticator.java @@ -1,3 +1,4 @@ + package io.moquette.spi.impl.security; import io.moquette.BrokerConstants; @@ -6,14 +7,12 @@ import io.moquette.spi.security.IAuthenticator; import org.apache.commons.codec.binary.Hex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.sql.*; /** - * Load user credentials from a SQL database. - * sql driver must be provided at runtime + * Load user credentials from a SQL database. sql driver must be provided at runtime * * @author mackristof */ @@ -25,30 +24,34 @@ public class DBAuthenticator implements IAuthenticator { private final MessageDigest messageDigest; private final PreparedStatement preparedStatement; - - - - public DBAuthenticator(IConfig conf){ - this(conf.getProperty(BrokerConstants.DB_AUTHENTICATOR_DRIVER, ""), - conf.getProperty(BrokerConstants.DB_AUTHENTICATOR_URL,""), - conf.getProperty(BrokerConstants.DB_AUTHENTICATOR_QUERY, ""), - conf.getProperty(BrokerConstants.DB_AUTHENTICATOR_DIGEST,"")); + public DBAuthenticator(IConfig conf) { + this( + conf.getProperty(BrokerConstants.DB_AUTHENTICATOR_DRIVER, ""), + conf.getProperty(BrokerConstants.DB_AUTHENTICATOR_URL, ""), + conf.getProperty(BrokerConstants.DB_AUTHENTICATOR_QUERY, ""), + conf.getProperty(BrokerConstants.DB_AUTHENTICATOR_DIGEST, "")); } - /** provide authenticator from SQL database - * @param driver : jdbc driver class like : "org.postgresql.Driver" - * @param jdbcUrl : jdbc url like : "jdbc:postgresql://host:port/dbname" - * @param sqlQuery : sql query like : "SELECT PASSWORD FROM USER WHERE LOGIN=?" - * @param digestMethod : password encoding algorithm : "MD5", "SHA-1", "SHA-256" + /** + * provide authenticator from SQL database + * + * @param driver + * : jdbc driver class like : "org.postgresql.Driver" + * @param jdbcUrl + * : jdbc url like : "jdbc:postgresql://host:port/dbname" + * @param sqlQuery + * : sql query like : "SELECT PASSWORD FROM USER WHERE LOGIN=?" + * @param digestMethod + * : password encoding algorithm : "MD5", "SHA-1", "SHA-256" */ - public DBAuthenticator(String driver, String jdbcUrl, String sqlQuery, String digestMethod){ + public DBAuthenticator(String driver, String jdbcUrl, String sqlQuery, String digestMethod) { try { Class.forName(driver); final Connection connection = DriverManager.getConnection(jdbcUrl); - this.messageDigest = MessageDigest.getInstance(digestMethod); + this.messageDigest = MessageDigest.getInstance(digestMethod); this.preparedStatement = connection.prepareStatement(sqlQuery); - } catch (ClassNotFoundException cnfe){ + } catch (ClassNotFoundException cnfe) { LOG.error(String.format("Can't find driver %s", driver), cnfe); throw new RuntimeException(cnfe); } catch (SQLException sqle) { @@ -67,11 +70,11 @@ public class DBAuthenticator implements IAuthenticator { LOG.info("username or password was null"); return false; } - ResultSet r= null; + ResultSet r = null; try { - this.preparedStatement.setString(1,username); + this.preparedStatement.setString(1, username); r = this.preparedStatement.executeQuery(); - if(r.next()) { + if (r.next()) { final String foundPwq = r.getString(1); messageDigest.update(password); byte[] digest = messageDigest.digest();