From 341623d5e146ce896bdfee7f23e5df94fa3309b7 Mon Sep 17 00:00:00 2001 From: Zach Iverson Date: Sun, 19 Jun 2011 04:42:33 -0400 Subject: [PATCH] 1. Increased salt length to 12 2. Fixed target-related message replacement 3. Added two new message replacement variables --- src/main/java/com/cypherx/xauth/Util.java | 2 +- src/main/java/com/cypherx/xauth/xAuth.java | 2 +- src/main/java/com/cypherx/xauth/xAuthMessages.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cypherx/xauth/Util.java b/src/main/java/com/cypherx/xauth/Util.java index 398f4c0..866cf83 100644 --- a/src/main/java/com/cypherx/xauth/Util.java +++ b/src/main/java/com/cypherx/xauth/Util.java @@ -152,7 +152,7 @@ public class Util { w.NESSIEinit(); w.NESSIEadd(UUID.randomUUID().toString()); w.NESSIEfinalize(digest); - String salt = Whirlpool.display(digest).substring(0, 8); + String salt = Whirlpool.display(digest).substring(0, 12); w.NESSIEinit(); w.NESSIEadd(salt + pass); diff --git a/src/main/java/com/cypherx/xauth/xAuth.java b/src/main/java/com/cypherx/xauth/xAuth.java index 7b2ea6c..6274434 100644 --- a/src/main/java/com/cypherx/xauth/xAuth.java +++ b/src/main/java/com/cypherx/xauth/xAuth.java @@ -242,7 +242,7 @@ public class xAuth extends JavaPlugin { int saltPos = (checkPass.length() >= realPass.length() ? realPass.length() : checkPass.length()); // extract salt - String salt = realPass.substring(saltPos, saltPos + 8); + String salt = realPass.substring(saltPos, saltPos + 12); // encrypt salt + checkPass Whirlpool w = new Whirlpool(); diff --git a/src/main/java/com/cypherx/xauth/xAuthMessages.java b/src/main/java/com/cypherx/xauth/xAuthMessages.java index ddee814..9ed08f0 100644 --- a/src/main/java/com/cypherx/xauth/xAuthMessages.java +++ b/src/main/java/com/cypherx/xauth/xAuthMessages.java @@ -236,12 +236,14 @@ public class xAuthMessages { // target if (target != null) { - message = message.replace("{TARGET}", player.getName()); - message = message.replace("{TARGETIP}", Util.getHostFromPlayer(player)); + message = message.replace("{TARGET}", target.getName()); + message = message.replace("{TARGETIP}", Util.getHostFromPlayer(target)); } // settings message = message.replace("{PWMINLENGTH}", Integer.toString(xAuthSettings.pwMinLength)); + message = message.replace("{NAMEMINLENGTH}", Integer.toString(xAuthSettings.filterMinLength)); + message = message.replace("{MAXSTRIKES}", Integer.toString(xAuthSettings.maxStrikes)); // misc message = message.replace("{NEWLINE}", "\n");