X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/59d16d1daa1748a056efc2317510fd3d541b7144..d955f2d0837ca4c145546f56a8fe0d3a87f59052:/auth.inc.php

diff --git a/auth.inc.php b/auth.inc.php
old mode 100755
new mode 100644
index 6a5d1d2..030a394
--- a/auth.inc.php
+++ b/auth.inc.php
@@ -1,38 +1,61 @@
 <?php
-global $User, $editable;
-$User = FALSE;
+date_default_timezone_set('Europe/Amsterdam');
 
-function Auth() {
-	if (isset($_SERVER['PHP_AUTH_USER'])) {
-		$authinfo = [ $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] ];
-	}
-	elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
-		// cgi compatibility
-		$authinfo = explode(':' , base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
-	}
-	else {
-		return;
+function login_password_verify($input, $test)
+{
+	if (substr($test, 0, 1) != '$') {
+		# plaintext match for uncrypted passwords
+		return $input === $test;
 	}
+	return password_verify($input, $test);
+}
 
-	$pwdata = file_get_contents(__DIR__.'/.htpasswd');
-	$pwlist = [];
-	foreach (explode("\n", $pwdata) as $line) {
-		if (!$line) continue;
-		list ($username, $pass) = explode(':', $line);
-		$pwlist[$username] = $pass;
+function login_setcookie()
+{
+	global $User;
+	return setcookie('login', $User['auth'], 0, '/');
+}
+
+function login($inuser, $inpass = NULL)
+{
+	if (empty($inuser)) return;
+	if (!isset($inpass)) {
+		@list ($inuser, $inauth) = explode(':', $inuser, 2);
 	}
 
-	list ($authname, $authpass) = $authinfo;
-	$usertest = $pwlist[ strtolower($authname) ];
+	# find password data by user name
+	$userdir = 'profile/'.preg_replace('/[^a-z0-9]+/', '-', strtolower($inuser));
+	$pwfile = "$userdir/.passwd";
+	if (!file_exists($pwfile)) return;
+	$usertest = trim(file_get_contents($pwfile));
 	if (!$usertest) return;
 
-	$salt = substr($usertest, 0, 2);
-	if (crypt($authpass, $salt) != $usertest) return;
+	# verify password
+	$authhash = md5($usertest);
+	if (isset($inpass)) {
+		if (!login_password_verify($inpass, $usertest)) return;
+	}
+	else {
+		if ($inauth !== $authhash) return;
+	}
+
+	if (function_exists('apache_note')) apache_note('user', $inuser);
 
-	$GLOBALS['User'] = $authname;
-}
+	if ($log = @fopen("$userdir/last.log", 'w')) {
+		fwrite($log, "{$_SERVER['REMOTE_ADDR']} {$_SERVER['HTTP_USER_AGENT']}\n");
+	}
 
-Auth();
+	return [
+		'name'  => $inuser,
+		'dir'   => $userdir,
+		'admin' => file_exists("$userdir/.admin"),
+		'pass'  => $usertest,
+		'auth'  => "$inuser:$authhash",
+	];
+}
 
-$editable = !empty($User) && $User != 'lid';
+if (isset($_COOKIE['login'])) {
+	global $User;
+	$User = login($_COOKIE['login']);
+}