Merge origin/master

Conflicts:
	src/java/bdd/PompierMysql.java

src/java/bdd/PompierMysql.java

@@ -7,12 +7,17 @@ package bdd;
 
 import com.mysql.cj.xdevapi.Client;
 import com.test.beans.Pompier;
+import com.test.forms.MD5;
+import jakarta.servlet.http.HttpServletRequest;
+import java.net.http.HttpRequest;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
@@ -33,7 +38,7 @@ public class PompierMysql {
         try {
             Statement stmt = theConnection.createStatement();
             ResultSet resultQ = null;
-            resultQ = stmt.executeQuery("SELECT * FROM client");
+            resultQ = stmt.executeQuery("SELECT * FROM pompier");
             while (resultQ.next()) {
                 unPompier = new Pompier(resultQ.getInt("id"),
                         resultQ.getString("nom"),
@@ -156,4 +161,26 @@ public class PompierMysql {
         return id;
     }
 
+    public boolean readPompier(HttpServletRequest request) {
+        boolean reponse = false;
+        Statement stmt;
+        String userSaisi = request.getParameter("ztPseudo");
+        String mdpSaisi = request.getParameter("ztMDP");
+        String mdpChiffre = MD5.encode(mdpSaisi);
+        System.out.println("userSaisi : "+ userSaisi);
+        System.out.println("mdpSaisi : "+ mdpChiffre);
+        try {
+            System.out.println("Select * FROM pompier WHERE login = '"+userSaisi+"' AND mdp = '"+mdpChiffre+"';");
+            stmt = theConnection.createStatement();
+            ResultSet resultQ = null;
+            resultQ = stmt.executeQuery("Select * FROM pompier WHERE login = '"+userSaisi+"' AND mdp = '"+mdpChiffre+"';");
+            reponse = resultQ.next();                
+        } catch (SQLException ex) {
+            Logger.getLogger(PompierMysql.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
+        return reponse;
+
+    }
+
 }

src/java/com/test/forms/AuthentifForm.java

@@ -5,6 +5,7 @@
  */
 package com.test.forms;
 
+import bdd.PompierMysql;
 import com.test.beans.User;
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -24,19 +25,13 @@ public class AuthentifForm {
         this.resultat = resultat;
     }
 
-    public boolean controlerAdmin(HttpServletRequest request) {
+    public boolean authentifPompier(HttpServletRequest request) 
-        /*  Comparaison entre l'utilisateur admin et un utilisateur créé
+    {
-            avec le pseudo et le mdp saisi */
+        PompierMysql pms = new PompierMysql();
-        User admin = new User("Lovelace", "Ada");
+        boolean reponse = pms.readPompier(request);
-        User userSaisi = new User(request.getParameter("ztPseudo"),
+        resultat = reponse ?"": "login ou mot de passe incorrect";
-                request.getParameter("ztMDP"));
+        request.setAttribute("message", resultat);
-        boolean isAdmin = userSaisi.equals(admin);
+        return reponse;
-
-        // Mise à jour de l'attribut resultat
-        setResultat(isAdmin ? "Vous êtes administrateur" : "Vous n'êtes pas administrateur");
-
-        return isAdmin;
-
     }
 
 }

src/java/com/test/forms/MD5.java

@@ -5,31 +5,32 @@
  */
 package com.test.forms;
 
+/**
+ *
+ * @author sio
+ */
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.xml.bind.DatatypeConverter;
 
-/**
+public abstract class  MD5 {
- *
- * @author Dominique_2
- */
-public abstract class MD5 {
     
-    public static String encode(String uneChaine) {
+    public static String encode(String uneChaine){
         MessageDigest md = null;        
-        String myHash = null;
         try {
             md = MessageDigest.getInstance("MD5");
         } catch (NoSuchAlgorithmException ex) {
-            Logger.getLogger(AuthentifForm.class.getName()).log(Level.SEVERE, null, ex);
+            throw new IllegalArgumentException(ex);
         }
         md.update(uneChaine.getBytes());
         byte[] digest = md.digest();
-        myHash = DatatypeConverter.printHexBinary(digest).toLowerCase();
+        //myHash = DatatypeConverter.printHexBinary(digest).toLowerCase();
-
+        StringBuilder sb = new StringBuilder();
-        return myHash;
+        for (byte b : digest) {
+            sb.append(String.format("%02x", b));
+        }
+        return sb.toString();
     }
-
 }

src/java/com/test/servlets/AuthentifServlet.java

@@ -73,16 +73,18 @@ public class AuthentifServlet extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         // Création de l'objet leControle de type AuthentifForm
-         AuthentifForm leControle = new AuthentifForm();
+        AuthentifForm leControle = new AuthentifForm();
-        // Appel de la méthode controlerAdmin
+        // Appel de la méthode authentifPompier
-         boolean isAdmin = leControle.controlerAdmin(request);
+        if(leControle.authentifPompier(request))
-        // Création de 2 attributs de requête (isAdmin et leControle) 
+        {
-         request.setAttribute("isAdmin", isAdmin);
+          getServletContext().getRequestDispatcher("/WEB-INF/ProfilJSP.jsp")
-         request.setAttribute("controlForm", leControle);
-             
-         // Affichage de la JSP
-         getServletContext().getRequestDispatcher("/WEB-INF/ProfilJSP.jsp")
                  .forward(request, response);   
+        }
+        else
+        {
+            getServletContext().getRequestDispatcher("/WEB-INF/AuthentificationJSP.jsp")
+                 .forward(request, response); 
+        }        
     }
 
     /**

src/java/com/test/servlets/ProfilServlet.java

@@ -30,8 +30,8 @@ public class ProfilServlet extends HttpServlet {
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         response.setContentType("text/html;charset=UTF-8");
-        try ( PrintWriter out = response.getWriter()) {
+        try ( PrintWriter out = response.getWriter()) 
-            /* TODO output your page here. You may use following sample code. */
+        {
             out.println("<!DOCTYPE html>");
             out.println("<html>");
             out.println("<head>");

web/WEB-INF/AuthentificationJSP.jsp

@@ -9,10 +9,8 @@
 
 <!-- Affichage du formulaire si l'utilisateur ne s'est pas encore authentifi<66> -->
 <div id="contenu">
+    <form name="frmIdentification" method="POST" action="Authentif">
     <h2>Merci de vous identifier pour acceder aux dossiers</h2>  
-    <form name="frmIdentification" method="POST" action="Profil">
-        <c:choose>
-            <c:when test="${empty param.ztPseudo}">
                 <fieldset><legend>Identification utilisateur</legend>
                     <br /><br />
                     <label for="nom">Nom du compte</label>
@@ -25,16 +23,9 @@
                     <input type="submit" 	name="valider"		value="Valider">
                     <input type="reset" 	name="annuler" 		value="Annuler">
                     </p>
+                    <p>${message}</p>
                 </fieldset>
-            </c:when>  
-            <c:otherwise>
-                <!--    Si l'utilisateur s'est authentifi<66>,
-                 Affichage du message contenu dans l'objet controlForm de type AuthentifForm -->
-
-                <p>${controlForm.getResultat()}</p>
-            </c:otherwise>
-        </c:choose>
     </form>
-    <br /><br/>
+    <br/><br/>
 </div>
 </html>

web/WEB-INF/ModifProfilJSP.jsp

@@ -3,15 +3,34 @@
     Created on : 18 oct. 2021, 11:10:01
     Author     : Millot.thomas
 --%>
-
+<%@include file="jspf/enteteJSPF.jspf" %>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <!DOCTYPE html>
 <html>
-    <head>
+    <form name="Profil" method="POST" action="ProfilJSP.jsp">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<table style='border: 0px solid white;'>
-        <title>JSP Page</title>
+    <tr>
-    </head>
+        <td style='border :0px;'>
-    <body>
+            <fieldset><legend>Coordonnées Pompier</legend>
-        <h1>Hello World!</h1>
+                <table>
-    </body>
+                    <tr><th>Nom : </th><td><input type="text" name="ztNom"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Prénom : </th><td><input type="text" name="ztPrenom"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Adresse : </th><td><input type="text" name="ztAdr"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Ville : </th><td><input type="text"name="ztVille"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Code postal : </th><td><input type="text" name="ztCp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Téléphone : </th><td><input type="text" name="ztTel"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Mail : </th><td><input type="text" name="ztMail"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Statut : </th><td><input readonly type="text" name="ztStatut"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Grade : </th><td><input readonly type="text" name="ztGrade"  size="20" maxlength="30"></td></tr>
+                </table>
+            </fieldset>
+            <fieldset><legend>Coordonnées Employeur</legend>
+                <table>
+                    <tr><th>Nom employeur : </th><td><input type="text" name="ztNomEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Téléphone employeur : </th><td><input type="text" name="ztTelEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Adresse employeur : </th><td><input type="text" name="ztadrEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Mail employeur : </th><td><input type="text" name="ztMailEmp"  size="20" maxlength="30"></td></tr>
+                </table>
+            </fieldset>
+             <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Profil'" value="Valider les modification">           
 </html>

web/WEB-INF/ProfilJSP.jsp

@@ -1,3 +1,32 @@
-<div id="contenu">
+<%@include file="jspf/enteteJSPF.jspf" %>
-      <h2>Merci de vous identifier pour acceder aux dossiers</h2>           
+<br /><br />
-</div>
+   <form name="frmModifProfil" method="POST" action="ModifProfilJSP.jsp">
+<table style='border: 0px solid white;'>
+    <tr>
+        <td style='border :0px;'>
+            <fieldset><legend>Coordonn<6E>es Pompier</legend>
+                <table>
+                    <tr><th>Nom : </th><td><input type="text" name="ztNom"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Pr<50>nom : </th><td><input type="text" name="ztPrenom"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Adresse : </th><td><input type="text" name="ztAdr"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Ville : </th><td><input type="text"name="ztVille"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Code postal : </th><td><input type="text" name="ztCp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>T<>l<EFBFBD>phone : </th><td><input type="text" name="ztTel"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Mail : </th><td><input type="text" name="ztMail"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Statut : </th><td><input readonly type="text" name="ztStatut"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Grade : </th><td><input readonly type="text" name="ztGrade"  size="20" maxlength="30"></td></tr>
+                </table>
+            </fieldset>
+            <fieldset><legend>Coordonn<6E>es Employeur</legend>
+                <table>
+                    <tr><th>Nom employeur : </th><td><input type="text" name="ztNomEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>T<>l<EFBFBD>phone employeur : </th><td><input type="text" name="ztTelEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Adresse employeur : </th><td><input type="text" name="ztadrEmp"  size="20" maxlength="30"></td></tr>
+                    <tr><th>Mail employeur : </th><td><input type="text" name="ztMailEmp"  size="20" maxlength="30"></td></tr>
+                </table>
+            </fieldset>
+             <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Modif'" value="Modification du profil">
+        </td>
+    </tr>
+</table>
+</form>

web/WEB-INF/jspf/enteteJSPF.jspf

@@ -1,10 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
   <head>
+      <<link rel="stylesheet" href="css/newcss.css"/>
     <title>SDIS29</title>
   </head>
     <div id="page">
 		<div id="entete">
-                    <img src="./images/LogoSDIS29.jpg" id="logo" alt="SDIS29" title="SDIS 29" align='left' style="width: 200px; height: 180px" />	
+                    <img src="./images/LogoSDIS29.jpg" id="logo" alt="SDIS29" title="SDIS 29" align='left' style="width: 200px; height: 180px";
+}/>	
 <!-- fin de l'ent<6E>te -->

web/css/newcss.css

@@ -0,0 +1,59 @@
+/*
+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.
+*/
+/* 
+    Created on : 21 oct. 2021, 16:37:16
+    Author     : elliass.chelloug
+*/
+body
+{
+    background-color: #596b6e;
+    background-repeat: repeat-x;
+    margin:0% 0%;
+    padding : 0.9em;
+    font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
+    font-size: 0.9em;
+}
+#contenu
+{
+    border: none;
+    padding: 2.1em;
+    background-color: white;
+    border-left :  groove 0.8em #980101;
+    margin-top : 1.1em;
+    margin-left: 82px;
+    min-height:27em;
+    height:27em;
+}
+piedForm 
+{
+    border-bottom-width : 0.1em;
+    border-left-width : 0.1em;
+    border-right-width : 0.1em;
+    border-top-width : 0em;
+    border-style : solid;
+    border-color : #000;
+    text-align:right ;
+    width : 95%;
+    margin-top:0em;
+}
+form 
+{
+    margin-bottom:1em;  
+}
+corpsForm legend 
+{
+    font-weight:bold;
+    font-size:1.2em;
+}
+corpsForm label
+{
+    float: left;
+    text-align:right;
+    width:33%;
+    margin: 0;
+    padding: 0 .5em 0 0;
+    line-height: 1.8;	
+}