Fixed bug in /changepassword when using FileDataSource

whoami-plugins · Sep 30, 2011 · 4997e70 · 4997e70
1 parent dba26da
commit 4997e70
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/uk/org/whoami/authme/commands/AdminCommand.java b/src/uk/org/whoami/authme/commands/AdminCommand.java
@@ -92,8 +92,17 @@ public boolean onCommand(CommandSender sender, Command cmnd, String label, Strin
                 String name = args[1].toLowerCase();
                 String hash = PasswordSecurity.getHash(settings.getPasswordHash(), args[2]);
 
-                PlayerAuth auth = new PlayerAuth(name, hash, "198.18.0.1", new Date(0));
-
+                PlayerAuth auth = null;
+                if(PlayerCache.getInstance().isAuthenticated(name)) {
+                    auth = PlayerCache.getInstance().getAuth(name);
+                } else if(database.isAuthAvailable(name)) {
+                    auth = database.getAuth(name);
+                } else {
+                    sender.sendMessage(m._("unknown_user"));
+                    return true;
+                }
+                auth.setHash(hash);
+
                 if (!database.updatePassword(auth)) {
                     sender.sendMessage(m._("error"));
                     return true;

diff --git a/src/uk/org/whoami/authme/commands/ChangePasswordCommand.java b/src/uk/org/whoami/authme/commands/ChangePasswordCommand.java
@@ -69,7 +69,8 @@ public boolean onCommand(CommandSender sender, Command cmnd, String label, Strin
             String hashnew = PasswordSecurity.getHash(settings.getPasswordHash(), args[1]);
 
             if (PasswordSecurity.comparePasswordWithHash(args[0], PlayerCache.getInstance().getAuth(name).getHash())) {
-                PlayerAuth auth = new PlayerAuth(name, hashnew, ip, new Date(0));
+                PlayerAuth auth = PlayerCache.getInstance().getAuth(name);
+                auth.setHash(hashnew);
                 if (!database.updatePassword(auth)) {
                     player.sendMessage(m._("error"));
                     return true;

diff --git a/src/uk/org/whoami/authme/datasource/FileDataSource.java b/src/uk/org/whoami/authme/datasource/FileDataSource.java
@@ -107,7 +107,7 @@ public synchronized boolean updatePassword(PlayerAuth auth) {
             while ((line = br.readLine()) != null) {
                 String[] args = line.split(":");
                 if (args[0].equals(auth.getNickname())) {
-                    newAuth = new PlayerAuth(args[0], auth.getHash(), args[2], new Date(Long.parseLong(args[4])));
+                    newAuth = new PlayerAuth(args[0], auth.getHash(), args[2], new Date(Long.parseLong(args[3])));
                     break;
                 }
             }

diff --git a/src/uk/org/whoami/authme/settings/Messages.java b/src/uk/org/whoami/authme/settings/Messages.java
@@ -57,6 +57,7 @@ private void loadDefaults() {
         map.put("reg_voluntarily", "You can register your nickname with the server with the command \"/register password\"");
         map.put("reload", "Configuration and database has been reloaded");
         map.put("error", "An error ocurred; Please contact the admin");
+        map.put("unknown_user", "User is not in database");
     }
 
     private void loadFile() {