From 47fd0cb0fb73d12e903a3eddfea5632103bcce62 Mon Sep 17 00:00:00 2001 From: samo_lego <34912839+samolego@users.noreply.github.com> Date: Tue, 19 Nov 2019 22:22:20 +0100 Subject: [PATCH] The actual cleanup Removed commented old code --- .../simpleauth/commands/AuthCommand.java | 19 +------------- .../simpleauth/commands/ChangepwCommand.java | 20 --------------- .../simpleauth/commands/LoginCommand.java | 21 ---------------- .../simpleauth/commands/RegisterCommand.java | 25 ------------------- .../commands/UnregisterCommand.java | 21 ---------------- 5 files changed, 1 insertion(+), 105 deletions(-) diff --git a/src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java b/src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java index e851462..899b776 100644 --- a/src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java +++ b/src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java @@ -95,25 +95,8 @@ public class AuthCommand { sender.sendMessage(userdataUpdated); else LOGGER.info(userdataUpdated); - /*// Create instance - Argon2 argon2 = Argon2Factory.create(); - char[] password = pass.toCharArray(); - try { - // Hashed password from DB - String hash = argon2.hash(10, 65536, 1, pass.toCharArray()); - - // Writing into DB - SimpleAuth.db.update(uuid, username, hash); - if(sender != null) - sender.sendMessage(userdataUpdated); - else - LOGGER.info(userdataUpdated); - } finally { - // Wipe confidential data - argon2.wipeArray(password); - }*/ // TODO -> Kick player whose name was changed? - return 1; // Success + return 1; } private static int removeAccount(ServerCommandSource source, String uuid, String username) { Entity sender = source.getEntity(); diff --git a/src/main/java/org/samo_lego/simpleauth/commands/ChangepwCommand.java b/src/main/java/org/samo_lego/simpleauth/commands/ChangepwCommand.java index 9b408a2..4e1f2c5 100644 --- a/src/main/java/org/samo_lego/simpleauth/commands/ChangepwCommand.java +++ b/src/main/java/org/samo_lego/simpleauth/commands/ChangepwCommand.java @@ -61,25 +61,5 @@ public class ChangepwCommand { } player.sendMessage(wrongPassword); return 0; - - // Create instance - //Argon2 argon2 = Argon2Factory.create(); - /*try { - // Hashed password from DB - String hashedOld = SimpleAuth.db.getPassword(player.getUuidAsString()); - - // Verify password - if (argon2.verify(hashedOld, password)) { - String hash = argon2.hash(10, 65536, 1, newPass.toCharArray()); - // Writing into DB - SimpleAuth.db.update(player.getUuidAsString(), null, hash); - player.sendMessage(passwordUpdated); - } - else - player.sendMessage(wrongPassword); - } finally { - // Wipe confidential data - argon2.wipeArray(password); - }*/ } } diff --git a/src/main/java/org/samo_lego/simpleauth/commands/LoginCommand.java b/src/main/java/org/samo_lego/simpleauth/commands/LoginCommand.java index 6565c63..8455c63 100644 --- a/src/main/java/org/samo_lego/simpleauth/commands/LoginCommand.java +++ b/src/main/java/org/samo_lego/simpleauth/commands/LoginCommand.java @@ -51,26 +51,5 @@ public class LoginCommand { } player.sendMessage(wrongPassword); return 0; - /*// Create instance - Argon2 argon2 = Argon2Factory.create(); - // Read password from user - char[] password = pass.toCharArray(); - - try { - // Hashed password from DB - String hashed = SimpleAuth.db.getPassword(player.getUuidAsString()); - - // Verify password - if (argon2.verify(hashed, password)) { - SimpleAuth.authenticatedUsers.add(player); - player.sendMessage(text); - } else { - player.sendMessage(wrongPassword); - } - } finally { - // Wipe confidential data - argon2.wipeArray(password); - } - return 1;*/ } } diff --git a/src/main/java/org/samo_lego/simpleauth/commands/RegisterCommand.java b/src/main/java/org/samo_lego/simpleauth/commands/RegisterCommand.java index d129503..bedc420 100644 --- a/src/main/java/org/samo_lego/simpleauth/commands/RegisterCommand.java +++ b/src/main/java/org/samo_lego/simpleauth/commands/RegisterCommand.java @@ -55,31 +55,6 @@ public class RegisterCommand { } player.sendMessage(alreadyRegistered); return 0; - /*// Create instance - Argon2 argon2 = Argon2Factory.create(); - - // Read password from user - char[] password = pass1.toCharArray(); - - try { - // Hash password - String hash = argon2.hash(10, 65536, 1, password); - // Writing into database - if(SimpleAuth.db.registerUser(Objects.requireNonNull(source.getEntity()).getUuidAsString(), source.getName(), hash)) { - SimpleAuth.authenticatedUsers.add(player); - // Letting the player know it was successful - player.sendMessage( - new LiteralText(source.getName() + ", you have registered successfully!") - ); - } - else - player.sendMessage(alreadyRegistered); - } catch (Error e) { - player.sendMessage(alreadyRegistered); - } finally { - // Wipe confidential data - argon2.wipeArray(password); - }*/ } player.sendMessage( new LiteralText(source.getName() + ", passwords must match!") diff --git a/src/main/java/org/samo_lego/simpleauth/commands/UnregisterCommand.java b/src/main/java/org/samo_lego/simpleauth/commands/UnregisterCommand.java index ac57887..271816a 100644 --- a/src/main/java/org/samo_lego/simpleauth/commands/UnregisterCommand.java +++ b/src/main/java/org/samo_lego/simpleauth/commands/UnregisterCommand.java @@ -41,27 +41,6 @@ public class UnregisterCommand { // TODO // Getting the player who send the command ServerPlayerEntity player = source.getPlayer(); - // Create instance - Argon2 argon2 = Argon2Factory.create(); - // Read password from user - char[] password = pass.toCharArray(); - - try { - // Hashed password from DB - String hashedOld = SimpleAuth.db.getPassword(player.getUuidAsString()); - - // Verify password - if (argon2.verify(hashedOld, password)) { - // Writing into DB - SimpleAuth.db.delete(player.getUuidAsString(), null); - player.sendMessage(accountDeleted); - } - else - player.sendMessage(wrongPassword); - } finally { - // Wipe confidential data - argon2.wipeArray(password); - } return 1; } }