l0v3ris/thunix-www
1
0
Fork 0
forked from Thunix/www
Code Pull Requests 2 Activity

minor fixes/updates

Browse Source
This commit is contained in:
root
2026-01-09 10:39:50 -07:00
parent ae59561267
commit 9d38dd8ede
5 changed files with 122 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
includes/signup.php
View File

@@ -1,23 +1,19 @@
<?php
// This code is licensed under the AGPL 3 or later by ubergeek (https://tildegit.org/ubergeek)
include "../config.php";
$name = $_GET['contact_name'];
$email = $_GET['email_address'];
$username = $_GET['username'];
$interest = $_GET['interest'];
$pubkey = $_GET['pubkey'];
$tv = $_GET['tv'];
$name = $_GET['contact_name'];
$email = $_GET['email_address'];
$username = $_GET['username'];
$interest = $_GET['interest'];
$pubkey = $_GET['pubkey'];
$tv = $_GET['tv'];
// username passed lowercased
$username = strtolower($username);
$pubkey = trim($pubkey);
// strip new line characters from the end
$pubkey = trim($pubkey);
$from = 'From: www-data <www-data@thunix.net>';
$destination_addr = "newuser@thunix.net";
$subject = "New User Registration";
$from = 'From: www-data <www-data@thunix.net>';
$destination_addr = 'newuser@thunix.net';
$subject = 'New User Registration';
$mailbody = "A new user has tried to register.
Username: $username
Real Name: $name
@@ -25,39 +21,29 @@ Email Address: $email
Interest: $interest
Pubkey: $pubkey";
// In the future, here, we *should* be able to build a process that
// somehow auto-verifies the user, and instead of email, it'll kick off the new user process here
$user_queue = '/dev/shm/userqueue';
$user_queue = '/dev/shm/userqueue';
// Spam attempt
$success = 'success1';
if ( $tv == "tildeverse" )
{
// Success!
$success = 'success2';
// Check if username already taken
if (posix_getpwnam($username)) {
$success = 'success3';
}
// Simple SSH public key format check
$valid_key_starts = ['ssh-rsa', 'ssh-dss', 'ecdsa-sha2', 'ssh-ed25519'];
$key_parts = explode(' ', $pubkey, 3);
if (!in_array($key_parts[0], $valid_key_starts) || count($key_parts) < 2) {
$success = 'success4';
}
if ($success == "success2") {
mail($destination_addr, $subject, $mailbody, $from);
$fp = fopen($user_queue, 'a');
fwrite($fp, "'$username','$email','$pubkey'\n");
fclose($fp);
}
if ($tv == 'tildeverse') {
$success = 'success2';
if (posix_getpwnam($username)) {
$success = 'success3';
}
$valid_key_starts = ['ssh-rsa', 'ssh-dss', 'ecdsa-sha2', 'ssh-ed25519'];
$key_parts = explode(' ', $pubkey, 3);
if (!in_array($key_parts[0], $valid_key_starts) || count($key_parts) < 2) {
$success = 'success4';
}
if ($success === 'success2') {
mail($destination_addr, $subject, $mailbody, $from);
$fp = fopen($user_queue, 'a');
fwrite($fp, "'$username','$email','$pubkey'\n");
fclose($fp);
$fp2 = fopen('/var/signups', 'a');
fwrite($fp2, 'makeuser ' . $username . ' ' . $email . ' "' . addslashes($pubkey) . "\"\n");
fclose($fp2);
}
}
header("Location: $site_root/?page=$success");
die();
?>