nathan.boileau
/
Scripted
0
3
Fork 0
Code Issues 9 Pull Requests Packages Projects 1 Releases Wiki Activity

ajout d'un sel de hashage
continuous-integration/drone/push Build is passing Details

Browse Source
ServeurDeTest
Noé GARNIER 2 years ago
parent 86c3d2eaa4
commit 44a829eac2
3 changed files with 52 additions and 61 deletions
Show Stats Download Patch File Download Diff File

95
WEB/Model/Model.php
Unescape View File

@ -19,44 +19,44 @@ class Model
}
}
public function signUp() {
public function signUp()
{
global $rep, $vues, $sel, $error;
try {
$validation = new Validation();
if (! $validation->ValidateEmail($_REQUEST['email'])) {
if (!$validation->ValidateEmail($_REQUEST['email'])) {
$error = "Email invalides.";
throw (new Exception("Email non valide"));
}
if(! $validation->ValidateUsername($_REQUEST['username'])){
if (!$validation->ValidateUsername($_REQUEST['username'])) {
$error = "Nom d'utilisateur invalides. Il ne doit pas contenir de caractère spéciaux.";
throw(new Exception("Pseudo non valide"));
throw (new Exception("Pseudo non valide"));
}
if(! $validation->ValidatePassword($_REQUEST['password'])){
if (!$validation->ValidatePassword($_REQUEST['password'])) {
$error = "Mots de passe invalides. Il ne doit pas dépasser 100 caractères.";
throw(new Exception("Mot de passe non valide"));
throw (new Exception("Mot de passe non valide"));
}
$j = $this->utilisateur_gateway->getUtilisateurByEmail($_REQUEST['email']);
if ($j->getEmail() != "null") {
$error = "Email déjà utilisé.";
throw (new Exception("Email déjà utilisé"));
}
$password = password_hash($_REQUEST['password'], PASSWORD_DEFAULT);
$password = password_hash($_REQUEST['password'] . $sel, PASSWORD_DEFAULT);
$Utilisateur = new Utilisateur($_REQUEST['email'], $_REQUEST['username'], $password, false);
$this->utilisateur_gateway->insert($Utilisateur);
$_SESSION['connected'] = 'true';
$_SESSION['role'] = 'utilisateur';
require ($rep.$vues['main']);
}catch (PDOException $e)
{
require($rep . $vues['main']);
} catch (PDOException $e) {
$error = "Erreur de connexion à la base de données.";
require ($rep.$vues['erreur']);
}
catch (Exception $e){
require($rep . $vues['erreur']);
} catch (Exception $e) {
$error = $e->getMessage();
require($rep.$vues['erreur']);
require($rep . $vues['erreur']);
}
}
public function login(){
public function login()
{
global $rep, $vues, $sel, $error;
try {
$Utilisateur = $this->utilisateur_gateway->getUtilisateurByEmail($_REQUEST['email']);
@ -65,82 +65,87 @@ class Model
throw new Exception("Utilisateur introuvable");
}
$mdp = $this->utilisateur_gateway->getMdpByEmail($_REQUEST['email']);
if (password_verify($mdp, $_REQUEST['password'])){
if (password_verify($mdp, $_REQUEST['password'] . $sel)) {
$error = "Mot de passe incorrect.";
throw new Exception("Mot de passe invalide");
}
$estAdmin = $this->utilisateur_gateway->getEstAdminByEmail($_REQUEST['email']);
if ($estAdmin == true) {
$_SESSION['role'] = "admin";
}
else{
} else {
$_SESSION['role'] = "utilisateur";
}
$_SESSION['connected'] = 'true';
require ($rep.$vues['main']);
}catch (Exception $e){
require($rep.$vues['erreur']);
require($rep . $vues['main']);
} catch (Exception $e) {
require($rep . $vues['erreur']);
}
}
public function goToPresentation() {
public function goToPresentation()
{
global $rep, $vues, $error;
try {
require ($rep.$vues['presentation']);
}catch (Exception $e){
require($rep . $vues['presentation']);
} catch (Exception $e) {
$error = "Erreur Inconnue";
require($rep.$vues['erreur']);
require($rep . $vues['erreur']);
}
}
public function goToHome() {
public function goToHome()
{
global $rep, $vues, $error;
try {
require ($rep.$vues['main']);
}catch (Exception $e){
require($rep . $vues['main']);
} catch (Exception $e) {
$error = "404";
require($rep.$vues['erreur']);
require($rep . $vues['erreur']);
}
}
public function goToLogin() {
public function goToLogin()
{
global $rep, $vues, $error;
try {
require ($rep.$vues['login']);
}catch (Exception $e){
require($rep . $vues['login']);
} catch (Exception $e) {
$error = "404";
require($rep.$vues['erreur']);
require($rep . $vues['erreur']);
}
}
public function goToSignUp() {
public function goToSignUp()
{
global $rep, $vues, $error;
try {
require ($rep.$vues['signUp']);
}catch (Exception $e){
require($rep . $vues['signUp']);
} catch (Exception $e) {
$error = "404";
require($rep.$vues['erreur']);
require($rep . $vues['erreur']);
}
}
public function goToEnigme() {
public function goToEnigme()
{
global $rep, $vues, $error;
try {
require ($rep.$vues['enigme']);
}catch (Exception $e){
require($rep . $vues['enigme']);
} catch (Exception $e) {
$error = "404";
require($rep.$vues['erreur']);
require($rep . $vues['erreur']);
}
}
public function goToQueue() {
public function goToQueue()
{
global $rep, $vues, $error;
try {
require ($rep.$vues['Queue']);
}catch (Exception $e){
require($rep . $vues['Queue']);
} catch (Exception $e) {
$error = "404";
require($rep.$vues['erreur']);
require($rep . $vues['erreur']);
}
}
}

BIN
WEB/Model/scripted.db
View File

Binary file not shown.

14
WEB/index.php
Unescape View File

@ -3,20 +3,6 @@ require_once('./Config/Config.php');
require_once('./Config/Autoload.php');
Autoload::charger();
// $db = new Connection();
// $stm=$db->prepare("INSERT INTO Utilisateur VALUES (:email, :password, :pseudo, :admin)");
// $stm->bindValue(':email', "e",SQLITE3_TEXT);
// $stm->bindValue(':password', "e" ,SQLITE3_TEXT);
// $stm->bindValue(':pseudo', "e", SQLITE3_TEXT);
// $stm->bindValue(':admin', 0, SQLITE3_INTEGER);
// $stm->execute();
// $res = $db->query('SELECT * FROM Utilisateur');
// Select all the users in the database
// while ($row = $res->fetchArray()) {
// echo $row['email'] . " " . $row['password'] . " " . $row['pseudo'] . " " . $row['admin'] . " ";
// }
$control = new FrontController();
//session_regenerate_id(true);

Write Preview
Loading…
Cancel
Save