Skip to content

YOURLS version 1.9.2 functionality #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

YOURLS version 1.9.2 functionality #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f640ec0
Initial commits like #28
mattv8 May 9, 2024
2d3f2e3
Merge branch 'master' into yourls-8.1-compatibility
mattv8 Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,10 @@ function ldapauth_environment_check()
return true;
}


yourls_add_filter('is_valid_user', 'ldapauth_is_valid_user');
# Reroute login to yourls filter
# (see https://github.com/YOURLS/YOURLS/wiki/Advanced-Hook-Syntax)
//yourls_add_filter( 'is_valid_user', 'ldapauth_is_valid_user' );
yourls_add_filter('shunt_is_valid_user', 'ldapauth_is_valid_user');
Copy link
Owner Author

@mattv8 mattv8 Sep 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOTE: I need to review the security implications of shunt_is_valid_user before I am comfortable merging this PR.


function ldapauth_shuffle_assoc($list)
{
Expand Down Expand Up @@ -290,6 +292,7 @@ function ldapauth_is_valid_user($value)
$_SESSION['LDAPAUTH_AUTH_USER'] = $username;
}
return true;
ldapauth_debug("User $username was successfully authenticated");
} else {
error_log("No LDAP success");
}
Expand Down Expand Up @@ -351,7 +354,7 @@ function ldapauth_merge_users()
*/
function ldapauth_create_user($user, $new_password)
{
$configdata = file_get_contents(YOURLS_CONFIGFILE);
$configdata = htmlspecialchars(file_get_contents(YOURLS_CONFIGFILE));
if ($configdata == FALSE) {
die('Couldn\'t read the config file');
}
Expand All @@ -360,18 +363,18 @@ function ldapauth_create_user($user, $new_password)
die('Can\'t write to config file');

$pass_hash = ldapauth_hash_password($new_password);
$user_line = "\t'$user' => 'phpass:$pass_hash' /* Password encrypted by YOURLS */,";
$user_line = "\t'$user' => 'phpass:$pass_hash' /* LDAP user added by plugin */,";

// Add the user on a new line after the start of the passwords array
$new_contents = preg_replace('/(yourls_user_passwords\s=\sarray\()/', '$0 ' . PHP_EOL . $user_line, $configdata, -1, $count);
$new_contents = preg_replace('/\$yourls_user_passwords\s=\s\[/', '$0 ' . PHP_EOL . $user_line, $configdata, -1, $count);

if ($count === 0) {
die('Couldn\'t add user, plugin may not be compatible with YourLS version');
} else if ($count > 1) {
die('Added user more than once. Check config file.');
}

$success = file_put_contents(YOURLS_CONFIGFILE, $new_contents);
$success = file_put_contents(YOURLS_CONFIGFILE, htmlspecialchars_decode($new_contents));
if ($success === false) {
die('Unable to save config file');
}
Expand Down