Merge branch 'hotfix/3.1.4.7'

Author: nilsteampassnet

includes/config/include.php

@@ -28,7 +28,7 @@
 
 define('TP_VERSION', '3.1.4');
 define("UPGRADE_MIN_DATE", "1741899582");
-define('TP_VERSION_MINOR', '6');
+define('TP_VERSION_MINOR', '7');
 define('TP_TOOL_NAME', 'Teampass');
 define('TP_ONE_DAY_SECONDS', 86400);
 define('TP_ONE_WEEK_SECONDS', 604800);

includes/libraries/teampassclasses/oauth2controller/src/OAuth2Controller.php

@@ -64,7 +64,7 @@ public function __construct(array $settings)
                 'clientId'                => $settings['oauth2_client_id'],
                 'clientSecret'            => $settings['oauth2_client_secret'],
                 'tenant'                  => $settings['oauth2_tenant_id'],
-                'redirectUri'             => $settings['cpassman_url'].'/index.php?post_type=oauth2',
+                'redirectUri'             => rtrim($settings['cpassman_url'], '/').'/index.php?post_type=oauth2',
                 'urlAuthorize'            => 'https://login.microsoftonline.com/' . $settings['oauth2_tenant_id'] . '/oauth2/v2.0/authorize', // Using the v2.0 endpoint
                 'urlAccessToken'          => 'https://login.microsoftonline.com/' . $settings['oauth2_tenant_id'] . '/oauth2/v2.0/token',     // v2.0 endpoint for the token
                 'urlResourceOwnerDetails' => 'https://graph.microsoft.com/v1.0/me',  // Endpoint to get user info

install/install-steps/run.step5.php

@@ -750,8 +750,8 @@ private function users()
                 'email'                  => $this->installConfig['adminEmail'],
                 'encrypted_psk'          => '',
                 'last_pw_change'         => time(),
-                'name'                   => 'Change me',
-                'lastname'               => 'Change me',
+                'name'                   => $this->installConfig['adminName'],
+                'lastname'               => $this->installConfig['adminLastname'],
                 'can_create_root_folder' => 1,
                 'public_key'             => 'none',
                 'private_key'            => 'none',
@@ -1021,7 +1021,7 @@ private function languages()
         );
 
         // add lanaguages
-        $tmp = DB::queryFirstField(
+        $tmp = (int) DB::query(
             "SELECT COUNT(*) FROM " . $this->inputData['tablePrefix'] . "languages WHERE name = %s",
             'french'
         );

install/upgrade_run_3.0.0_users.php

@@ -391,7 +391,7 @@
                     $itemKey = $_SESSION['items_object_keys'][$item_id];
 
                     // Create sharekey for user
-                    $share_key_for_item = $userInfo['public_key'] !== null ? encryptUserObjectKey($itemKey, $userInfo['public_key']) : '';
+                    $share_key_for_item = $userInfo['public_key'] !== null && $itemKey !== null ? encryptUserObjectKey($itemKey, $userInfo['public_key']) : '';
 
                     // Collect values for bulk insert
                     $insert_values[] = '(NULL, ' . (int) $item['id'] . ', ' . (int) $userInfo['id'] . ", '" . mysqli_real_escape_string($db_link, $share_key_for_item) . "')";

pages/oauth.php

@@ -155,7 +155,7 @@
                                     </small>
                                 </div>
                                 <div class='col-7'>
-                                    <input type='text' class='form-control form-control-sm setting-oauth' id='oauth2_callback_url' value='<?php echo $SETTINGS['cpassman_url'].'/'.OAUTH2_REDIRECTURI; ?>' disabled>
+                                    <input type='text' class='form-control form-control-sm setting-oauth' id='oauth2_callback_url' value='<?php echo rtrim($SETTINGS['cpassman_url'], '/').'/'.OAUTH2_REDIRECTURI; ?>' disabled>
                                 </div>
                             </div>
 

scripts/background_tasks___userKeysCreation.php

@@ -30,6 +30,7 @@
 use TeampassClasses\SessionManager\SessionManager;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 use Symfony\Component\Process\Process;
+use Symfony\Component\Process\PhpExecutableFinder;
 use TeampassClasses\Language\Language;
 use TeampassClasses\ConfigManager\ConfigManager;
 
@@ -76,10 +77,19 @@
 // Check if there is a task to execute
 if (DB::count() > 0) {
     // Execute or continue the task
-    subtasksHandler($processToPerform['increment_id'], $processToPerform['arguments']);
+    subtasksHandler($processToPerform['increment_id'], $processToPerform['arguments'], $phpBinaryPath);
 }
 
-function subtasksHandler($taskId, $taskArguments)
+/**
+ * Function to handle the subtasks
+ * 
+ * @param int $taskId Task identifier
+ * @param string $taskArguments Task arguments
+ * @param string $phpBinaryPath Path to the PHP binary
+ * 
+ * @return void
+ */
+function subtasksHandler($taskId, $taskArguments, $phpBinaryPath): void
 {
     // Check if subtasks are still running
     // This in order to prevent the script from running multiple times on same objects
@@ -107,7 +117,7 @@ function subtasksHandler($taskId, $taskArguments)
         // Exit
         return;
     }
-
+    
     foreach ($subTasks as $subTask) {
         // Launch the process for this subtask
 
@@ -170,7 +180,7 @@ function subtasksHandler($taskId, $taskArguments)
             }
 
             // Launch the subtask with the current parameters
-            $process = new Process(['php', __DIR__.'/background_tasks___userKeysCreation_subtaskHdl.php', $subTask['increment_id'], $subTaskParams['index'], $subTaskParams['nb'], $subTaskParams['step'], $taskArguments, $taskId]);
+            $process = new Process([$phpBinaryPath, __DIR__.'/background_tasks___userKeysCreation_subtaskHdl.php', $subTask['increment_id'], $subTaskParams['index'], $subTaskParams['nb'], $subTaskParams['step'], $taskArguments, $taskId]);
             $process->start();
             $pid = $process->getPid();
 
@@ -182,7 +192,7 @@ function subtasksHandler($taskId, $taskArguments)
     sleep(10); // Wait 10 seconds before continuing
 
     // Recursively call this function until all subtasks are finished
-    subtasksHandler($taskId, $taskArguments);
+    subtasksHandler($taskId, $taskArguments, $phpBinaryPath);
 }
 
 function createAllSubTasks($action, $totalElements, $elementsPerIteration, $taskId)

vendor/teampassclasses/oauth2controller/src/OAuth2Controller.php

@@ -64,7 +64,7 @@ public function __construct(array $settings)
                 'clientId'                => $settings['oauth2_client_id'],
                 'clientSecret'            => $settings['oauth2_client_secret'],
                 'tenant'                  => $settings['oauth2_tenant_id'],
-                'redirectUri'             => $settings['cpassman_url'].'/index.php?post_type=oauth2',
+                'redirectUri'             => rtrim($settings['cpassman_url'], '/').'/index.php?post_type=oauth2',
                 'urlAuthorize'            => 'https://login.microsoftonline.com/' . $settings['oauth2_tenant_id'] . '/oauth2/v2.0/authorize', // Using the v2.0 endpoint
                 'urlAccessToken'          => 'https://login.microsoftonline.com/' . $settings['oauth2_tenant_id'] . '/oauth2/v2.0/token',     // v2.0 endpoint for the token
                 'urlResourceOwnerDetails' => 'https://graph.microsoft.com/v1.0/me',  // Endpoint to get user info