update

Author: basion96

.gitignore

@@ -1 +1,3 @@
 /out/
+Home.iml
+.idea

.idea/sshConfigs.xml

@@ -21,7 +21,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
         UserAuthenticator accDB = new UserAuthenticator();
         if(!accDB.usernameExists(request.getParameter("username"), true)){
             accDB.insertPendingUser(request.getParameter("username"), request.getParameter("password"));
-            response.sendRedirect(request.getContextPath() + "/index?status=pending");
+            response.sendRedirect(request.getContextPath() + "/loginPage?status=pending");
         }
         else{
             request.setAttribute("username", request.getParameter("username"));

sql files/hardwareDatabase install.sql

@@ -0,0 +1,22 @@
+package controllers.account;
+
+import controllers.authentication.UserAuthenticator;
+import objects.User;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet("/myAccount")
+public class UserAccountController extends HttpServlet {
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        request.setAttribute("user", new UserAuthenticator().getUserDetails(request.getUserPrincipal().getName()));
+
+        RequestDispatcher rd = request.getRequestDispatcher( "/WEB-INF/jsp/user/userAccount.jsp");
+        rd.forward(request,response);
+    }
+}

web/WEB-INF/classes/controllers/account/CreateAccountController.java

@@ -2,6 +2,7 @@
 
 import database.DAO;
 import database.Database;
+import objects.User;
 
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
@@ -121,7 +122,7 @@ public void insertPendingUser(String username, String password){
         String salt = generateSalt();
         String hashedPassword = getSHAString(salt + getSHAString(password));
         try (Connection conn = getConnection(Database.USER_STORE)){
-            PreparedStatement statement = conn.prepareStatement("INSERT INTO pending_users VALUES (?,?,?)");
+            PreparedStatement statement = conn.prepareStatement("CALL addPendingUser(?,?,?)");
             statement.setString(1, username);
             statement.setString(2, salt);
             statement.setString(3, hashedPassword);
@@ -168,4 +169,32 @@ public void verifyPendingUser(boolean accept, String username, String role){
             e.printStackTrace();
         }
     }
+
+    public User getUserDetails(String username){
+        User user = new User();
+        try(Connection conn = getConnection(Database.USER_STORE)){
+            PreparedStatement statement = conn.prepareStatement("SELECT user_name, creation_date FROM users WHERE user_name = ?");
+            statement.setString(1, username);
+            ResultSet rs = statement.executeQuery();
+            while(rs.next()){
+                user.setName(rs.getString("user_name"));
+                user.setAccountCreation(rs.getString("creation_date"));
+
+                PreparedStatement statement2 = conn.prepareStatement("SELECT role_name FROM user_roles WHERE user_name = ?");
+                statement2.setString(1, username);
+                ResultSet rs2 = statement2.executeQuery();
+                while(rs2.next()){
+                    user.addRole(rs2.getString("role_name"));
+                }
+                statement2.close();
+                rs2.close();
+            }
+            statement.close();
+            rs.close();
+
+        }catch (SQLException e){
+            e.printStackTrace();
+        }
+        return user;
+    }
 }

web/WEB-INF/classes/controllers/account/UserAccountController.java

@@ -28,8 +28,6 @@ public class UserRoleFilter implements Filter {
 
     public void init(FilterConfig cfg) throws ServletException {
 
-        // TODO: fetch any services we need to determine the user ?
-        // e.g. database handler, ldap service, from session attribute or servlet context ?
     }
 
     public void doFilter(ServletRequest req, ServletResponse response, FilterChain next) throws IOException, ServletException {

web/WEB-INF/classes/controllers/account/admin/adminMenuController.java

@@ -41,4 +41,15 @@ public String getName() {
             }
         };
     }
+
+    @Override
+    public String toString(){
+        String user;
+        user = this.user + ", ";
+        for (String role: roles) {
+            user += role + ", ";
+        }
+
+        return user;
+    }
 }

web/WEB-INF/classes/controllers/authentication/UserAuthenticator.java

@@ -0,0 +1,46 @@
+package objects;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class User {
+
+    private String name, accountCreation;
+    private List<String> roles;
+
+    public User(){
+        this.name = "";
+        this.accountCreation = "";
+        this.roles = new ArrayList<>();
+    }
+
+    public User(String name, List<String> roles, String accountCreation){
+        this.name = name;
+        this.roles = roles;
+        this.accountCreation = accountCreation;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setAccountCreation(String accountCreation) {
+        this.accountCreation = accountCreation;
+    }
+
+    public void addRole(String role) {
+        roles.add(role);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getAccountCreation() {
+        return accountCreation;
+    }
+
+    public List<String> getRoles() {
+        return roles;
+    }
+}