From 04ef1bd42bfaa8bbb9c20fc074eb1e983150906c Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 22 Dec 2017 23:37:30 +0100
Subject: [PATCH] auth: reusable functions for password verification

Page to change passwords will need to run the same code.
---
 auth.inc.php | 22 ++++++++++++++++------
 login.php    |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/auth.inc.php b/auth.inc.php
index 94f0dcc..fd11b13 100644
--- a/auth.inc.php
+++ b/auth.inc.php
@@ -1,4 +1,19 @@
 <?php
+function login_password_verify($input, $test)
+{
+	if (substr($test, 0, 1) != '$') {
+		# plaintext match for uncrypted passwords
+		return $input === $test;
+	}
+	return password_verify($input, $test);
+}
+
+function login_setcookie()
+{
+	global $User;
+	return setcookie('login', $User['auth'], 0, '/');
+}
+
 function login($inuser, $inpass = NULL)
 {
 	if (empty($inuser)) return;
@@ -16,12 +31,7 @@ function login($inuser, $inpass = NULL)
 	# verify password
 	$authhash = md5($usertest);
 	if (isset($inpass)) {
-		if (substr($usertest, 0, 1) == '$') {
-			if (!password_verify($inpass, $usertest)) return;
-		}
-		else {
-			if ($inpass !== $usertest) return;
-		}
+		if (!login_password_verify($inpass, $usertest)) return;
 	}
 	else {
 		if ($inauth !== $authhash) return;
diff --git a/login.php b/login.php
index f7b0b10..1c7dfe0 100644
--- a/login.php
+++ b/login.php
@@ -3,7 +3,7 @@ $message = NULL;
 
 if (isset($_POST['login'])) {
 	if ($User = login($_POST['login'], $_POST['pass'])) {
-		setcookie('login', $User['auth'], 0, '/');
+		login_setcookie();
 	}
 	else {
 		$message = 'Ongeldige gebruikersnaam of wachtwoord.';
-- 
2.30.0