|
|
@@ -33,44 +33,38 @@ switchToFormProcess();
|
|
|
if ($dirsStatuses[$_POST['dir']] !== false)
|
|
|
userError("Wrong value for <code>dir</code>.");
|
|
|
|
|
|
-// Generate a .onion address
|
|
|
+// Add Tor config
|
|
|
$torConf = file_get_contents(CONF['ht']['tor_config_path']);
|
|
|
$torConf = $torConf . "HiddenServiceDir " . CONF['ht']['tor_keys_path'] . "/" . $_POST['dir'] . "/
|
|
|
HiddenServicePort 80 [::1]:" . CONF['ht']['internal_onion_http_port'] . "
|
|
|
";
|
|
|
file_put_contents(CONF['ht']['tor_config_path'], $torConf);
|
|
|
|
|
|
-exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload tor", $output);
|
|
|
-addNiverLog("Tor reloaded by " . $_SESSION['username'], $output);
|
|
|
-
|
|
|
-// Copy generated address to a location readable by PHP
|
|
|
-exec(CONF['ht']['sudo_path'] . " " . MANIVER_PATH . " export-tor " . $_SESSION['username'] . " " . $_POST['dir'], $output);
|
|
|
-addNiverLog("Tor data exported by " . $_SESSION['username'], $output);
|
|
|
-
|
|
|
-// Wait
|
|
|
-sleep(1);
|
|
|
+// Reload Tor
|
|
|
+exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload " . CONF['ht']['tor_service'], $output);
|
|
|
|
|
|
// Get the address generated by Tor
|
|
|
-$onion = file_get_contents(CONF['ht']['ht_path'] . "/" . $_SESSION['username'] . "/" . $_POST['dir'] . "/hostname");
|
|
|
-$onion = str_replace(array("\r", "\n"), "", $onion);
|
|
|
+exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['cat_path'] . " " . CONF['ht']['tor_keys_path'] . "/" . $_POST['dir'] . "/hostname", $output);
|
|
|
+$onion = $output[0];
|
|
|
if (preg_match("/[0-9a-z]{56}\.onion/", $onion) !== 1)
|
|
|
serverError("No onion address found.");
|
|
|
|
|
|
// Store it in the database
|
|
|
addSite($_SESSION['username'], $_POST['dir'], $onion, "onion", "http");
|
|
|
|
|
|
-// Add it to Nginx
|
|
|
-$nginxConf = file_get_contents(NIVER_TEMPLATE_PATH . "/nginx/onion.template");
|
|
|
-$nginxConf = str_replace("{{CONF['ht']['internal_onion_http_port']}}", CONF['ht']['internal_onion_http_port'], $nginxConf);
|
|
|
-$nginxConf = str_replace("{{DOMAIN}}", $onion, $nginxConf);
|
|
|
-$nginxConf = str_replace("{{CONF['ht']['ht_path']}}", CONF['ht']['ht_path'], $nginxConf);
|
|
|
-$nginxConf = str_replace("{{USERNAME}}", $_SESSION['username'], $nginxConf);
|
|
|
-$nginxConf = str_replace("{{DIR}}", $_POST['dir'], $nginxConf);
|
|
|
-file_put_contents(CONF['ht']['nginx_config_path'] . "/" . $_POST['dir'] . ".conf", $nginxConf);
|
|
|
+// Add Nginx config
|
|
|
+$nginxConf = 'server {
|
|
|
+ listen [::1]:' . CONF['ht']['internal_onion_http_port'] . ';
|
|
|
+ server_name ' . $onion . ';
|
|
|
+ root ' . CONF['ht']['ht_path'] . '/' . $_SESSION['username'] . '/' . $_POST['dir'] . ';
|
|
|
+
|
|
|
+ include inc/ht-onion.conf;
|
|
|
+}
|
|
|
+';
|
|
|
+file_put_contents(CONF['ht']['nginx_config_path'] . "/" . $onion . ".conf", $nginxConf);
|
|
|
|
|
|
// Reload Nginx
|
|
|
-exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx", $output);
|
|
|
-addNiverLog("Nginx reloaded by " . $_SESSION['username'], $output);
|
|
|
+exec(CONF['ht']['sudo_path'] . " " . CONF['ht']['systemctl_path'] . " reload nginx");
|
|
|
|
|
|
// Tell the user their site address
|
|
|
success("L'adresse de votre service Onion HTTP est : <a href='http://" . $onion . "/'<code>http://" . $onion . "/</code></a>");
|
Miraty