From 08c245149d632420c6d1ba3d5136a4e7570b9044 Mon Sep 17 00:00:00 2001
From: snegard <stiande@stud.ntnu.no>
Date: Tue, 3 Mar 2020 14:04:04 +0100
Subject: [PATCH] Added salting method
---
src/main/java/dao/UserDAO.java | 6 +++++-
src/test/java/UserDAOTest.java | 9 +++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/dao/UserDAO.java b/src/main/java/dao/UserDAO.java
index 51fb764..ae78d78 100644
--- a/src/main/java/dao/UserDAO.java
+++ b/src/main/java/dao/UserDAO.java
@@ -183,7 +183,11 @@ public class UserDAO {
* @return a random salt
*/
public byte[] generateSalt() {
- return null;
+ SecureRandom random = new SecureRandom();
+ byte bytes[] = new byte[16];
+ bytes = random.nextBytes(bytes);
+
+ return bytes;
}
/**
diff --git a/src/test/java/UserDAOTest.java b/src/test/java/UserDAOTest.java
index 9d8faca..95ed076 100644
--- a/src/test/java/UserDAOTest.java
+++ b/src/test/java/UserDAOTest.java
@@ -194,4 +194,13 @@ public class UserDAOTest extends JerseyTest {
assertEquals(expectedUsername,actualUsername);
assertNotEquals(beforeNewUser,afterNewUser);
}
+
+ @Test
+ public void testSalt () {
+ String password = "passord";
+ byte salted1[] = userDAO.generateSalt(password);
+ byte salted2[] = userDAO.generateSalt(password);
+
+ assertNotEquals(salted1, salted2);
+ }
}
\ No newline at end of file
--
GitLab