From 9d3726ef00ac093009e7b46fc8cb35943c913a73 Mon Sep 17 00:00:00 2001 From: Sergio Perez Date: Fri, 31 Mar 2023 15:19:32 -0500 Subject: [PATCH 1/3] agregando cmabio char[] a argon2 --- pom.xml | 4 ++-- .../com/cursojava/curso/controllers/UsuarioController.java | 2 +- src/main/java/com/cursojava/curso/dao/UsuarioDaoImp.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ea63de3..d707be8 100644 --- a/pom.xml +++ b/pom.xml @@ -58,14 +58,14 @@ mysql mysql-connector-java - 8.0.19 + 8.0.30 runtime de.mkammerer argon2-jvm - 2.5 + 2.11 diff --git a/src/main/java/com/cursojava/curso/controllers/UsuarioController.java b/src/main/java/com/cursojava/curso/controllers/UsuarioController.java index 3c97249..3dd6d0d 100644 --- a/src/main/java/com/cursojava/curso/controllers/UsuarioController.java +++ b/src/main/java/com/cursojava/curso/controllers/UsuarioController.java @@ -36,7 +36,7 @@ private boolean validarToken(String token) { public void registrarUsuario(@RequestBody Usuario usuario) { Argon2 argon2 = Argon2Factory.create(Argon2Factory.Argon2Types.ARGON2id); - String hash = argon2.hash(1, 1024, 1, usuario.getPassword()); + String hash = argon2.hash(1, 1024, 1, usuario.getPassword().toCharArray()); usuario.setPassword(hash); usuarioDao.registrar(usuario); diff --git a/src/main/java/com/cursojava/curso/dao/UsuarioDaoImp.java b/src/main/java/com/cursojava/curso/dao/UsuarioDaoImp.java index e8f4a13..c7b9289 100644 --- a/src/main/java/com/cursojava/curso/dao/UsuarioDaoImp.java +++ b/src/main/java/com/cursojava/curso/dao/UsuarioDaoImp.java @@ -49,7 +49,7 @@ public Usuario obtenerUsuarioPorCredenciales(Usuario usuario) { String passwordHashed = lista.get(0).getPassword(); Argon2 argon2 = Argon2Factory.create(Argon2Factory.Argon2Types.ARGON2id); - if (argon2.verify(passwordHashed, usuario.getPassword())) { + if (argon2.verify(passwordHashed, usuario.getPassword().toCharArray())) { return lista.get(0); } return null; From 2f9cbb2a57e00444717bb4808d04a9895327c538 Mon Sep 17 00:00:00 2001 From: Sergio Perez Date: Fri, 31 Mar 2023 15:24:04 -0500 Subject: [PATCH 2/3] removen sin uso --- .../java/com/cursojava/curso/controllers/UsuarioController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/cursojava/curso/controllers/UsuarioController.java b/src/main/java/com/cursojava/curso/controllers/UsuarioController.java index 3dd6d0d..35930b9 100644 --- a/src/main/java/com/cursojava/curso/controllers/UsuarioController.java +++ b/src/main/java/com/cursojava/curso/controllers/UsuarioController.java @@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; @RestController From 8860c321bdeb0f3738749d6c0f3fef9f2a603745 Mon Sep 17 00:00:00 2001 From: Sergio Perez Date: Fri, 31 Mar 2023 18:57:33 -0500 Subject: [PATCH 3/3] dependencia javax.xml.bind --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index d707be8..9f1ac68 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,11 @@ jjwt 0.9.1 + + javax.xml.bind + jaxb-api + 2.3.1 +