From 30564fad6e3e93c36ca165b0a901021a76ba1609 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sat, 1 Aug 2015 02:57:25 +0200 Subject: [PATCH 1/5] nice fail --- src/main/java/fr/xephi/authme/security/crypts/BCRYPT2Y.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT2Y.java b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT2Y.java index ad7eb62ac..2c1ae57a1 100644 --- a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT2Y.java +++ b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT2Y.java @@ -15,7 +15,7 @@ public class BCRYPT2Y implements EncryptionMethod { @Override public boolean comparePassword(String hash, String password, String playerName) throws NoSuchAlgorithmException { - String ok = hash.substring(29); + String ok = hash.substring(0, 29); if (ok.length() != 29) return false; return hash.equals(getHash(password, ok, playerName)); From 0c201019475deedf6009a059efc45199f6026533 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sat, 1 Aug 2015 03:03:54 +0200 Subject: [PATCH 2/5] Bcrypt only support $2a previously --- src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java index 5cfa87f07..847e99518 100644 --- a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java +++ b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java @@ -395,7 +395,7 @@ public class BCRYPT implements EncryptionMethod { off = 3; else { minor = salt.charAt(2); - if (minor != 'a' || salt.charAt(3) != '$') + if (minor < 'a' || minor > 'z' || salt.charAt(3) != '$') throw new IllegalArgumentException("Invalid salt revision"); off = 4; } From 718591782298f0dd987e4c550969ee5801d0be89 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sat, 1 Aug 2015 03:27:16 +0200 Subject: [PATCH 3/5] fix pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27decf8b8..787116a3c 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ 3.5.1 55bab9e8653762002000190a - > + From 1b40907f2976cb06102997f165e9d0fd209306ff Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sat, 1 Aug 2015 03:30:42 +0200 Subject: [PATCH 4/5] Update to Metrics R8-SNAPSHOT --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 787116a3c..a38622dd4 100644 --- a/pom.xml +++ b/pom.xml @@ -110,13 +110,13 @@ - + com.versioneye versioneye-maven-plugin 3.5.1 55bab9e8653762002000190a - + @@ -178,6 +178,11 @@ http://ci.xephi.fr/plugin/repository/everything/ + + mcstats-snapshots + http://repo.mcstats.org/content/repositories/snapshots/ + + @@ -236,7 +241,7 @@ org.mcstats.bukkit metrics - R7 + R8-SNAPSHOT compile From 297b3d161f60b5c9c466dc373e63ff4600230b4f Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sat, 1 Aug 2015 03:45:41 +0200 Subject: [PATCH 5/5] Describe the pom for metrics repo --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index a38622dd4..ba5548893 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,7 @@ http://ci.xephi.fr/plugin/repository/everything/ + mcstats-snapshots http://repo.mcstats.org/content/repositories/snapshots/ @@ -238,6 +239,7 @@ compile + org.mcstats.bukkit metrics