#358 Make RandomString static & generate all rand. strings with it

- Remove dubious random String generator on HashUtils
- Make further hash classes use HashUtils

src/main/java/fr/xephi/authme/security/crypts/CryptPBKDF2Django.java

@@ -1,6 +1,6 @@
 package fr.xephi.authme.security.crypts;
 
-import fr.xephi.authme.security.HashUtils;
+import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.security.crypts.description.HasSalt;
 import fr.xephi.authme.security.crypts.description.Recommendation;
 import fr.xephi.authme.security.crypts.description.SaltType;
@@ -10,7 +10,7 @@ import fr.xephi.authme.security.pbkdf2.PBKDF2Parameters;
 
 import javax.xml.bind.DatatypeConverter;
 
-@Recommendation(Usage.OK)
+@Recommendation(Usage.ACCEPTABLE)
 @HasSalt(value = SaltType.TEXT, length = 12)
 public class CryptPBKDF2Django implements EncryptionMethod {
 
@@ -38,7 +38,7 @@ public class CryptPBKDF2Django implements EncryptionMethod {
     }
 
     public String generateSalt() {
-        return HashUtils.generateSalt(12);
+        return RandomString.generateHex(12);
     }
 
 }

src/main/java/fr/xephi/authme/security/crypts/JOOMLA.java

@@ -1,12 +1,13 @@
 package fr.xephi.authme.security.crypts;
 
 import fr.xephi.authme.security.HashUtils;
+import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.security.crypts.description.HasSalt;
 import fr.xephi.authme.security.crypts.description.Recommendation;
 import fr.xephi.authme.security.crypts.description.SaltType;
 import fr.xephi.authme.security.crypts.description.Usage;
 
-@Recommendation(Usage.OK)
+@Recommendation(Usage.ACCEPTABLE)
 @HasSalt(value = SaltType.TEXT, length = 32)
 public class JOOMLA implements EncryptionMethod {
 
@@ -20,7 +21,7 @@ public class JOOMLA implements EncryptionMethod {
     }
 
     public String generateSalt() {
-        return HashUtils.generateSalt(32);
+        return RandomString.generateHex(32);
     }
 
     @Override

src/main/java/fr/xephi/authme/security/crypts/MD5VB.java

@@ -1,6 +1,6 @@
 package fr.xephi.authme.security.crypts;
 
-import fr.xephi.authme.security.HashUtils;
+import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.security.crypts.description.HasSalt;
 import fr.xephi.authme.security.crypts.description.Recommendation;
 import fr.xephi.authme.security.crypts.description.SaltType;
@@ -8,7 +8,7 @@ import fr.xephi.authme.security.crypts.description.Usage;
 
 import static fr.xephi.authme.security.HashUtils.md5;
 
-@Recommendation(Usage.OK)
+@Recommendation(Usage.ACCEPTABLE)
 @HasSalt(value = SaltType.TEXT, length = 16)
 public class MD5VB implements EncryptionMethod {
 
@@ -28,7 +28,7 @@ public class MD5VB implements EncryptionMethod {
     }
 
     public String generateSalt() {
-        return HashUtils.generateSalt(16);
+        return RandomString.generateHex(16);
     }
 
 }

src/main/java/fr/xephi/authme/security/crypts/SHA256.java

@@ -1,33 +1,34 @@
 package fr.xephi.authme.security.crypts;
 
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import fr.xephi.authme.security.RandomString;
+import fr.xephi.authme.security.crypts.description.HasSalt;
+import fr.xephi.authme.security.crypts.description.Recommendation;
+import fr.xephi.authme.security.crypts.description.SaltType;
+import fr.xephi.authme.security.crypts.description.Usage;
 
-/**
- */
+import static fr.xephi.authme.security.HashUtils.sha256;
+
+@Recommendation(Usage.RECOMMENDED)
+@HasSalt(value = SaltType.TEXT, length = 16)
 public class SHA256 implements EncryptionMethod {
 
-    private static String getSHA256(String message)
-        throws NoSuchAlgorithmException {
-        MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
-        sha256.reset();
-        sha256.update(message.getBytes());
-        byte[] digest = sha256.digest();
-        return String.format("%0" + (digest.length << 1) + "x", new BigInteger(1, digest));
+    @Override
+    public String computeHash(String password, String salt, String name) {
+        return "$SHA$" + salt + "$" + sha256(sha256(password) + salt);
+    }
+
+    public String computeHash(String password, String name) {
+        return computeHash(password, generateSalt(), name);
     }
 
     @Override
-    public String computeHash(String password, String salt, String name)
-        throws NoSuchAlgorithmException {
-        return "$SHA$" + salt + "$" + getSHA256(getSHA256(password) + salt);
-    }
-
-    @Override
-    public boolean comparePassword(String hash, String password,
-                                   String playerName) throws NoSuchAlgorithmException {
+    public boolean comparePassword(String hash, String password, String playerName) {
         String[] line = hash.split("\\$");
-        return hash.equals(computeHash(password, line[2], ""));
+        return line.length == 4 && hash.equals(computeHash(password, line[2], ""));
+    }
+
+    public String generateSalt() {
+        return RandomString.generateHex(16);
     }
 
 }

src/main/java/fr/xephi/authme/security/crypts/SHA512.java

@@ -1,31 +1,30 @@
 package fr.xephi.authme.security.crypts;
 
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import fr.xephi.authme.security.HashUtils;
+import fr.xephi.authme.security.crypts.description.HasSalt;
+import fr.xephi.authme.security.crypts.description.Recommendation;
+import fr.xephi.authme.security.crypts.description.SaltType;
+import fr.xephi.authme.security.crypts.description.Usage;
 
-/**
- */
+@Recommendation(Usage.DO_NOT_USE)
+@HasSalt(SaltType.NONE)
 public class SHA512 implements EncryptionMethod {
 
-    private static String getSHA512(String message)
-        throws NoSuchAlgorithmException {
-        MessageDigest sha512 = MessageDigest.getInstance("SHA-512");
-        sha512.reset();
-        sha512.update(message.getBytes());
-        byte[] digest = sha512.digest();
-        return String.format("%0" + (digest.length << 1) + "x", new BigInteger(1, digest));
+    @Override
+    public String computeHash(String password, String salt, String name) {
+        return computeHash(password, name);
+    }
+
+    public String computeHash(String password, String name) {
+        return HashUtils.sha512(password);
     }
 
     @Override
-    public String computeHash(String password, String salt, String name)
-        throws NoSuchAlgorithmException {
-        return getSHA512(password);
-    }
-
-    @Override
-    public boolean comparePassword(String hash, String password,
-                                   String playerName) throws NoSuchAlgorithmException {
+    public boolean comparePassword(String hash, String password, String playerName) {
         return hash.equals(computeHash(password, "", ""));
     }
+
+    public String generateSalt() {
+        return null;
+    }
 }

src/main/java/fr/xephi/authme/security/crypts/SMF.java

@@ -1,31 +1,30 @@
 package fr.xephi.authme.security.crypts;
 
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import fr.xephi.authme.security.HashUtils;
+import fr.xephi.authme.security.crypts.description.HasSalt;
+import fr.xephi.authme.security.crypts.description.Recommendation;
+import fr.xephi.authme.security.crypts.description.SaltType;
+import fr.xephi.authme.security.crypts.description.Usage;
 
-/**
- */
+@Recommendation(Usage.DO_NOT_USE)
+@HasSalt(SaltType.USERNAME)
 public class SMF implements EncryptionMethod {
 
-    private static String getSHA1(String message)
-        throws NoSuchAlgorithmException {
-        MessageDigest sha1 = MessageDigest.getInstance("SHA1");
-        sha1.reset();
-        sha1.update(message.getBytes());
-        byte[] digest = sha1.digest();
-        return String.format("%0" + (digest.length << 1) + "x", new BigInteger(1, digest));
+    @Override
+    public String computeHash(String password, String salt, String name) {
+        return computeHash(password, name);
+    }
+
+    public String computeHash(String password, String name) {
+        return HashUtils.sha1(name.toLowerCase() + password);
     }
 
     @Override
-    public String computeHash(String password, String salt, String name)
-        throws NoSuchAlgorithmException {
-        return getSHA1(name.toLowerCase() + password);
+    public boolean comparePassword(String hash, String password, String playerName) {
+        return hash.equals(computeHash(password, playerName));
     }
 
-    @Override
-    public boolean comparePassword(String hash, String password,
-                                   String playerName) throws NoSuchAlgorithmException {
-        return hash.equals(computeHash(password, null, playerName));
+    public String generateSalt() {
+        return null;
     }
 }

src/main/java/fr/xephi/authme/security/crypts/WORDPRESS.java

@@ -11,7 +11,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Arrays;
 
-@Recommendation(Usage.OK)
+@Recommendation(Usage.ACCEPTABLE)
 @HasSalt(value = SaltType.TEXT, length = 9)
 public class WORDPRESS implements EncryptionMethod {
 

src/main/java/fr/xephi/authme/security/crypts/XAUTH.java

@@ -1,6 +1,6 @@
 package fr.xephi.authme.security.crypts;
 
-import fr.xephi.authme.security.HashUtils;
+import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.security.crypts.description.HasSalt;
 import fr.xephi.authme.security.crypts.description.Recommendation;
 import fr.xephi.authme.security.crypts.description.SaltType;
@@ -38,7 +38,7 @@ public class XAUTH implements EncryptionMethod {
     }
 
     public String generateSalt() {
-        return HashUtils.generateSalt(12);
+        return RandomString.generateHex(12);
     }
 
 }

src/main/java/fr/xephi/authme/security/crypts/description/HasSalt.java

@@ -1,13 +1,22 @@
 package fr.xephi.authme.security.crypts.description;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 /**
  * Describes the type of salt the encryption algorithm uses. This is purely for documentation
  * purposes and is ignored by the code.
  */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
 public @interface HasSalt {
 
+    /** The type of the salt. */
     SaltType value();
 
+    /** For text salts, the length of the salt. */
     int length() default 0;
 
 }

src/main/java/fr/xephi/authme/security/crypts/description/Recommendation.java

@@ -1,10 +1,18 @@
 package fr.xephi.authme.security.crypts.description;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 /**
  * Annotation to mark a hash algorithm with the usage recommendation, see {@link Usage}.
  */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
 public @interface Recommendation {
 
+    /** The recommendation for using the hash algorithm. */
     Usage value();
 
 }

src/main/java/fr/xephi/authme/security/crypts/description/SaltType.java

@@ -8,7 +8,7 @@ public enum SaltType {
     /** Random, newly generated text. */
     TEXT,
 
-    /** The username, including variations or repetitions. */
+    /** Salt is based on the username, including variations and repetitions. */
     USERNAME,
 
     /** No salt. */

src/main/java/fr/xephi/authme/security/crypts/description/Usage.java

@@ -9,7 +9,7 @@ public enum Usage {
     RECOMMENDED,
 
     /** There are safer algorithms that can be chosen but using the algorithm is generally OK. */
-    OK,
+    ACCEPTABLE,
 
     /** Hash algorithm is not recommended to be used. Use only if required by another system. */
     DO_NOT_USE,