From 0d421af86fdfe270e7396f308cf53f3b908e3d74 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 16 Aug 2012 15:30:35 +0400 Subject: split authentication to separate modules --- classes/auth_base.php | 55 ++++++++++++++++++++++++++++++++++ classes/auth_internal.php | 75 +++++++++++++++++++++++++++++++++++++++++++++++ classes/auth_remote.php | 61 ++++++++++++++++++++++++++++++++++++++ classes/pref_prefs.php | 4 +-- 4 files changed, 193 insertions(+), 2 deletions(-) create mode 100644 classes/auth_base.php create mode 100644 classes/auth_internal.php create mode 100644 classes/auth_remote.php (limited to 'classes') diff --git a/classes/auth_base.php b/classes/auth_base.php new file mode 100644 index 000000000..8c819b668 --- /dev/null +++ b/classes/auth_base.php @@ -0,0 +1,55 @@ +link = $link; + } + + function authenticate($login, $password) { + return false; + } + + // Auto-creates specified user if allowed by system configuration + // Can be used instead of find_user_by_login() by external auth modules + function auto_create_user($login) { + if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) { + $user_id = $this->find_user_by_login($login); + + if (!$user_id) { + $login = db_escape_string($login); + $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); + $pwd_hash = encrypt_password($password, $salt, true); + + $query = "INSERT INTO ttrss_users + (login,access_level,last_login,created,pwd_hash,salt) + VALUES ('$login', 0, null, NOW(), '$pwd_hash','$salt')"; + + db_query($this->link, $query); + + return $this->find_user_by_login($login); + + } else { + return $user_id; + } + } + + return false; + } + + function find_user_by_login($login) { + $login = db_escape_string($login); + + $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE + login = '$login'"); + + if (db_num_rows($result) > 0) { + return db_fetch_result($result, 0, "id"); + } else { + return false; + } + + } +} + +?> diff --git a/classes/auth_internal.php b/classes/auth_internal.php new file mode 100644 index 000000000..b4c473f21 --- /dev/null +++ b/classes/auth_internal.php @@ -0,0 +1,75 @@ +link) > 87) { + + $result = db_query($this->link, "SELECT salt FROM ttrss_users WHERE + login = '$login'"); + + if (db_num_rows($result) != 1) { + return false; + } + + $salt = db_fetch_result($result, 0, "salt"); + + if ($salt == "") { + + $query = "SELECT id + FROM ttrss_users WHERE + login = '$login' AND (pwd_hash = '$pwd_hash1' OR + pwd_hash = '$pwd_hash2')"; + + // verify and upgrade password to new salt base + + $result = db_query($this->link, $query); + + if (db_num_rows($result) == 1) { + // upgrade password to MODE2 + + $salt = substr(bin2hex(get_random_bytes(125)), 0, 250); + $pwd_hash = encrypt_password($password, $salt, true); + + db_query($this->link, "UPDATE ttrss_users SET + pwd_hash = '$pwd_hash', salt = '$salt' WHERE login = '$login'"); + + $query = "SELECT id + FROM ttrss_users WHERE + login = '$login' AND pwd_hash = '$pwd_hash'"; + + } else { + return false; + } + + } else { + + $pwd_hash = encrypt_password($password, $salt, true); + + $query = "SELECT id + FROM ttrss_users WHERE + login = '$login' AND pwd_hash = '$pwd_hash'"; + + } + + } else { + $query = "SELECT id + FROM ttrss_users WHERE + login = '$login' AND (pwd_hash = '$pwd_hash1' OR + pwd_hash = '$pwd_hash2')"; + } + + $result = db_query($this->link, $query); + + if (db_num_rows($result) == 1) { + return db_fetch_result($result, 0, "id"); + } + + return false; + } +} +?> diff --git a/classes/auth_remote.php b/classes/auth_remote.php new file mode 100644 index 000000000..6892a3528 --- /dev/null +++ b/classes/auth_remote.php @@ -0,0 +1,61 @@ +link, "SELECT login FROM ttrss_user_prefs, ttrss_users + WHERE pref_name = 'SSL_CERT_SERIAL' AND value = '$cert_serial' AND + owner_uid = ttrss_users.id"); + + if (db_num_rows($result) != 0) { + return db_escape_string(db_fetch_result($result, 0, "login")); + } + } + + return ""; + } + + + function authenticate($login, $password) { + $try_login = db_escape_string($_SERVER["REMOTE_USER"]); + + if (!$try_login) $try_login = $this->get_login_by_ssl_certificate(); +# if (!$try_login) $try_login = "test_qqq"; + + if ($try_login) { + $user_id = $this->auto_create_user($try_login); + + if ($user_id) { + $_SESSION["fake_login"] = $try_login; + $_SESSION["fake_password"] = "******"; + $_SESSION["hide_hello"] = true; + $_SESSION["hide_logout"] = true; + + // LemonLDAP can send user informations via HTTP HEADER + if (defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE){ + // update user name + $fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN']; + if ($fullname){ + $fullname = db_escape_string($fullname); + db_query($this->link, "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " . + $user_id); + } + // update user mail + $email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL']; + if ($email){ + $email = db_escape_string($email); + db_query($this->link, "UPDATE ttrss_users SET email = '$email' WHERE id = " . + $user_id); + } + } + + return $user_id; + } + } + + return false; + } +} + +?> diff --git a/classes/pref_prefs.php b/classes/pref_prefs.php index 4801399e2..a51fad2a4 100644 --- a/classes/pref_prefs.php +++ b/classes/pref_prefs.php @@ -197,7 +197,7 @@ class Pref_Prefs extends Protected_Handler { print "".__('E-mail').""; print ""; - if (!SINGLE_USER_MODE && !(ALLOW_REMOTE_USER_AUTH && AUTO_LOGIN)) { + if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) { $access_level = db_fetch_result($result, 0, "access_level"); print "".__('Access level').""; @@ -214,7 +214,7 @@ class Pref_Prefs extends Protected_Handler { print ""; - if (!SINGLE_USER_MODE && !(ALLOW_REMOTE_USER_AUTH && AUTO_LOGIN)) { + if (!SINGLE_USER_MODE && !$_SESSION["hide_logout"]) { $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE id = ".$_SESSION["uid"]." AND pwd_hash -- cgit v1.2.3