Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/erlendrr/devops-workshop

src/main/java/dao/UserDAO.java

@@ -183,7 +183,16 @@ public class UserDAO {
      * @return a random salt
      */
     public byte[] generateSalt() {
-        return null;
+        byte[] bytes = new byte[16];
+        try{
+        SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
+
+        random.nextBytes(bytes);
+        }
+        catch (NoSuchAlgorithmException e){
+            e.printStackTrace();
+        }
+        return bytes;
     }
 
     /**
@@ -193,7 +202,25 @@ public class UserDAO {
      * @return hashedPassword, null if unsuccessful
      */
     public String hashPassword(String password, byte[] salt) {
-        return null;
+
+        String hashedPassword = null;
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256"); //lager et objekt av messageDigest
+            //bruker alogritmen SHA-256 siden den er lenger, mer kompleks og dermed tryggere.
+            md.update(salt); //gjør passordet om til bytes.
+            byte[] bytes = md.digest(password.getBytes());
+
+            StringBuilder stringBuilder = new StringBuilder(); //lager et objekt av klassen stringbuilder
+            for (int i = 0; i < bytes.length; i++) { // gjør salt(bytes) om til string
+                stringBuilder.append(Integer.toString((bytes[i] & 0xff) + 0x100,
+                        16).substring(1));
+            }
+            hashedPassword = stringBuilder.toString();
+        }
+        catch (NoSuchAlgorithmException e){
+            e.printStackTrace();
+        }
+        return hashedPassword;
     }
 
     /**

src/main/java/resources/UserResource.java

@@ -5,6 +5,7 @@ import data.User;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
+import java.security.NoSuchAlgorithmException;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;

src/main/webapp/js/index.js

@@ -44,6 +44,4 @@ function loadApplication(user) {
     sessionStorage.setItem("username", user.username);
     window.location.href = "../app.html"
 
-}ion.href = "../app.html"
-
 }
\ No newline at end of file

src/test/java/UserDAOTest.java

@@ -132,6 +132,7 @@ public class UserDAOTest extends JerseyTest {
         }
     }
 
+
     @After
     public void tearDown () {
         try {