Skip to content
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

Jump to bottom

Automatically detect ldap password change #4323

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Automatically detect ldap password change #4323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8be434
Automatically detect LDAP password changes and immediately prompt the…
corentin-soriano Sep 16, 2024
908668b
Fix issue with user key re-encryption when a sharekey is missing.
corentin-soriano Sep 16, 2024
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
3 changes: 3 additions & 0 deletions includes/core/load.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ function(teampassUser) {

// Show form
$('#dialog-ldap-user-change-password').removeClass('hidden');
$('#dialog-ldap-user-change-password-info')
.html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password');?>')
.removeClass('hidden');
} else if (typeof data.queryResults !== 'undefined' && data.queryResults.keys_recovery_time === null && store.get('teampassUser').user_admin === 0) {
// User has not yet recovered his keys
$('#open_user_keys_management').removeClass('hidden');
Expand Down
18 changes: 17 additions & 1 deletion sources/identify.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,23 @@ function identifyUser(string $sentData, array $SETTINGS): bool
// User signature keys
$returnKeys = prepareUserEncryptionKeys($userInfo, $passwordClear);
$session->set('user-private_key', $returnKeys['private_key_clear']);
$session->set('user-public_key', $returnKeys['public_key']);
$session->set('user-public_key', $returnKeys['public_key']);

// Automatically detect LDAP password changes.
if ($userInfo['auth_type'] === 'ldap' && $returnKeys['private_key_clear'] === '') {
// Add special "recrypt-private-key" in database profile.
DB::update(
prefixTable('users'),
array(
'special' => 'recrypt-private-key',
),
'id = %i',
$userInfo['id']
);

// Store new value in userInfos.
$userInfo['special'] = 'recrypt-private-key';
}

// API key
$session->set(
Expand Down
16 changes: 4 additions & 12 deletions sources/main.queries.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3083,24 +3083,16 @@ function changeUserLDAPAuthenticationPassword(
);
}

// Test if possible to decvrypt one key
// Get one item
$record = DB::queryFirstRow(
'SELECT id, pw
FROM ' . prefixTable('items') . '
WHERE perso = 0'
);

// Get itemKey from current user
// Get one itemKey from current user
$currentUserKey = DB::queryFirstRow(
'SELECT share_key, increment_id
FROM ' . prefixTable('sharekeys_items') . '
WHERE object_id = %i AND user_id = %i',
$record['id'],
WHERE user_id = %i
LIMIT 1',
$post_user_id
);

if (count($currentUserKey) > 0) {
if (is_countable($currentUserKey) && count($currentUserKey) > 0) {
// Decrypt itemkey with user key
// use old password to decrypt private_key
$itemKey = decryptUserObjectKey($currentUserKey['share_key'], $privateKey);
Expand Down