From 24d10353c2df31c6d7003317af17913619477854 Mon Sep 17 00:00:00 2001 From: "clementine.desrucques" Date: Tue, 19 Oct 2021 09:26:24 +0200 Subject: [PATCH 1/6] --- web/images/sdis29.png | Bin 0 -> 12885 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 web/images/sdis29.png diff --git a/web/images/sdis29.png b/web/images/sdis29.png new file mode 100644 index 0000000000000000000000000000000000000000..c15050e4cb8e7d07f7d8f1bfd3b4c3fba89c6e18 GIT binary patch literal 12885 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%0AmPQEDF@v&g!Q~_0yv~kV}x>i{B9!m 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 jv Date: Tue, 19 Oct 2021 09:32:59 +0200 Subject: [PATCH 2/6] --- nbproject/project.properties | 4 ++-- .../com/test/servlets/authentifServlet.java | 4 ++-- web/WEB-INF/jspf/enteteJSPF.jspf | 2 +- web/images/sdis29.png | Bin 12885 -> 0 bytes 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 web/images/sdis29.png diff --git a/nbproject/project.properties b/nbproject/project.properties index 6a9ba31..60bb307 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -12,7 +12,7 @@ build.test.classes.dir=${build.dir}/test/classes build.test.results.dir=${build.dir}/test/results build.web.dir=${build.dir}/web build.web.excludes=${build.classes.excludes} -client.urlPart= +client.urlPart=/Authentification compile.jsps=false conf.dir=${source.root}/conf debug.classpath=${build.classes.dir}:${javac.classpath} @@ -43,7 +43,7 @@ j2ee.compile.on.save=true j2ee.copy.static.files.on.save=true j2ee.deploy.on.save=true j2ee.platform=1.7-web -j2ee.platform.classpath=${j2ee.server.domain}/lib/annotations-api.jar:${j2ee.server.domain}/lib/catalina-ant.jar:${j2ee.server.domain}/lib/catalina-ha.jar:${j2ee.server.domain}/lib/catalina-ssi.jar:${j2ee.server.domain}/lib/catalina-storeconfig.jar:${j2ee.server.domain}/lib/catalina-tribes.jar:${j2ee.server.domain}/lib/catalina.jar:${j2ee.server.domain}/lib/ecj-4.20.jar:${j2ee.server.domain}/lib/el-api.jar:${j2ee.server.domain}/lib/jakartaee-migration-1.0.0-shaded.jar:${j2ee.server.domain}/lib/jasper-el.jar:${j2ee.server.domain}/lib/jasper.jar:${j2ee.server.domain}/lib/jaspic-api.jar:${j2ee.server.domain}/lib/jsp-api.jar:${j2ee.server.domain}/lib/servlet-api.jar:${j2ee.server.domain}/lib/tomcat-api.jar:${j2ee.server.domain}/lib/tomcat-coyote.jar:${j2ee.server.domain}/lib/tomcat-dbcp.jar:${j2ee.server.domain}/lib/tomcat-i18n-cs.jar:${j2ee.server.domain}/lib/tomcat-i18n-de.jar:${j2ee.server.domain}/lib/tomcat-i18n-es.jar:${j2ee.server.domain}/lib/tomcat-i18n-fr.jar:${j2ee.server.domain}/lib/tomcat-i18n-ja.jar:${j2ee.server.domain}/lib/tomcat-i18n-ko.jar:${j2ee.server.domain}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.domain}/lib/tomcat-i18n-ru.jar:${j2ee.server.domain}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.domain}/lib/tomcat-jdbc.jar:${j2ee.server.domain}/lib/tomcat-jni.jar:${j2ee.server.domain}/lib/tomcat-util-scan.jar:${j2ee.server.domain}/lib/tomcat-util.jar:${j2ee.server.domain}/lib/tomcat-websocket.jar:${j2ee.server.domain}/lib/websocket-api.jar +j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.20.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jakartaee-migration-1.0.0-shaded.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar j2ee.server.type=Tomcat jar.compress=false javac.classpath=\ diff --git a/src/java/com/test/servlets/authentifServlet.java b/src/java/com/test/servlets/authentifServlet.java index 8cfc568..3203091 100644 --- a/src/java/com/test/servlets/authentifServlet.java +++ b/src/java/com/test/servlets/authentifServlet.java @@ -77,9 +77,9 @@ public class authentifServlet extends HttpServlet { throws ServletException, IOException { // Création de l'objet leControle de type AuthentifForm AuthentifForm leControle = new AuthentifForm(); - // Appel de la méthode controlerAdmin + // Appel de la méthode controlerRole boolean isChef = leControle.controlerRole(request); - // Création de 2 attributs de requête (isAdmin et leControle) + // Création de 2 attributs de requête (isChef et leControle) request.setAttribute("isChef", isChef); request.setAttribute("controlForm", leControle); HttpSession maSession = request.getSession(); diff --git a/web/WEB-INF/jspf/enteteJSPF.jspf b/web/WEB-INF/jspf/enteteJSPF.jspf index 25dcf1e..730368f 100644 --- a/web/WEB-INF/jspf/enteteJSPF.jspf +++ b/web/WEB-INF/jspf/enteteJSPF.jspf @@ -1,4 +1,4 @@ <%-- any content can be specified here e.g.: --%> <%@ page pageEncoding="UTF-8" %>

-<alt +alt diff --git a/web/images/sdis29.png b/web/images/sdis29.png deleted file mode 100644 index c15050e4cb8e7d07f7d8f1bfd3b4c3fba89c6e18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12885 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%0AmPQEDF@v&g!Q~_0yv~kV}x>i{B9!m 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 jv Date: Tue, 19 Oct 2021 09:50:56 +0200 Subject: [PATCH 3/6] --- web/WEB-INF/jspf/enteteJSPF.jspf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/WEB-INF/jspf/enteteJSPF.jspf b/web/WEB-INF/jspf/enteteJSPF.jspf index 730368f..ada0472 100644 --- a/web/WEB-INF/jspf/enteteJSPF.jspf +++ b/web/WEB-INF/jspf/enteteJSPF.jspf @@ -1,4 +1,4 @@ <%-- any content can be specified here e.g.: --%> <%@ page pageEncoding="UTF-8" %>

-alt +

SDIS 29

From 78e622a84e4731925fda261354b07ddf4fd27f42 Mon Sep 17 00:00:00 2001 From: "clementine.desrucques" Date: Wed, 20 Oct 2021 08:37:34 +0200 Subject: [PATCH 4/6] --- web/WEB-INF/ChefCaserneJSP.jsp | 44 +++++++++++++++++++++++++++++++++- web/WEB-INF/ModifPompier.jsp | 5 ++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/web/WEB-INF/ChefCaserneJSP.jsp b/web/WEB-INF/ChefCaserneJSP.jsp index e88cff5..b6b4772 100644 --- a/web/WEB-INF/ChefCaserneJSP.jsp +++ b/web/WEB-INF/ChefCaserneJSP.jsp @@ -12,6 +12,48 @@ Chef de caserne -

Hello World!

+

Les pompiers :

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdIdCaserneNomPrénomNuméro de statutMailLoginMot de passeNo rueNom rueCode postalVilleNuméro de gradeCommentaire
+
+ diff --git a/web/WEB-INF/ModifPompier.jsp b/web/WEB-INF/ModifPompier.jsp index b885a76..d2c7ec2 100644 --- a/web/WEB-INF/ModifPompier.jsp +++ b/web/WEB-INF/ModifPompier.jsp @@ -9,9 +9,10 @@ - JSP Page + Modification -

Hello World!

+

Modification des informations :

+ From 580e1ad3d3f3fc35ef41fee52939ac747e700f7c Mon Sep 17 00:00:00 2001 From: "clementine.desrucques" Date: Wed, 20 Oct 2021 08:58:06 +0200 Subject: [PATCH 5/6] --- .../com/test/servlets/CreaPompierServlet.java | 106 ++++++++++++++++++ .../test/servlets/ModifPompierServlet.java | 87 ++++++++++++++ web/WEB-INF/ChefCaserneJSP.jsp | 3 +- web/WEB-INF/web.xml | 16 +++ 4 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 src/java/com/test/servlets/CreaPompierServlet.java create mode 100644 src/java/com/test/servlets/ModifPompierServlet.java diff --git a/src/java/com/test/servlets/CreaPompierServlet.java b/src/java/com/test/servlets/CreaPompierServlet.java new file mode 100644 index 0000000..43a32f2 --- /dev/null +++ b/src/java/com/test/servlets/CreaPompierServlet.java @@ -0,0 +1,106 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.test.servlets; + +import com.test.forms.NouveauPompForm; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; + + +/** + * + * @author clementine.desrucques + */ +public class CreaPompierServlet extends HttpServlet { + + /** + * Processes requests for both HTTP GET and POST + * methods. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + protected void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); + try ( PrintWriter out = response.getWriter()) { + /* TODO output your page here. You may use following sample code. */ + out.println(""); + out.println(""); + out.println(""); + out.println("Servlet CreaPompierServlet"); + out.println(""); + out.println(""); + out.println("

Servlet CreaPompierServlet at " + request.getContextPath() + "

"); + out.println(""); + out.println(""); + } + } + + // + /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { +// processRequest(request, response); + getServletContext().getRequestDispatcher("/WEB-INF/CreaPompier.jsp").forward(request, response); + } + + /** + * Handles the HTTP POST method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + NouveauPompForm nvp = new NouveauPompForm(); + int idPomp = nvp.verifNouveauPompier(request); + request.setAttribute("idPompier", idPomp); + request.setAttribute("message", nvp.getMessage()); + + if (idPomp != -1){ + HttpSession maSession = request.getSession(); + ArrayList lesNouveauxPompiers = (ArrayList) maSession.getAttribute("lesNvxPompiers"); + if (lesNouveauxPompiers == null){ + lesNouveauxPompiers = new ArrayList<>(); + } + lesNouveauxPompiers.add(idPomp); + maSession.setAttribute("lesNvxPompiers", lesNouveauxPompiers); + } + + getServletContext().getRequestDispatcher("/WEB-INF/CreaPompier.jsp").forward(request, response); + } + + /** + * Returns a short description of the servlet. + * + * @return a String containing servlet description + */ + @Override + public String getServletInfo() { + return "Short description"; + }// + +} diff --git a/src/java/com/test/servlets/ModifPompierServlet.java b/src/java/com/test/servlets/ModifPompierServlet.java new file mode 100644 index 0000000..42d34d8 --- /dev/null +++ b/src/java/com/test/servlets/ModifPompierServlet.java @@ -0,0 +1,87 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.test.servlets; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; + + +/** + * + * @author clementine.desrucques + */ +public class ModifPompierServlet extends HttpServlet { + + /** + * Processes requests for both HTTP GET and POST + * methods. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + protected void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + response.setContentType("text/html;charset=UTF-8"); + try ( PrintWriter out = response.getWriter()) { + /* TODO output your page here. You may use following sample code. */ + out.println(""); + out.println(""); + out.println(""); + out.println("Servlet ModifPompierServlet"); + out.println(""); + out.println(""); + out.println("

Servlet ModifPompierServlet at " + request.getContextPath() + "

"); + out.println(""); + out.println(""); + } + } + + // + /** + * Handles the HTTP GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + /** + * Handles the HTTP POST method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + } + + /** + * Returns a short description of the servlet. + * + * @return a String containing servlet description + */ + @Override + public String getServletInfo() { + return "Short description"; + }// + +} diff --git a/web/WEB-INF/ChefCaserneJSP.jsp b/web/WEB-INF/ChefCaserneJSP.jsp index b6b4772..9ec9a4f 100644 --- a/web/WEB-INF/ChefCaserneJSP.jsp +++ b/web/WEB-INF/ChefCaserneJSP.jsp @@ -54,6 +54,7 @@
- + + diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index b9d7f13..e8aa329 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -12,6 +12,14 @@ authentifServlet com.test.servlets.authentifServlet + + ModifPompierServlet + com.test.servlets.ModifPompierServlet + + + CreaPompierServlet + com.test.servlets.CreaPompierServlet + PompierServlet /Pompier @@ -24,6 +32,14 @@ authentifServlet /Authentification + + ModifPompierServlet + /ModifPompier + + + CreaPompierServlet + /CreaPompier + 30 From 2cd34c6386ebfe24ea320cc16dc37d8aea6398f9 Mon Sep 17 00:00:00 2001 From: "clementine.desrucques" Date: Wed, 20 Oct 2021 09:06:20 +0200 Subject: [PATCH 6/6] --- src/java/com/test/forms/NouveauPompForm.java | 2 +- src/java/util/MD5.java | 36 ++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 src/java/util/MD5.java diff --git a/src/java/com/test/forms/NouveauPompForm.java b/src/java/com/test/forms/NouveauPompForm.java index db4d698..9b57715 100644 --- a/src/java/com/test/forms/NouveauPompForm.java +++ b/src/java/com/test/forms/NouveauPompForm.java @@ -46,7 +46,7 @@ public class NouveauPompForm { if (erreur > 0) return -1; // Creation d'un objet de type Client avec les données transmises -// String mdpChiffre = MD5.encode(request.getParameter("ztMDP")); + String mdpChiffre = MD5.encode(request.getParameter("ztMDP")); Pompier unPompier = new Pompier(request.getParameter("id"), request.getParameter("idCaserne"), request.getParameter("ztNom"), diff --git a/src/java/util/MD5.java b/src/java/util/MD5.java new file mode 100644 index 0000000..cccd368 --- /dev/null +++ b/src/java/util/MD5.java @@ -0,0 +1,36 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package util; + +/** + * + * @author sio + */ + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.logging.Level; +import java.util.logging.Logger; + +public abstract class MD5 { + + public static String encode(String uneChaine){ + MessageDigest md = null; + try { + md = MessageDigest.getInstance("MD5"); + } catch (NoSuchAlgorithmException ex) { + throw new IllegalArgumentException(ex); + } + md.update(uneChaine.getBytes()); + byte[] digest = md.digest(); + //myHash = DatatypeConverter.printHexBinary(digest).toLowerCase(); + StringBuilder sb = new StringBuilder(); + for (byte b : digest) { + sb.append(String.format("%02x", b)); + } + return sb.toString(); + } +}