@@ -81,8 +81,9 @@ discard block |
||
| 81 | 81 | $session = SessionManager::getSession(); |
| 82 | 82 | |
| 83 | 83 | // Random encryption key |
| 84 | -if ($session->get('key') === null) |
|
| 84 | +if ($session->get('key') === null) { |
|
| 85 | 85 | $session->set('key', generateQuickPassword(30, false)); |
| 86 | +} |
|
| 86 | 87 | |
| 87 | 88 | $request = SymfonyRequest::createFromGlobals(); |
| 88 | 89 | $configManager = new ConfigManager(__DIR__, $request->getRequestUri()); |
@@ -943,7 +944,10 @@ discard block |
||
| 943 | 944 | <input type="password" class="form-control" id="dialog-ldap-user-build-keys-database-code"> |
| 944 | 945 | <br/> |
| 945 | 946 | </div> |
| 946 | - <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') echo ' hidden'; ?>"> |
|
| 947 | + <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') { |
|
| 948 | + echo ' hidden'; |
|
| 949 | +} |
|
| 950 | +?>"> |
|
| 947 | 951 | <div class="input-group-prepend"> |
| 948 | 952 | <span class="input-group-text"><?php echo $lang->get('provide_your_current_password'); ?></span> |
| 949 | 953 | </div> |
@@ -301,7 +301,9 @@ |
||
| 301 | 301 | break; |
| 302 | 302 | } |
| 303 | 303 | |
| 304 | - if (WIP === true) error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key); |
|
| 304 | + if (WIP === true) { |
|
| 305 | + error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key); |
|
| 306 | + } |
|
| 305 | 307 | |
| 306 | 308 | include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
| 307 | 309 | |
@@ -1223,7 +1223,9 @@ discard block |
||
| 1223 | 1223 | ); |
| 1224 | 1224 | |
| 1225 | 1225 | // Create a task to create sharekeys for users |
| 1226 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1226 | + if (WIP=== true) { |
|
| 1227 | + error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1228 | + } |
|
| 1227 | 1229 | $tasksToBePerformed = ['item_password']; |
| 1228 | 1230 | $encryptionTaskIsRequested = true; |
| 1229 | 1231 | } else { |
@@ -1539,7 +1541,9 @@ discard block |
||
| 1539 | 1541 | |
| 1540 | 1542 | // create a task for all fields updated |
| 1541 | 1543 | if ($encryptionTaskIsRequested === true) { |
| 1542 | - if (WIP === true) error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1544 | + if (WIP === true) { |
|
| 1545 | + error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1546 | + } |
|
| 1543 | 1547 | createTaskForItem( |
| 1544 | 1548 | 'item_update_create_keys', |
| 1545 | 1549 | $tasksToBePerformed, |
@@ -2046,7 +2050,9 @@ discard block |
||
| 2046 | 2050 | $inputData['itemId'] |
| 2047 | 2051 | ); |
| 2048 | 2052 | foreach ($rows as $record) { |
| 2049 | - if ($record['raison'] === NULL) continue; |
|
| 2053 | + if ($record['raison'] === NULL) { |
|
| 2054 | + continue; |
|
| 2055 | + } |
|
| 2050 | 2056 | $reason = explode(':', $record['raison']); |
| 2051 | 2057 | if (count($reason) > 0) { |
| 2052 | 2058 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -4559,7 +4565,9 @@ discard block |
||
| 4559 | 4565 | $inputData['itemId'] |
| 4560 | 4566 | ); |
| 4561 | 4567 | |
| 4562 | - if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
|
| 4568 | + if (WIP === true) { |
|
| 4569 | + error_log('Existing edition locks: '.DB::count()); |
|
| 4570 | + } |
|
| 4563 | 4571 | |
| 4564 | 4572 | // Check if item has no edition lock |
| 4565 | 4573 | if ((int) DB::count() > 0 ) { |
@@ -4572,7 +4580,9 @@ discard block |
||
| 4572 | 4580 | } else { |
| 4573 | 4581 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 4574 | 4582 | } |
| 4575 | - if (WIP === true) error_log('delay: ' . $delay); |
|
| 4583 | + if (WIP === true) { |
|
| 4584 | + error_log('delay: ' . $delay); |
|
| 4585 | + } |
|
| 4576 | 4586 | |
| 4577 | 4587 | // We remove old edition locks if delay is expired meaning more than 1 day long |
| 4578 | 4588 | if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
@@ -4580,7 +4590,9 @@ discard block |
||
| 4580 | 4590 | // In this case, delete edition lock and possible ongoing processes |
| 4581 | 4591 | // and continue editing this time |
| 4582 | 4592 | // We coonsidere if the most recent item is still locked then all other locks can be removed |
| 4583 | - if (WIP === true) error_log('Delay is expired, removing old locks'); |
|
| 4593 | + if (WIP === true) { |
|
| 4594 | + error_log('Delay is expired, removing old locks'); |
|
| 4595 | + } |
|
| 4584 | 4596 | foreach ($dataItemEditionLocks as $itemEditionLock) { |
| 4585 | 4597 | // delete lock |
| 4586 | 4598 | DB::delete( |
@@ -4847,8 +4859,9 @@ discard block |
||
| 4847 | 4859 | $ids = $tree->getDescendants($folder['id'], true, false, true); |
| 4848 | 4860 | |
| 4849 | 4861 | // This folder is owned by user |
| 4850 | - if (in_array($inputData['folderId'], $ids)) |
|
| 4851 | - $accessLevel = 30; |
|
| 4862 | + if (in_array($inputData['folderId'], $ids)) { |
|
| 4863 | + $accessLevel = 30; |
|
| 4864 | + } |
|
| 4852 | 4865 | } |
| 4853 | 4866 | } |
| 4854 | 4867 | |
@@ -2401,7 +2401,9 @@ discard block |
||
| 2401 | 2401 | // Complete $userInfo |
| 2402 | 2402 | $userInfo['has_been_created'] = 1; |
| 2403 | 2403 | |
| 2404 | - if (WIP === true) error_log("--- USER CREATED ---"); |
|
| 2404 | + if (WIP === true) { |
|
| 2405 | + error_log("--- USER CREATED ---"); |
|
| 2406 | + } |
|
| 2405 | 2407 | |
| 2406 | 2408 | return [ |
| 2407 | 2409 | 'error' => false, |
@@ -2437,7 +2439,9 @@ discard block |
||
| 2437 | 2439 | } |
| 2438 | 2440 | |
| 2439 | 2441 | // Oauth2 user already exists and authenticated |
| 2440 | - if (WIP === true) error_log("--- USER AUTHENTICATED ---"); |
|
| 2442 | + if (WIP === true) { |
|
| 2443 | + error_log("--- USER AUTHENTICATED ---"); |
|
| 2444 | + } |
|
| 2441 | 2445 | $userInfo['has_been_created'] = 0; |
| 2442 | 2446 | |
| 2443 | 2447 | $passwordManager = new PasswordManager(); |
@@ -2667,8 +2671,9 @@ discard block |
||
| 2667 | 2671 | ); |
| 2668 | 2672 | |
| 2669 | 2673 | // No valid email address for user |
| 2670 | - if (!$userInfos || !filter_var($userInfos['email'], FILTER_VALIDATE_EMAIL)) |
|
| 2671 | - return; |
|
| 2674 | + if (!$userInfos || !filter_var($userInfos['email'], FILTER_VALIDATE_EMAIL)) { |
|
| 2675 | + return; |
|
| 2676 | + } |
|
| 2672 | 2677 | |
| 2673 | 2678 | $unlock_url = $SETTINGS['cpassman_url'].'/self-unlock.php?login='.$value.'&otp='.$unlock_code; |
| 2674 | 2679 | |
@@ -83,7 +83,9 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | if (DB::count() > 0) { |
| 85 | 85 | // handle tasks inside this process |
| 86 | - if (WIP === true) error_log("Process in progress: ".$process_to_perform['increment_id']); |
|
| 86 | + if (WIP === true) { |
|
| 87 | + error_log("Process in progress: ".$process_to_perform['increment_id']); |
|
| 88 | + } |
|
| 87 | 89 | handleTask( |
| 88 | 90 | $process_to_perform['increment_id'], |
| 89 | 91 | json_decode($process_to_perform['arguments'], true), |
@@ -100,7 +102,9 @@ discard block |
||
| 100 | 102 | ); |
| 101 | 103 | |
| 102 | 104 | if (DB::count() > 0) { |
| 103 | - if (WIP === true) error_log("New process ta start: ".$process_to_perform['increment_id']); |
|
| 105 | + if (WIP === true) { |
|
| 106 | + error_log("New process ta start: ".$process_to_perform['increment_id']); |
|
| 107 | + } |
|
| 104 | 108 | // update DB - started_at |
| 105 | 109 | DB::update( |
| 106 | 110 | prefixTable('background_tasks'), |
@@ -153,8 +157,9 @@ discard block |
||
| 153 | 157 | ); |
| 154 | 158 | |
| 155 | 159 | // No more tasks, exit |
| 156 | - if ($process_to_perform !== 1) |
|
| 157 | - break; |
|
| 160 | + if ($process_to_perform !== 1) { |
|
| 161 | + break; |
|
| 162 | + } |
|
| 158 | 163 | |
| 159 | 164 | // Run next task |
| 160 | 165 | $process = new Symfony\Component\Process\Process([ |
@@ -331,7 +336,9 @@ discard block |
||
| 331 | 336 | if ($args['step'] === 'create_users_files_key') { |
| 332 | 337 | // Loop on all files for this item |
| 333 | 338 | // and encrypt them for each user |
| 334 | - if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
|
| 339 | + if (WIP === true) { |
|
| 340 | + provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
|
| 341 | + } |
|
| 335 | 342 | foreach($args['files_keys'] as $file) { |
| 336 | 343 | storeUsersShareKey( |
| 337 | 344 | prefixTable('sharekeys_items'), |
@@ -347,7 +354,9 @@ discard block |
||
| 347 | 354 | } elseif ($args['step'] === 'create_users_fields_key') { |
| 348 | 355 | // Loop on all encrypted fields for this item |
| 349 | 356 | // and encrypt them for each user |
| 350 | - if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
|
| 357 | + if (WIP === true) { |
|
| 358 | + provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
|
| 359 | + } |
|
| 351 | 360 | foreach($args['fields_keys'] as $field) { |
| 352 | 361 | storeUsersShareKey( |
| 353 | 362 | prefixTable('sharekeys_fields'), |
@@ -2366,7 +2366,9 @@ discard block |
||
| 2366 | 2366 | function encryptUserObjectKey(string $key, string $publicKey): string |
| 2367 | 2367 | { |
| 2368 | 2368 | // Empty password |
| 2369 | - if (empty($key)) return ''; |
|
| 2369 | + if (empty($key)) { |
|
| 2370 | + return ''; |
|
| 2371 | + } |
|
| 2370 | 2372 | |
| 2371 | 2373 | // Sanitize |
| 2372 | 2374 | $antiXss = new AntiXSS(); |
@@ -2515,7 +2517,9 @@ discard block |
||
| 2515 | 2517 | ]; |
| 2516 | 2518 | } |
| 2517 | 2519 | |
| 2518 | - if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
|
| 2520 | + if (WIP) { |
|
| 2521 | + error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL)); |
|
| 2522 | + } |
|
| 2519 | 2523 | |
| 2520 | 2524 | // Decrypt file content and return |
| 2521 | 2525 | return base64_encode($cipher->decrypt($ciphertext)); |
@@ -2650,7 +2654,9 @@ discard block |
||
| 2650 | 2654 | foreach ($users as $user) { |
| 2651 | 2655 | // Insert in DB the new object key for this item by user |
| 2652 | 2656 | if (count($objectKeyArray) === 0) { |
| 2653 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
| 2657 | + if (WIP === true) { |
|
| 2658 | + error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey); |
|
| 2659 | + } |
|
| 2654 | 2660 | DB::insert( |
| 2655 | 2661 | $object_name, |
| 2656 | 2662 | [ |
@@ -2664,7 +2670,9 @@ discard block |
||
| 2664 | 2670 | ); |
| 2665 | 2671 | } else { |
| 2666 | 2672 | foreach ($objectKeyArray as $object) { |
| 2667 | - if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
| 2673 | + if (WIP === true) { |
|
| 2674 | + error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']); |
|
| 2675 | + } |
|
| 2668 | 2676 | DB::insert( |
| 2669 | 2677 | $object_name, |
| 2670 | 2678 | [ |
@@ -3990,7 +3998,9 @@ discard block |
||
| 3990 | 3998 | $taskName = [$taskName]; |
| 3991 | 3999 | } |
| 3992 | 4000 | foreach($taskName as $task) { |
| 3993 | - if (WIP === true) error_log('createTaskForItem - task: '.$task); |
|
| 4001 | + if (WIP === true) { |
|
| 4002 | + error_log('createTaskForItem - task: '.$task); |
|
| 4003 | + } |
|
| 3994 | 4004 | switch ($task) { |
| 3995 | 4005 | case 'item_password': |
| 3996 | 4006 | |
@@ -4421,19 +4431,22 @@ discard block |
||
| 4421 | 4431 | |
| 4422 | 4432 | // Organisation name (removed username@ and .tld) |
| 4423 | 4433 | $domain = explode('.', $emailParts[1]); |
| 4424 | - if (count($domain) > 1) |
|
| 4425 | - $forbiddenWords[] = $domain[0]; |
|
| 4434 | + if (count($domain) > 1) { |
|
| 4435 | + $forbiddenWords[] = $domain[0]; |
|
| 4436 | + } |
|
| 4426 | 4437 | } |
| 4427 | 4438 | } |
| 4428 | 4439 | |
| 4429 | 4440 | // Search forbidden words in password |
| 4430 | 4441 | foreach ($forbiddenWords as $word) { |
| 4431 | - if (empty($word)) |
|
| 4432 | - continue; |
|
| 4442 | + if (empty($word)) { |
|
| 4443 | + continue; |
|
| 4444 | + } |
|
| 4433 | 4445 | |
| 4434 | 4446 | // Stop if forbidden word found in password |
| 4435 | - if (stripos($password, $word) !== false) |
|
| 4436 | - return false; |
|
| 4447 | + if (stripos($password, $word) !== false) { |
|
| 4448 | + return false; |
|
| 4449 | + } |
|
| 4437 | 4450 | } |
| 4438 | 4451 | |
| 4439 | 4452 | // Get password complexity |