From 6ccd07a87013f250378937bbb81de6c5fd8b684b Mon Sep 17 00:00:00 2001 From: Brianna Date: Fri, 14 Apr 2017 13:33:34 -0400 Subject: [PATCH 1/4] Adds logout feature. Users must now input a 9 digit SSO number. --- WebContent/html/webpages/logout.jsp | 21 +++++++++++++++++++++ WebContent/html/webpages/navbar.jsp | 9 ++++----- WebContent/index.jsp | 4 ++-- WebContent/logout.jsp | 20 ++++++++++++++++++++ WebContent/userLogin.jsp | 4 +++- 5 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 WebContent/html/webpages/logout.jsp create mode 100644 WebContent/logout.jsp diff --git a/WebContent/html/webpages/logout.jsp b/WebContent/html/webpages/logout.jsp new file mode 100644 index 0000000..61449b1 --- /dev/null +++ b/WebContent/html/webpages/logout.jsp @@ -0,0 +1,21 @@ +<%@ page import = "database.*,entities.User,utilities.Mail" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> +<% +Cookie[] usercookies = request.getCookies(); +if(usercookies != null){ + request.getSession(); + session.removeAttribute("ssoNum"); + session.invalidate(); + for(Cookie c : usercookies){ + if(c.getName().equals("ssoNum")){ + //delete cookies + c.setValue(""); + c.setMaxAge(0); + response.addCookie(c); + } + } + +response.sendRedirect("../../logout.jsp"); +} + +%> \ No newline at end of file diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp index 4f60228..54b0dd9 100644 --- a/WebContent/html/webpages/navbar.jsp +++ b/WebContent/html/webpages/navbar.jsp @@ -22,6 +22,7 @@
  • Return Device
  • Device Listing
  • Shopping Cart
    • +
  • Logout <% @@ -33,12 +34,10 @@ //iterate cookies if(usercookies != null){ for(Cookie c : usercookies){ - if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it + if(c.getName().equals("ssoNum")){//DO NOT RESET COOKIE NO NEW COOKIES NO NEW COOKIES COOKIES CAN'T DELETE IF COOKIES MADE HERE NO NEW COOKIES navsso = c.getValue(); - c.setMaxAge(0);//delete current - newCookie = new Cookie("ssoNum",navsso);//make new one - newCookie.setMaxAge(30*60); - response.addCookie(newCookie); + c.setMaxAge(30*60); + response.addCookie(c); break; } } diff --git a/WebContent/index.jsp b/WebContent/index.jsp index c9e4a6a..61d3a95 100644 --- a/WebContent/index.jsp +++ b/WebContent/index.jsp @@ -95,14 +95,14 @@

    User Login

    -
    +

    Admin Login

    - +
    diff --git a/WebContent/logout.jsp b/WebContent/logout.jsp new file mode 100644 index 0000000..e455bda --- /dev/null +++ b/WebContent/logout.jsp @@ -0,0 +1,20 @@ +<%@ page import = "database.*,entities.User,utilities.Mail" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> +<% +Cookie[] usercookies = request.getCookies(); +if(usercookies != null){ + request.getSession(); + session.removeAttribute("ssoNum"); + session.invalidate(); + for(Cookie c : usercookies){ + if(c.getName().equals("ssoNum")){ + //delete cookies + c.setValue(""); + c.setMaxAge(0); + response.addCookie(c); + } + } + +response.sendRedirect("index.jsp"); +} +%> \ No newline at end of file diff --git a/WebContent/userLogin.jsp b/WebContent/userLogin.jsp index 54f84ca..bcf2c9d 100644 --- a/WebContent/userLogin.jsp +++ b/WebContent/userLogin.jsp @@ -5,8 +5,10 @@ <% int ssoNum; Cookie userCookie; + ssoNum = Integer.parseInt(request.getParameter("ssoNum")); -System.getenv("VCAP_SERVICES"); +int ssoLength = (int)(Math.log10(ssoNum)+1); + Class.forName("com.mysql.jdbc.Driver"); String database = "jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317"; String user = "b372dfe7409692"; From 1d19e5244bc54aaf5617d7c18e6c4f9a1869d57c Mon Sep 17 00:00:00 2001 From: Brianna Date: Fri, 14 Apr 2017 13:43:38 -0400 Subject: [PATCH 2/4] This page needs to be updated. --- WebContent/index.jsp | 6 ++---- WebContent/userLogin.jsp | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/WebContent/index.jsp b/WebContent/index.jsp index 61d3a95..e45b176 100644 --- a/WebContent/index.jsp +++ b/WebContent/index.jsp @@ -123,10 +123,8 @@ if(usercookies != null){ for(Cookie c : usercookies){ if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it navsso = c.getValue(); - c.setMaxAge(0);//delete current - newCookie = new Cookie("ssoNum",navsso); //make new one - newCookie.setMaxAge(30*60); - response.addCookie(newCookie); + c.setMaxAge(30*60); + response.addCookie(c); break; } } diff --git a/WebContent/userLogin.jsp b/WebContent/userLogin.jsp index bcf2c9d..713705f 100644 --- a/WebContent/userLogin.jsp +++ b/WebContent/userLogin.jsp @@ -7,7 +7,6 @@ int ssoNum; Cookie userCookie; ssoNum = Integer.parseInt(request.getParameter("ssoNum")); -int ssoLength = (int)(Math.log10(ssoNum)+1); Class.forName("com.mysql.jdbc.Driver"); String database = "jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317"; From ffe983b35198a72242b0917f9f1d3b2e12699050 Mon Sep 17 00:00:00 2001 From: Brianna Date: Fri, 14 Apr 2017 14:12:02 -0400 Subject: [PATCH 3/4] MD5 Hash added for admin passwords --- WebContent/adminLogin.jsp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/WebContent/adminLogin.jsp b/WebContent/adminLogin.jsp index 6341098..940af2f 100644 --- a/WebContent/adminLogin.jsp +++ b/WebContent/adminLogin.jsp @@ -2,21 +2,39 @@ <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> <%@ page import = "java.sql.*" %> +<%@ page import = "java.security.MessageDigest" %> +<%@ page import = "java.security.NoSuchAlgorithmException" %> <% int ssoNum; String pass; Cookie adminCookie; + ssoNum = Integer.parseInt(request.getParameter("ssoNum2")); pass = request.getParameter("pass"); +String generatedPass = null; + +try { + MessageDigest md = MessageDigest.getInstance("MD5"); + md.update(pass.getBytes()); + byte[] bytes = md.digest(); + StringBuilder sb = new StringBuilder(); + for(int i = 0; i Date: Sat, 15 Apr 2017 12:44:07 -0400 Subject: [PATCH 4/4] Website Reorganization Files are more organized now --- WebContent/adminLogin.jsp | 4 +- .../webpages/{ => administration}/admin.jsp | 18 ++--- .../{ => administration}/adminApprove.jsp | 37 +++++------ .../adminDeviceSettings.jsp | 28 ++++---- .../{ => administration}/adminLocation.jsp | 41 +++++------- .../{ => administration}/adminpassword.jsp | 29 ++++---- .../adminpasswordtryagain.jsp | 31 ++++----- .../html/webpages/components/adminnavbar.jsp | 66 +++++++++++++++++++ .../html/webpages/components/adminsidebar.jsp | 10 +++ .../html/webpages/{ => components}/navbar.jsp | 6 +- WebContent/html/webpages/error.jsp | 2 +- WebContent/html/webpages/index.jsp | 2 +- WebContent/html/webpages/listingPage.jsp | 2 +- WebContent/html/webpages/profileSettings.jsp | 4 +- .../{ => redirect}/adminpasswordchange.jsp | 57 +++++++++++++--- .../{ => redirect}/deviceRedirect.jsp | 10 ++- .../{ => redirect}/locationRedirect.jsp | 12 ++-- .../{ => redirect}/orderFormHandler.jsp | 10 ++- .../profileSettingsRedirect.jsp | 12 ++-- .../{ => redirect}/ticketAdminRedirect.jsp | 10 ++- WebContent/html/webpages/requestPage.jsp | 2 +- WebContent/html/webpages/returnComplete.jsp | 2 +- WebContent/html/webpages/returnPage.jsp | 2 +- WebContent/html/webpages/shoppingCart.jsp | 4 +- WebContent/html/webpages/somethingwrong.jsp | 2 +- WebContent/html/webpages/statisticsPage.jsp | 2 +- 26 files changed, 240 insertions(+), 165 deletions(-) rename WebContent/html/webpages/{ => administration}/admin.jsp (70%) rename WebContent/html/webpages/{ => administration}/adminApprove.jsp (85%) rename WebContent/html/webpages/{ => administration}/adminDeviceSettings.jsp (94%) rename WebContent/html/webpages/{ => administration}/adminLocation.jsp (92%) rename WebContent/html/webpages/{ => administration}/adminpassword.jsp (55%) rename WebContent/html/webpages/{ => administration}/adminpasswordtryagain.jsp (53%) create mode 100644 WebContent/html/webpages/components/adminnavbar.jsp create mode 100644 WebContent/html/webpages/components/adminsidebar.jsp rename WebContent/html/webpages/{ => components}/navbar.jsp (90%) rename WebContent/html/webpages/{ => redirect}/adminpasswordchange.jsp (54%) rename WebContent/html/webpages/{ => redirect}/deviceRedirect.jsp (86%) rename WebContent/html/webpages/{ => redirect}/locationRedirect.jsp (83%) rename WebContent/html/webpages/{ => redirect}/orderFormHandler.jsp (81%) rename WebContent/html/webpages/{ => redirect}/profileSettingsRedirect.jsp (76%) rename WebContent/html/webpages/{ => redirect}/ticketAdminRedirect.jsp (82%) diff --git a/WebContent/adminLogin.jsp b/WebContent/adminLogin.jsp index e4db5fc..3ac93cc 100644 --- a/WebContent/adminLogin.jsp +++ b/WebContent/adminLogin.jsp @@ -49,13 +49,13 @@ if (result.next()){ if(result.getInt("Password_Flag") == 1){ stmt.close(); connection.close(); - response.sendRedirect("html/webpages/admin.jsp"); + response.sendRedirect("html/webpages/administration/admin.jsp"); return; } else{ stmt.close(); connection.close(); - response.sendRedirect("html/webpages/adminpassword.jsp"); + response.sendRedirect("html/webpages/administration/adminpassword.jsp"); return; } } else { diff --git a/WebContent/html/webpages/admin.jsp b/WebContent/html/webpages/administration/admin.jsp similarity index 70% rename from WebContent/html/webpages/admin.jsp rename to WebContent/html/webpages/administration/admin.jsp index 9ddfd7b..6719058 100644 --- a/WebContent/html/webpages/admin.jsp +++ b/WebContent/html/webpages/administration/admin.jsp @@ -15,9 +15,9 @@ src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"> - + + href="../../imgs/synchrony-financial-logo-dlpx_1.ico">
    - + <%@ include file = "../components/adminsidebar.jsp" %>
    @@ -92,7 +83,7 @@ pageEncoding="ISO-8859-1"%>

    -
    +
    @@ -147,7 +138,7 @@ pageEncoding="ISO-8859-1"%>

    - +
    @@ -252,7 +243,6 @@ populateDevices(devices); //adds event listeners to all table records $("tr.entry").click(modifyModal); - //Exits modal when x is clicked. $("#closeModifyForm").click(closeModifyModal); //Open the add modal @@ -263,6 +253,7 @@ $("#closeAddForm").click(closeAddModal); window.onkeydown = function(e){if (e.keyCode == 27){closeAddModal();closeModifyModal();}} //Event listener exits modal when click outside modal. window.onclick = function(e){var add = document.getElementById('addModal'); var modify = document.getElementById('modifyModal'); if(e.target == add || e.target == modify) {closeAddModal();closeModifyModal();}} + //set up options in modals var manuHTML = ''; var hardwareHTML = ''; @@ -430,6 +421,7 @@ function modifyModal(){ if(id == devices[i].id) break; } + //autofill modal $("#modifyName").val(devices[i].name.replace(/"/g,"\"")); $("#modifyDesc").val(devices[i].description.replace(/"/g,"\"")); $("#modifyAvailability").val(devices[i].status); @@ -443,10 +435,12 @@ function modifyModal(){ $("#modifyModal").show(); } +//close modify modal function closeModifyModal(){ $("#modifyModal").hide(); } +//find if a string is in the array function findInArray(string,array){ if (array.length == 0) return false @@ -458,6 +452,6 @@ function findInArray(string,array){ } - + \ No newline at end of file diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/administration/adminLocation.jsp similarity index 92% rename from WebContent/html/webpages/adminLocation.jsp rename to WebContent/html/webpages/administration/adminLocation.jsp index 1f53a3a..76d6d88 100644 --- a/WebContent/html/webpages/adminLocation.jsp +++ b/WebContent/html/webpages/administration/adminLocation.jsp @@ -12,16 +12,13 @@ Synchrony Financial - - - - - + + - +
    - -
    + <%@ include file="../components/adminsidebar.jsp" %> +
  • Home
  • Request Device
    • -
  • Return Device
    • -
  • Device Listing
    • +
  • My Devices
    • +
  • Device Library
  • Shopping Cart
  • Logout
    • @@ -62,5 +62,5 @@ var name = '<%=navname%>'; document.getElementById('user').innerHTML = "Hi " + name + "!"; if(<%=admin%> == 1) -document.getElementById('adminbar').innerHTML = 'Admin Hub' +document.getElementById('adminbar').innerHTML = 'Admin Hub' \ No newline at end of file diff --git a/WebContent/html/webpages/error.jsp b/WebContent/html/webpages/error.jsp index 91076ee..be4cdeb 100644 --- a/WebContent/html/webpages/error.jsp +++ b/WebContent/html/webpages/error.jsp @@ -29,7 +29,7 @@

    Error

    diff --git a/WebContent/html/webpages/index.jsp b/WebContent/html/webpages/index.jsp index 8ccfa57..61b5d3f 100644 --- a/WebContent/html/webpages/index.jsp +++ b/WebContent/html/webpages/index.jsp @@ -42,7 +42,7 @@
    diff --git a/WebContent/html/webpages/listingPage.jsp b/WebContent/html/webpages/listingPage.jsp index 9c1acdf..6b08456 100644 --- a/WebContent/html/webpages/listingPage.jsp +++ b/WebContent/html/webpages/listingPage.jsp @@ -51,7 +51,7 @@
      diff --git a/WebContent/html/webpages/profileSettings.jsp b/WebContent/html/webpages/profileSettings.jsp index b2cca18..d5fd7de 100644 --- a/WebContent/html/webpages/profileSettings.jsp +++ b/WebContent/html/webpages/profileSettings.jsp @@ -61,7 +61,7 @@
      @@ -97,7 +97,7 @@
      -
      +

      Profile Settings

      diff --git a/WebContent/html/webpages/adminpasswordchange.jsp b/WebContent/html/webpages/redirect/adminpasswordchange.jsp similarity index 54% rename from WebContent/html/webpages/adminpasswordchange.jsp rename to WebContent/html/webpages/redirect/adminpasswordchange.jsp index 881eb1d..d63e2c2 100644 --- a/WebContent/html/webpages/adminpasswordchange.jsp +++ b/WebContent/html/webpages/redirect/adminpasswordchange.jsp @@ -2,6 +2,8 @@ <%@ page import = "java.sql.*" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> +<%@ page import = "java.security.MessageDigest" %> +<%@ page import = "java.security.NoSuchAlgorithmException" %> @@ -13,15 +15,13 @@ Synchrony Financial - - - - + + @@ -35,6 +35,21 @@ if(request.getParameter("submit") != null){ String newpass = request.getParameter("new"); String confirm = request.getParameter("confirm"); String pincode = request.getParameter("pincode"); + String generatedOldPass = null; + try { + MessageDigest md = MessageDigest.getInstance("MD5"); + md.update(old.getBytes()); + byte[] bytes = md.digest(); + StringBuilder sb = new StringBuilder(); + for(int i = 0; i Synchrony Financial - - - - + + @@ -63,7 +61,7 @@ if(request.getParameter("delete") != null){ %> \ No newline at end of file diff --git a/WebContent/html/webpages/locationRedirect.jsp b/WebContent/html/webpages/redirect/locationRedirect.jsp similarity index 83% rename from WebContent/html/webpages/locationRedirect.jsp rename to WebContent/html/webpages/redirect/locationRedirect.jsp index 3995a44..58bdd32 100644 --- a/WebContent/html/webpages/locationRedirect.jsp +++ b/WebContent/html/webpages/redirect/locationRedirect.jsp @@ -12,15 +12,13 @@ Synchrony Financial - - - - + + @@ -58,9 +56,9 @@ if(request.getParameter("delete") != null){ %> diff --git a/WebContent/html/webpages/orderFormHandler.jsp b/WebContent/html/webpages/redirect/orderFormHandler.jsp similarity index 81% rename from WebContent/html/webpages/orderFormHandler.jsp rename to WebContent/html/webpages/redirect/orderFormHandler.jsp index 2b6fb02..53953ec 100644 --- a/WebContent/html/webpages/orderFormHandler.jsp +++ b/WebContent/html/webpages/redirect/orderFormHandler.jsp @@ -7,9 +7,15 @@ pageEncoding="ISO-8859-1"%> + + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/profileSettingsRedirect.jsp b/WebContent/html/webpages/redirect/profileSettingsRedirect.jsp similarity index 76% rename from WebContent/html/webpages/profileSettingsRedirect.jsp rename to WebContent/html/webpages/redirect/profileSettingsRedirect.jsp index da95137..a85d0fc 100644 --- a/WebContent/html/webpages/profileSettingsRedirect.jsp +++ b/WebContent/html/webpages/redirect/profileSettingsRedirect.jsp @@ -12,15 +12,11 @@ Synchrony Financial - - - - - + +

      Redirect Page

      @@ -41,10 +37,10 @@ if(request.getParameter("profile") != null){ %> \ No newline at end of file diff --git a/WebContent/html/webpages/ticketAdminRedirect.jsp b/WebContent/html/webpages/redirect/ticketAdminRedirect.jsp similarity index 82% rename from WebContent/html/webpages/ticketAdminRedirect.jsp rename to WebContent/html/webpages/redirect/ticketAdminRedirect.jsp index 9a60000..c33d7f7 100644 --- a/WebContent/html/webpages/ticketAdminRedirect.jsp +++ b/WebContent/html/webpages/redirect/ticketAdminRedirect.jsp @@ -12,15 +12,13 @@ Synchrony Financial - - - - + + @@ -46,7 +44,7 @@ if(request.getParameter("reject") != null){ } %> diff --git a/WebContent/html/webpages/requestPage.jsp b/WebContent/html/webpages/requestPage.jsp index d79f8ff..0fbe3d3 100644 --- a/WebContent/html/webpages/requestPage.jsp +++ b/WebContent/html/webpages/requestPage.jsp @@ -62,7 +62,7 @@
        diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp index 1a35d8b..9496be2 100644 --- a/WebContent/html/webpages/returnComplete.jsp +++ b/WebContent/html/webpages/returnComplete.jsp @@ -20,7 +20,7 @@ diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp index 6d85190..68913ed 100644 --- a/WebContent/html/webpages/returnPage.jsp +++ b/WebContent/html/webpages/returnPage.jsp @@ -75,7 +75,7 @@