Skip to content
Snippets Groups Projects
Commit 49e4bed3 authored by Mathias Myhrvold Olsen's avatar Mathias Myhrvold Olsen
Browse files
parents 33ce0d22 a5db6380
No related branches found
No related tags found
No related merge requests found
Pipeline #115261 failed
...@@ -8,6 +8,8 @@ import java.security.SecureRandom; ...@@ -8,6 +8,8 @@ import java.security.SecureRandom;
import java.sql.*; import java.sql.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.security.SecureRandom;
import java.security.MessageDigest;
import static dao.Database.close; import static dao.Database.close;
...@@ -183,7 +185,10 @@ public class UserDAO { ...@@ -183,7 +185,10 @@ public class UserDAO {
* @return a random salt * @return a random salt
*/ */
public byte[] generateSalt() { public byte[] generateSalt() {
return null; SecureRandom random = new SecureRandom();
byte bytes[] = new byte[16];
random.nextBytes(bytes);
return bytes;
} }
/** /**
...@@ -192,8 +197,26 @@ public class UserDAO { ...@@ -192,8 +197,26 @@ public class UserDAO {
* @param salt salt to use when hashing * @param salt salt to use when hashing
* @return hashedPassword, null if unsuccessful * @return hashedPassword, null if unsuccessful
*/ */
public String hashPassword(String password, byte[] salt) { public String hashPassword(String password, byte[] salt) {
return null; String generatedPassword="";
try {
MessageDigest md = MessageDigest.getInstance("SHA-256");
md.update(salt);
byte[] bytes = md.digest(password.getBytes());
StringBuilder sb = new StringBuilder();
for (byte b:bytes) {
sb.append(Integer.toString((b & 0xff) + 0x100,16).substring(1));
}
generatedPassword=sb.toString();
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
}
return generatedPassword;
} }
/** /**
......
...@@ -49,4 +49,5 @@ public class User { ...@@ -49,4 +49,5 @@ public class User {
public void setSalt(byte[] salt) { public void setSalt(byte[] salt) {
this.salt = salt; this.salt = salt;
} }
} }
...@@ -11,6 +11,7 @@ import org.junit.Test; ...@@ -11,6 +11,7 @@ import org.junit.Test;
import javax.ws.rs.core.Application; import javax.ws.rs.core.Application;
import java.sql.Connection; import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.SQLOutput;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -194,4 +195,12 @@ public class UserDAOTest extends JerseyTest { ...@@ -194,4 +195,12 @@ public class UserDAOTest extends JerseyTest {
assertEquals(expectedUsername,actualUsername); assertEquals(expectedUsername,actualUsername);
assertNotEquals(beforeNewUser,afterNewUser); assertNotEquals(beforeNewUser,afterNewUser);
} }
@Test
public void testHashPassword(){
byte[] salt = userDAO.generateSalt();
System.out.println(salt);
assertEquals(userDAO.hashPassword("Hello World", salt),userDAO.hashPassword("Hello World", salt));
assertNotEquals(userDAO.hashPassword("Hello World", salt), userDAO.hashPassword("Yo", salt));
}
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment