beenull/servnest
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update auth forms

Browse source
This commit is contained in:
Miraty 2022-06-10 21:14:47 +02:00
parent 5e6da92d01
commit 6b602eb43f
17 changed files with 108 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config.ini
View file

@ -2,12 +2,6 @@
root_path = "/srv/php/niver" root_path = "/srv/php/niver"
; Prefix in URL, if any ; Prefix in URL, if any
prefix = prefix =
; From RFC2606: Reserved Top Level DNS Names > 2. TLDs for Testing, & Documentation Examples
domain_example = "example"
; From RFC3849: IPv6 Address Prefix Reserved for Documentation
ipv6_example = "2001:db8::3"
; From RFC5737: IPv4 Address Blocks Reserved for Documentation
ipv4_example = "203.0.113.42"
[dns] [dns]
knotc_path = "/usr/sbin/knotc" knotc_path = "/usr/sbin/knotc"

3
fn/auth.php
View file

@ -3,6 +3,9 @@
define("USERNAME_REGEX", "^[a-z]{4,32}$"); define("USERNAME_REGEX", "^[a-z]{4,32}$");
define("PASSWORD_REGEX", "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[a-zA-Z0-9]{8,1024}|.{10,1024}$"); define("PASSWORD_REGEX", "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[a-zA-Z0-9]{8,1024}|.{10,1024}$");
define("PLACEHOLDER_USERNAME", "lain");
define("PLACEHOLDER_PASSWORD", "••••••••••••••••••••••••");
// Password storage security // Password storage security
define("ALGO_PASSWORD", PASSWORD_ARGON2ID); define("ALGO_PASSWORD", PASSWORD_ARGON2ID);
define("OPTIONS_PASSWORD", array( define("OPTIONS_PASSWORD", array(

4
fn/dns.php
View file

@ -1,5 +1,9 @@
<?php <?php
define("PLACEHOLDER_DOMAIN", "example"); // From RFC2606: Reserved Top Level DNS Names > 2. TLDs for Testing, & Documentation Examples
define("PLACEHOLDER_IPV6", "2001:db8::3"); // From RFC3849: IPv6 Address Prefix Reserved for Documentation
define("PLACEHOLDER_IPV4", "203.0.113.42"); // From RFC5737: IPv4 Address Blocks Reserved for Documentation
function knotcExec($suffix, $cmd) { function knotcExec($suffix, $cmd) {
$action = checkAction($_POST['action']); $action = checkAction($_POST['action']);

31
public/auth/index.php
View file

@ -1,17 +1,22 @@
<?php require "../../common/html.php"; ?> <?php require "../../common/html.php"; ?>
<?php if (isset($_SESSION['username'])) { ?> <dl>
<dt><a href="register">Créer un compte</a></dt>
<a class="auth" href="logout">Se déconnecter</a> <dd>
<br> Créer un nouveau compte Niver
<a class="auth" href="password">Changer la clé de passe</a> </dd>
<dt><a href="login">Se connecter</a></dt>
<?php } else { ?> <dd>
Vous devez être authentifié·e pour utiliser Niver Démarrer une nouvelle session avec un compte existant
<br> </dd>
<a class="auth" href="register">Créer un compte</a> <dt><a href="logout">Se déconnecter</a></dt>
<br> <dd>
<a class="auth" href="login">Se connecter</a> Terminer la session et effacer ses cookies
<?php } ?> </dd>
<dt><a href="password">Changer la clé de passe</a></dt>
<dd>
Changer la chaîne de caractères permettant de vous authentifier.
</dd>
</dl>
<?php closeHTML(); ?> <?php closeHTML(); ?>

41
public/auth/login.php
View file

@ -4,11 +4,11 @@
<form method="post"> <form method="post">
<label for="username">Identifiant</label><br> <label for="username">Identifiant</label><br>
<input required="" minlength="4" maxlength="32" pattern="<?= USERNAME_REGEX ?>" id="username" name="username" type="text" placeholder="lain"> <input required="" minlength="4" maxlength="32" pattern="<?= USERNAME_REGEX ?>" id="username" name="username" type="text" placeholder="<?= PLACEHOLDER_USERNAME ?>">
<br> <br>
<label for="password">Clé de passe</label><br> <label for="password">Clé de passe</label><br>
<input required="" autocomplete="current-password" minlength="8" maxlength="1024" pattern="<?= PASSWORD_REGEX ?>" id="password" name="password" type="password" placeholder="************************"> <input required="" autocomplete="current-password" minlength="8" maxlength="1024" pattern="<?= PASSWORD_REGEX ?>" id="password" name="password" type="password" placeholder="<?= PLACEHOLDER_PASSWORD ?>">
<br> <br>
<input type="submit"> <input type="submit">
@ -16,32 +16,29 @@
<?php <?php
if (isset($_POST['username']) AND isset($_POST['password'])) { switchToFormProcess(requireLogin: false);
checkPasswordFormat($_POST['password']); checkPasswordFormat($_POST['password']);
checkUsernameFormat($_POST['username']); checkUsernameFormat($_POST['username']);
if (userExist($_POST['username']) !== true) if (userExist($_POST['username']) !== true)
userError("Connexion impossible : ce compte n'existe pas."); userError("Connexion impossible : ce compte n'existe pas.");
if (checkPassword($_POST['username'], $_POST['password']) !== true) if (checkPassword($_POST['username'], $_POST['password']) !== true)
userError("Connexion impossible : clé de passe invalide."); userError("Connexion impossible : clé de passe invalide.");
$_SESSION['username'] = $_POST['username']; $_SESSION['username'] = $_POST['username'];
if (outdatedPasswordHash($_SESSION['username'])) if (outdatedPasswordHash($_SESSION['username']))
changePassword($_SESSION['username'], $_POST['password']); changePassword($_SESSION['username'], $_POST['password']);
if (isset($_GET['redir'])) { if (isset($_GET['redir'])) {
if (preg_match("/^[0-9a-z\/-]+$/", $_GET['redir']) !== 1) if (preg_match("/^[0-9a-z\/-]+$/", $_GET['redir']) !== 1)
userError("Wrong character in <code>redir</code>."); userError("Wrong character in <code>redir</code>.");
header("Location: " . CONF['common']['prefix'] . "/" . $_GET['redir']); header("Location: " . CONF['common']['prefix'] . "/" . $_GET['redir']);
} else { } else {
header("Location: " . CONF['common']['prefix'] . "/"); header("Location: " . CONF['common']['prefix'] . "/");
}
} }
?> success("Connecté·e.");
<?php closeHTML(); ?>

10
public/auth/logout.php
View file

@ -1,10 +1,10 @@
<?php require "../../common/html.php"; ?> <?php require "../../common/html.php"; ?>
<?php <?php
session_destroy();
if (session_status() === PHP_SESSION_ACTIVE)
session_destroy();
header('Clear-Site-Data: "*"'); header('Clear-Site-Data: "*"');
header('Location: ' . CONF['common']['prefix'] . '/'); header('Location: ' . CONF['common']['prefix'] . '/');
exit; success("Déconnecté·e.");
?>
<?php closeHTML(); ?>

34
public/auth/password.php
View file

@ -1,40 +1,28 @@
<?php require "../../common/html.php"; ?> <?php require "../../common/html.php"; ?>
<p> <p>
Vous pouvez ici changer le mot de passe permettant d'accéder à votre compte Niver. Vous pouvez ici changer la clé de passe permettant d'accéder à votre compte Niver.
</p> </p>
<form method="post"> <form method="post">
<label for="currentPassword">Mot de passe actuel</label><br> <label for="currentPassword">Clé de passe actuelle</label><br>
<input required="" autocomplete="current-password" minlength="8" maxlength="1024" pattern="<?= PASSWORD_REGEX ?>" id="currentPassword" name="currentPassword" type="password" placeholder="************"><br> <input required="" autocomplete="current-password" minlength="8" maxlength="1024" pattern="<?= PASSWORD_REGEX ?>" id="currentPassword" name="currentPassword" type="password" placeholder="<?= PLACEHOLDER_PASSWORD ?>"><br>
<label for="newPassword">Nouveau mot de passe</label><br> <label for="newPassword">Nouvelle clé de passe</label><br>
<input required="" autocomplete="new-password" minlength="8" maxlength="1024" pattern="<?= PASSWORD_REGEX ?>" id="newPassword" name="newPassword" type="password" placeholder="************"><br> <input required="" autocomplete="new-password" minlength="8" maxlength="1024" pattern="<?= PASSWORD_REGEX ?>" id="newPassword" name="newPassword" type="password" placeholder="<?= PLACEHOLDER_PASSWORD ?>"><br>
<input type="submit"> <input type="submit">
</form> </form>
<?php <?php
if (isset($_SESSION['username']) AND isset($_POST['newPassword']) AND isset($_POST['currentPassword'])) { switchToFormProcess();
checkPasswordFormat($_POST['newPassword']); checkPasswordFormat($_POST['newPassword']);
if (checkPassword($_SESSION['username'], $_POST['currentPassword']) !== true) if (checkPassword($_SESSION['username'], $_POST['currentPassword']) !== true)
userError("Changement impossible : clé de passe invalide."); userError("Changement impossible : clé de passe invalide.");
$newPassword = hashPassword($_POST['newPassword']); changePassword($_SESSION['username'], $_POST['newPassword']);
$db = new PDO('sqlite:' . DB_PATH); success("Clé de passe changée.");
$stmt = $db->prepare("UPDATE users SET password = :password WHERE username = :username");
$stmt->bindParam(':username', $_SESSION['username']);
$stmt->bindParam(':password', $newPassword);
$stmt->execute();
}
?>
<?php closeHTML(); ?>

93
public/auth/register.php
View file

@ -2,63 +2,13 @@
<p>Déjà un compte ? <a class="auth" href="login">Se connecter</a></p> <p>Déjà un compte ? <a class="auth" href="login">Se connecter</a></p>
<?php
if (isset($_POST['username']) AND isset($_POST['password'])) {
checkPasswordFormat($_POST['password']);
checkUsernameFormat($_POST['username']);
$userExist = userExist($_POST['username']);
if ($userExist === false) {
// Setup SFTP directory
umask(0002);
if (mkdir(CONF['ht']['ht_path'] . "/" . $_POST['username'], 0775) !== true)
serverError("Can't create user directory.");
exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['chgrp_path'] . " " . CONF['ht']['sftpgo_group'] . " " . CONF['ht']['ht_path'] . "/" . $_POST['username'] . " --no-dereference", $stdout, $code);
if ($code !== 0)
serverError("Can't change user directory group.");
$password = hashPassword($_POST['password']);
$db = new PDO('sqlite:' . DB_PATH);
$stmt = $db->prepare("INSERT INTO users(username, password, registration_date) VALUES(:username, :password, :registration_date)");
$time = date("Y-m-d H:i:s");
$stmt->bindParam(':username', $_POST['username']);
$stmt->bindParam(':password', $password);
$stmt->bindParam(':registration_date', $time);
$stmt->execute();
$_SESSION['username'] = $_POST['username'];
header('Location: ' . CONF['common']['prefix'] . '/');
exit;
}
}
?>
<form method="post"> <form method="post">
<details> <details>
<summary><label for="username">Identifiant</label></summary> <summary><label for="username">Identifiant</label></summary>
Uniquement composé de lettres minuscules. Uniquement composé de lettres minuscules.
</details> </details>
<input id="username" minlength="4" maxlength="32" pattern="<?= USERNAME_REGEX ?>" required="" name="username" type="text" placeholder="lain"><span></span><br> <input id="username" minlength="4" maxlength="32" pattern="<?= USERNAME_REGEX ?>" required="" name="username" type="text" placeholder="<?= PLACEHOLDER_USERNAME ?>"><br>
<?php
if (isset($userExist) AND $userExist === true) {
echo "<br>Cet identifiant est déjà utilisé. Choisissez-en un autre.";
}
?>
<details> <details>
<summary><label for="password">Clé de passe</label></summary> <summary><label for="password">Clé de passe</label></summary>
@ -66,9 +16,46 @@ if (isset($userExist) AND $userExist === true) {
<p>Minimum 8 caractères si elle contient minuscule, majuscule et chiffre, ou minimum 10 caractères sinon.</p> <p>Minimum 8 caractères si elle contient minuscule, majuscule et chiffre, ou minimum 10 caractères sinon.</p>
</details> </details>
<input autocomplete="new-password" id="password" minlength="8" maxlength="1024" pattern="<?= PASSWORD_REGEX ?>" required="" name="password" type="password" placeholder="************"><span title="Le format nest pas valide"></span><br> <input autocomplete="new-password" id="password" minlength="8" maxlength="1024" pattern="<?= PASSWORD_REGEX ?>" required="" name="password" type="password" placeholder="<?= PLACEHOLDER_PASSWORD ?>"><br>
<input type="submit"> <input type="submit">
</form> </form>
<?php closeHTML(); ?> <?php
switchToFormProcess(requireLogin: false);
checkPasswordFormat($_POST['password']);
checkUsernameFormat($_POST['username']);
if (userExist($_POST['username']) !== false)
userError("Ce nom de compte est déjà utilisé.");
// Setup SFTP directory
umask(0002);
if (mkdir(CONF['ht']['ht_path'] . "/" . $_POST['username'], 0775) !== true)
serverError("Can't create user directory.");
exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['chgrp_path'] . " " . CONF['ht']['sftpgo_group'] . " " . CONF['ht']['ht_path'] . "/" . $_POST['username'] . " --no-dereference", $stdout, $code);
if ($code !== 0)
serverError("Can't change user directory group.");
$password = hashPassword($_POST['password']);
$db = new PDO('sqlite:' . DB_PATH);
$stmt = $db->prepare("INSERT INTO users(username, password, registration_date) VALUES(:username, :password, :registration_date)");
$time = date("Y-m-d H:i:s");
$stmt->bindParam(':username', $_POST['username']);
$stmt->bindParam(':password', $password);
$stmt->bindParam(':registration_date', $time);
$stmt->execute();
$_SESSION['username'] = $_POST['username'];
header('Location: ' . CONF['common']['prefix'] . '/');
success("Compte créé.");

16
public/css/form.css
View file

@ -35,22 +35,6 @@ input[type=password] {
width: 7ch; width: 7ch;
} }
input:invalid+span::after {
content: '✖';
}
input:valid+span::after {
content: ''; /* ✓ */
}
input+span::after {
display: inline-block;
width: 20px;
font-size: 30px;
padding-left: 20px;
font-family: monospace;
}
:disabled { :disabled {
cursor: not-allowed; cursor: not-allowed;
} }

2
public/ht/https-domain.php
View file

@ -9,7 +9,7 @@
<form method="post"> <form method="post">
<label for="domain">Domaine sur lequel répondre</label><br> <label for="domain">Domaine sur lequel répondre</label><br>
<input required="" placeholder="site.<?= CONF['common']['domain_example'] ?>" id="domain" name="domain" type="text"><br> <input required="" placeholder="site.<?= PLACEHOLDER_DOMAIN ?>" id="domain" name="domain" type="text"><br>
<label for="dir">Dossier ciblé</label><br> <label for="dir">Dossier ciblé</label><br>
<select required="" name="dir" id="dir"> <select required="" name="dir" id="dir">
<option value="" disabled="" selected="">---</option> <option value="" disabled="" selected="">---</option>

2
public/ns/ip.php
View file

@ -8,7 +8,7 @@
<form method="post"> <form method="post">
<?php require "../../form.ns.php"; ?> <?php require "../../form.ns.php"; ?>
<label for="ip">Adresse IP</label><br> <label for="ip">Adresse IP</label><br>
<input required="" pattern="^[a-f0-9:.]+$" id="ip" name="ip" minlength="7" maxlength="39" size="40" type="text" placeholder="<?= CONF['common']['ipv6_example'] ?> ou <?= CONF['common']['ipv4_example'] ?>"><br> <input required="" pattern="^[a-f0-9:.]+$" id="ip" name="ip" minlength="7" maxlength="39" size="40" type="text" placeholder="<?= PLACEHOLDER_IPV6 ?> ou <?= PLACEHOLDER_IPV4 ?>"><br>
<input value="Valider" type="submit"> <input value="Valider" type="submit">
</form> </form>

2
public/ns/mx.php
View file

@ -14,7 +14,7 @@
<label for="host">Hôte</label> <label for="host">Hôte</label>
<br> <br>
<input id="host" placeholder="mail.<?= CONF['common']['domain_example'] ?>." name="host" type="text"> <input id="host" placeholder="mail.<?= PLACEHOLDER_DOMAIN ?>." name="host" type="text">
<br> <br>
<input value="Valider" type="submit"> <input value="Valider" type="submit">

2
public/ns/ns.php
View file

@ -5,7 +5,7 @@
<br> <br>
<label for="ns">Serveur de nom</label> <label for="ns">Serveur de nom</label>
<br> <br>
<input id="ns" placeholder="ns1.<?= CONF['common']['domain_example'] ?>" name="ns" type="text"> <input id="ns" placeholder="ns1.<?= PLACEHOLDER_DOMAIN ?>" name="ns" type="text">
<br> <br>
<input value="Procéder" type="submit"> <input value="Procéder" type="submit">
</form> </form>

2
public/ns/srv.php
View file

@ -26,7 +26,7 @@
<label for="target">Cible</label> <label for="target">Cible</label>
<br> <br>
<input id="target" minlenght="1" maxlength="128" placeholder="service.<?= CONF['common']['domain_example'] ?>." name="target" type="text"> <input id="target" minlenght="1" maxlength="128" placeholder="service.<?= PLACEHOLDER_DOMAIN ?>." name="target" type="text">
<br> <br>
<input value="Valider" type="submit"> <input value="Valider" type="submit">

2
public/ns/zone.php
View file

@ -3,7 +3,7 @@
<form method="post"> <form method="post">
<h2>Ajouter une zone</h2> <h2>Ajouter une zone</h2>
<label for="domain">Domaine</label><br> <label for="domain">Domaine</label><br>
<input required="" placeholder="domain.<?= CONF['common']['domain_example'] ?>." id="domain" name="domain" type="text"><br> <input required="" placeholder="domain.<?= PLACEHOLDER_DOMAIN ?>." id="domain" name="domain" type="text"><br>
<input value="Ajouter" type="submit"> <input value="Ajouter" type="submit">
</form> </form>

2
public/reg/glue.php
View file

@ -30,7 +30,7 @@ if (isset($_SESSION['username']))
</div> </div>
</fieldset> </fieldset>
<label for="ip">IP</label><br> <label for="ip">IP</label><br>
<input required="" pattern="^[a-f0-9:.]+$" id="ip" name="ip" minlength="7" maxlength="39" size="40" type="text" placeholder="<?= CONF['common']['ipv4_example'] ?> ou <?= CONF['common']['ipv6_example'] ?>"> <input required="" pattern="^[a-f0-9:.]+$" id="ip" name="ip" minlength="7" maxlength="39" size="40" type="text" placeholder="<?= PLACEHOLDER_IPV4 ?> ou <?= PLACEHOLDER_IPV6 ?>">
<br> <br>
<input value="Valider" type="submit"> <input value="Valider" type="submit">
</form> </form>

2
public/reg/ns.php
View file

@ -21,7 +21,7 @@ if (isset($_SESSION['username']))
<br> <br>
<label for="ns">Serveur de nom</label> <label for="ns">Serveur de nom</label>
<br> <br>
<input id="ns" placeholder="ns1.<?= CONF['common']['domain_example'] ?>." name="ns" type="text"> <input id="ns" placeholder="ns1.<?= PLACEHOLDER_DOMAIN ?>." name="ns" type="text">
<br> <br>
<input value="Valider" type="submit"> <input value="Valider" type="submit">
</form> </form>