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

Create and use switchToFormProcess() and success()

Browse source
This commit is contained in:
Miraty 2022-05-31 17:31:48 +02:00
parent cd082e8719
commit eadc2d44e3
16 changed files with 266 additions and 355 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/init.php
View file

@ -15,15 +15,30 @@ if (SERVICE !== "")
// Page titles definition // Page titles definition
require "pages.php"; require "pages.php";
function success($msg) {
echo "<p><strong>Succès</strong> : <em>" . $msg . "</em></p>";
closeHTML();
}
// When the user requests something unexpected
function userError($msg) { function userError($msg) {
http_response_code(403); http_response_code(403);
echo "<p><strong>Erreur utilisataire</strong> : <em>" . $msg . "</em></p>"; echo "<p><strong>Erreur utilisataire</strong> : <em>" . $msg . "</em></p>";
closeHTML(); closeHTML();
} }
// When the system did something unexpected
function serverError($msg) { function serverError($msg) {
http_response_code(500); http_response_code(500);
error_log("Niver internal error: " . strip_tags($msg)); error_log("Niver internal error: " . strip_tags($msg));
echo "<p><strong>Server error</strong>: The server encountered an error: <em>" . $msg . "</em></p>"; echo "<p><strong>Server error</strong>: The server encountered an error: <em>" . $msg . "</em></p>";
closeHTML(); closeHTML();
} }
// For use in pages that first display a form and then process it
function switchToFormProcess($requireLogin = true) {
if (empty($_POST))
closeHTML();
if ($requireLogin AND !isset($_SESSION['username']))
userError("Vous devez être connecté·e pour effectuer cette action.");
}

10
public/ht/http-onion.php
View file

@ -28,7 +28,7 @@ if (isset($_SESSION['username'])) {
<?php <?php
if (isset($_POST['dir']) AND isset($_SESSION['username'])) { switchToFormProcess();
if ($dirsStatuses[$_POST['dir']] !== false) if ($dirsStatuses[$_POST['dir']] !== false)
userError("Wrong value for <code>dir</code>."); userError("Wrong value for <code>dir</code>.");
@ -73,10 +73,4 @@ HiddenServicePort 80 [::1]:" . CONF['ht']['internal_onion_http_port'] . "
addNiverLog("Nginx reloaded by " . $_SESSION['username'], $output); addNiverLog("Nginx reloaded by " . $_SESSION['username'], $output);
// Tell the user their site address // Tell the user their site address
echo "<p>L'adresse de votre site Onion HTTP est :<br><a href='http://" . $onion . "'<code>http://" . $onion . "</code></a></p>"; success("L'adresse de votre service Onion HTTP est : <a href='http://" . $onion . "/'<code>http://" . $onion . "/</code></a>");
}
?>
<?php closeHTML(); ?>

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

@ -34,7 +34,7 @@ if (isset($_SESSION['username'])) {
<?php <?php
if (isset($_POST['domain']) AND isset($_POST['dir']) AND isset($_SESSION['username'])) { switchToFormProcess();
checkDomainFormat($_POST['domain']); checkDomainFormat($_POST['domain']);
@ -60,9 +60,4 @@ if (isset($_POST['domain']) AND isset($_POST['dir']) AND isset($_SESSION['userna
// Reload Nginx // Reload Nginx
exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx"); exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx");
echo "Accès HTTP par domaine ajouté sur ce dossier !"; success("Accès HTTP par domaine ajouté sur ce dossier !");
}
?>
<?php closeHTML(); ?>

11
public/ht/le.php
View file

@ -20,7 +20,7 @@
<?php <?php
if (isset($_POST['domain']) AND isset($_SESSION['username'])) { switchToFormProcess();
exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['certbot_path'] . " certonly --dry-run --test-cert --webroot --webroot-path /srv/acme --register-unsafely-without-email --agree-tos --domain " . $_POST['domain'], $output, $returnCode); exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['certbot_path'] . " certonly --dry-run --test-cert --webroot --webroot-path /srv/acme --register-unsafely-without-email --agree-tos --domain " . $_POST['domain'], $output, $returnCode);
@ -38,15 +38,10 @@ if (isset($_POST['domain']) AND isset($_SESSION['username'])) {
file_put_contents(CONF['ht']['nginx_config_path'] . "/" . $_POST['domain'] . ".conf", $conf); file_put_contents(CONF['ht']['nginx_config_path'] . "/" . $_POST['domain'] . ".conf", $conf);
// Reload Nginx // Reload Nginx
exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx reload", $output, $returnCode); exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx", $output, $returnCode);
// Abort if Nginx reload failed // Abort if Nginx reload failed
if ($returnCode !== 0) if ($returnCode !== 0)
serverError("Nginx configuration reload failed."); serverError("Nginx configuration reload failed.");
echo "Succès : La connexion avec votre site utilise désomais un certificat TLS émis par Let's Encrypt."; success("La connexion avec votre site utilise désomais un certificat TLS émis par Let's Encrypt.");
}
?>
<?php closeHTML(); ?>

16
public/ns/caa.php
View file

@ -22,11 +22,8 @@
<?php <?php
if (nsCommonRequirements() switchToFormProcess();
AND isset($_POST['flag'])
AND isset($_POST['tag'])
AND isset($_POST['value'])
) {
$values = nsParseCommonRequirements(); $values = nsParseCommonRequirements();
@ -48,11 +45,4 @@ if (nsCommonRequirements()
$_POST['value'] $_POST['value']
)); ));
echo "Enregistrement ajouté"; success("Enregistrement ajouté");
}
?>
<?php closeHTML(); ?>

12
public/ns/ip.php
View file

@ -13,9 +13,8 @@
</form> </form>
<?php <?php
if (nsCommonRequirements()
AND isset($_POST['ip']) switchToFormProcess();
) {
$values = nsParseCommonRequirements(); $values = nsParseCommonRequirements();
@ -28,9 +27,4 @@ if (nsCommonRequirements()
$_POST['ip'] $_POST['ip']
)); ));
echo "Enregistrement ajouté"; success("Enregistrement ajouté");
}
?>
<?php closeHTML(); ?>

12
public/ns/mx.php
View file

@ -22,10 +22,7 @@
<?php <?php
if (nsCommonRequirements() switchToFormProcess();
AND isset($_POST['priority'])
AND isset($_POST['host'])
) {
$values = nsParseCommonRequirements(); $values = nsParseCommonRequirements();
@ -42,9 +39,4 @@ if (nsCommonRequirements()
$_POST['host'] $_POST['host']
)); ));
echo "Enregistrement ajouté"; success("Enregistrement ajouté");
}
?>
<?php closeHTML(); ?>

12
public/ns/ns.php
View file

@ -11,9 +11,8 @@
</form> </form>
<?php <?php
if (nsCommonRequirements()
AND isset($_POST['ns']) switchToFormProcess();
) {
$values = nsParseCommonRequirements(); $values = nsParseCommonRequirements();
@ -26,9 +25,4 @@ if (nsCommonRequirements()
$_POST['ns'] $_POST['ns']
)); ));
echo "Enregistrement ajouté"; success("Enregistrement ajouté");
}
?>
<?php closeHTML(); ?>

14
public/ns/srv.php
View file

@ -34,12 +34,7 @@
<?php <?php
if (nsCommonRequirements() switchToFormProcess();
AND isset($_POST['priority'])
AND isset($_POST['weight'])
AND isset($_POST['port'])
AND isset($_POST['target'])
) {
$values = nsParseCommonRequirements(); $values = nsParseCommonRequirements();
@ -64,9 +59,4 @@ if (nsCommonRequirements()
$_POST['target'] $_POST['target']
)); ));
echo "Enregistrement ajouté"; success("Enregistrement ajouté");
}
?>
<?php closeHTML(); ?>

12
public/ns/sshfp.php
View file

@ -35,10 +35,7 @@
<?php <?php
if (nsCommonRequirements() switchToFormProcess();
AND isset($_POST['algo'])
AND isset($_POST['fp'])
) {
$values = nsParseCommonRequirements(); $values = nsParseCommonRequirements();
@ -60,9 +57,4 @@ if (nsCommonRequirements()
$_POST['fp'] $_POST['fp']
)); ));
echo "Enregistrement ajouté"; success("Enregistrement ajouté");
}
?>
<?php closeHTML(); ?>

16
public/ns/tlsa.php
View file

@ -44,12 +44,7 @@
<?php <?php
if (nsCommonRequirements() switchToFormProcess();
AND isset($_POST['use'])
AND isset($_POST['selector'])
AND isset($_POST['type'])
AND isset($_POST['content'])
) {
$values = nsParseCommonRequirements(); $values = nsParseCommonRequirements();
@ -75,11 +70,4 @@ if (nsCommonRequirements()
$_POST['content'] $_POST['content']
)); ));
echo "Enregistrement ajouté"; success("Enregistrement ajouté");
}
?>
<?php closeHTML(); ?>

12
public/ns/txt.php
View file

@ -11,9 +11,8 @@
</form> </form>
<?php <?php
if (nsCommonRequirements()
AND isset($_POST['txt']) switchToFormProcess();
) {
$values = nsParseCommonRequirements(); $values = nsParseCommonRequirements();
@ -27,9 +26,4 @@ if (nsCommonRequirements()
"\"" . $_POST['txt'] . "\"" "\"" . $_POST['txt'] . "\""
)); ));
echo "Enregistrement ajouté"; success("Enregistrement ajouté");
}
?>
<?php closeHTML(); ?>

9
public/reg/ds.php
View file

@ -64,7 +64,7 @@ foreach($domains as $domain)
<?php <?php
if (isset($_POST['zone']) AND isset($_POST['keytag']) AND isset($_POST['algo']) AND isset($_POST['key']) AND isset($_SESSION['username'])) { switchToFormProcess();
if ( if (
($_POST['algo'] !== "8") ($_POST['algo'] !== "8")
@ -97,9 +97,4 @@ if (isset($_POST['zone']) AND isset($_POST['keytag']) AND isset($_POST['algo'])
$_POST['key'] $_POST['key']
)); ));
echo "La requête a été envoyée à Knot"; success("La requête a été envoyée à Knot");
}
?>
<?php closeHTML(); ?>

11
public/reg/glue.php
View file

@ -37,7 +37,7 @@ if (isset($_SESSION['username']))
<?php <?php
if (isset($_POST['action']) AND isset($_POST['subdomain']) AND isset($_POST['suffix']) AND isset($_POST['ip']) AND isset($_SESSION['username'])) { switchToFormProcess();
regCheckDomainPossession($_POST['suffix']); regCheckDomainPossession($_POST['suffix']);
@ -50,15 +50,10 @@ if (isset($_POST['action']) AND isset($_POST['subdomain']) AND isset($_POST['suf
$publicSuffix = regGetUpperDomain($_POST['suffix']); $publicSuffix = regGetUpperDomain($_POST['suffix']);
knotcExec($publicSuffix, array( knotcExec($publicSuffix, array(
$domain $domain,
CONF['reg']['ttl'], CONF['reg']['ttl'],
$record, $record,
$_POST['ip'] $_POST['ip']
)); ));
echo "Glue record ajouté"; success("Glue record ajouté");
}
?>
<?php closeHTML(); ?>

15
public/reg/ns.php
View file

@ -11,13 +11,11 @@
<br> <br>
<select required="" name="domain" id="domain"> <select required="" name="domain" id="domain">
<option value="" disabled="" selected="">---</option> <option value="" disabled="" selected="">---</option>
<?php <?php
foreach(regListUserDomains($_SESSION['username']) as $suffix) foreach(regListUserDomains($_SESSION['username']) as $suffix)
echo " <option value='" . $suffix . "'>." . $suffix . "</option>"; echo " <option value='" . $suffix . "'>." . $suffix . "</option>\n";
?> ?>
</select> </select>
<br> <br>
<label for="ns">Serveur de nom</label> <label for="ns">Serveur de nom</label>
@ -29,7 +27,7 @@
<?php <?php
if (isset($_POST['domain']) AND isset($_POST['action']) AND isset($_POST['ns']) AND isset($_SESSION['username'])) { switchToFormProcess();
regCheckDomainPossession($_POST['domain']); regCheckDomainPossession($_POST['domain']);
checkAbsoluteDomainFormat($_POST['ns']); checkAbsoluteDomainFormat($_POST['ns']);
@ -43,9 +41,4 @@ if (isset($_POST['domain']) AND isset($_POST['action']) AND isset($_POST['ns'])
$_POST['ns'] $_POST['ns']
)); ));
echo "Modification effectuée avec succès"; success("Modification effectuée avec succès");
}
?>
<?php closeHTML(); ?>

9
public/reg/register.php
View file

@ -15,7 +15,7 @@ Ce domaine doit être composé uniquement d'au moins 4 lettres latines non accen
<?php <?php
if (isset($_POST['subdomain']) AND isset($_SESSION['username'])) { switchToFormProcess();
if (preg_match("/" . CONF['reg']['subdomain_regex'] . "/", $_POST['subdomain']) !== 1) if (preg_match("/" . CONF['reg']['subdomain_regex'] . "/", $_POST['subdomain']) !== 1)
userError("Erreur : Le nom de domaine doit être composé uniquement d'entre 4 et 63 lettres minuscules (a-z)"); userError("Erreur : Le nom de domaine doit être composé uniquement d'entre 4 et 63 lettres minuscules (a-z)");
@ -38,9 +38,4 @@ if (isset($_POST['subdomain']) AND isset($_SESSION['username'])) {
$stmt->execute(); $stmt->execute();
echo "Nouveau domaine enregistré"; success("Modification effectuée avec succès");
}
?>
<?php closeHTML(); ?>