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

broker/ResourceAuthenticator: code formatter used

Browse Source
This commit is contained in:
Andreas Mager
2017-02-01 17:13:40 +01:00
parent 92f4492fc3
commit 3bbec46585
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/spi/impl/security/ResourceAuthenticator.java
+22 -20
View File
@@ -13,6 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.spi.impl.security;
import io.moquette.server.config.IResourceLoader;
@@ -20,7 +21,6 @@ import io.moquette.spi.security.IAuthenticator;
import org.apache.commons.codec.digest.DigestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
@@ -31,14 +31,17 @@ import java.util.HashMap;
import java.util.Map;
/**
* Load user credentials from a text resource.
* Each line of the file is formatted as "[username]:[sha256(password)]". The username mustn't contains : char.
* Load user credentials from a text resource. Each line of the file is formatted as
* "[username]:[sha256(password)]". The username mustn't contains : char.
*
* To encode your password from command line on Linux systems, you could use:
*
* <pre>
* echo -n "yourpassword" | sha256sum
* </pre>
* NB -n is important because echo append a newline by default at the of string. -n avoid this behaviour.
*
* NB -n is important because echo append a newline by default at the of string. -n avoid this
* behaviour.
*
* @author andrea
*/
@@ -63,24 +66,23 @@ public class ResourceAuthenticator implements IAuthenticator {
reader = resourceLoader.loadResource(resourceName);
if (reader == null) {
LOG.warn(String.format("Parsing not existing %s %s", resourceLoader.getName(), resourceName));
}
else {
} else {
parse(reader);
}
}
catch (IResourceLoader.ResourceIsDirectoryException e) {
} catch (IResourceLoader.ResourceIsDirectoryException e) {
LOG.warn(String.format("Trying to parse directory %s", resourceName));
}
catch (ParseException pex) {
LOG.warn(String.format("Format error in parsing password %s %s", resourceLoader.getName(), resourceName), pex);
} catch (ParseException pex) {
LOG.warn(
String.format("Format error in parsing password %s %s", resourceLoader.getName(), resourceName),
pex);
}
}
private void parse(Reader reader) throws ParseException {
if (reader == null) {
return;
}
BufferedReader br = new BufferedReader(reader);
String line;
try {
@@ -88,23 +90,23 @@ public class ResourceAuthenticator implements IAuthenticator {
int commentMarker = line.indexOf('#');
if (commentMarker != -1) {
if (commentMarker == 0) {
//skip its a comment
// skip its a comment
continue;
} else {
//it's a malformed comment
// it's a malformed comment
throw new ParseException(line, commentMarker);
}
} else {
if (line.isEmpty() || line.matches("^\\s*$")) {
//skip it's a black line
// skip it's a black line
continue;
}
//split till the first space
// split till the first space
int delimiterIdx = line.indexOf(':');
String username = line.substring(0, delimiterIdx).trim();
String password = line.substring(delimiterIdx + 1).trim();
m_identities.put(username, password);
}
}
@@ -126,5 +128,5 @@ public class ResourceAuthenticator implements IAuthenticator {
String encodedPasswd = DigestUtils.sha256Hex(password);
return foundPwq.equals(encodedPasswd);
}
}