3.1.2

Code review fixes Libraries update
nilsteampassnet · Sep 9, 2024 · 00ce584 · 00ce584
1 parent c923eb3
commit 00ce584
Show file tree

Hide file tree

Showing 28 changed files with 211 additions and 141 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/includes/config/include.php b/includes/config/include.php
@@ -28,7 +28,7 @@
 
 define('TP_VERSION', '3.1.2');
 define("UPGRADE_MIN_DATE", "1724862801");
-define('TP_VERSION_MINOR', '64');
+define('TP_VERSION_MINOR', '66');
 define('TP_TOOL_NAME', 'Teampass');
 define('TP_ONE_DAY_SECONDS', 86400);
 define('TP_ONE_WEEK_SECONDS', 604800);
@@ -40,7 +40,7 @@
 define('TP_COPYRIGHT', '2009-'.date('Y'));
 define('TP_ALLOWED_TAGS', '<b><i><sup><sub><em><strong><u><br><br /><a><strike><ul><blockquote><blockquote><img><li><h1><h2><h3><h4><h5><ol><small><font>');
 define('TP_FILE_PREFIX', 'EncryptedFile_');
-define('NUMBER_ITEMS_IN_BATCH', 100);
+define('NUMBER_ITEMS_IN_BATCH', 1000);
 define('WIP', false);
 define('UPGRADE_SEND_EMAILS', true);
 define('KEY_LENGTH', 16);

diff --git a/includes/tables_integrity.json b/includes/tables_integrity.json
@@ -13,11 +13,11 @@
     },
     {
         "table_name": "background_tasks",
-        "structure_hash": "6b7df0f2f0a2d37e6e2ee51f6bd4fef4304f08fa51024eb1eaebc2f9e0237115"
+        "structure_hash": "67d37968a95761adbad0619e16ad20e7e9946eecc752cbfe3e05e164f315532d"
     },
     {
         "table_name": "background_tasks_logs",
-        "structure_hash": "a712559a78127ef9a70b16250ccdaa42d2a96663ee8787096917728ac2ac3bb0"
+        "structure_hash": "f75c93ada71969c330af7b356a8a3769d4fc788548e3bb6e3c178c1f4fe5b5c0"
     },
     {
         "table_name": "cache",
@@ -101,7 +101,7 @@
     },
     {
         "table_name": "log_system",
-        "structure_hash": "6f595135ec27e16110e983207275ab0bcba82c3f6581a0fb1c69b86be656d2ed"
+        "structure_hash": "f57984a6188290349cd87064eba5443c69c6a0bb0c421a5b6fe8df01092b5ea2"
     },
     {
         "table_name": "misc",
@@ -193,7 +193,7 @@
     },
     {
         "table_name": "tokens",
-        "structure_hash": "d1b251d7ddc11808f3966b0bd4a12bcd13e481ede1c8ec5c773a3a83cd3d7c38"
+        "structure_hash": "a7735b81fa5a4882aa74a703fc031fbc5962fe51a64a50fa46415b56b6f39dae"
     },
     {
         "table_name": "user_requests",

diff --git a/sources/identify.php b/sources/identify.php
@@ -2242,8 +2242,8 @@ function identifyDoInitialChecks(
 {
     $session = SessionManager::getSession();
     $checks = new initialChecks();
-    $enableAdUserAutoCreation = $settings['enable_ad_user_auto_creation'] ?? false;
-    $oauth2Enabled = $settings['oauth2_enabled'] ?? false;
+    $enableAdUserAutoCreation = $SETTINGS['enable_ad_user_auto_creation'] ?? false;
+    $oauth2Enabled = $SETTINGS['oauth2_enabled'] ?? false;
     $lang = new Language($session->get('user-language') ?? 'english');
 
     // Brute force management

diff --git a/sources/main.functions.php b/sources/main.functions.php
@@ -1210,22 +1210,11 @@ function buildEmail(
     // Load PHPMailer
     $mail = new PHPMailer(true);
     $languageDir = $SETTINGS['cpassman_dir'] . '/vendor/phpmailer/phpmailer/language/';
-    // Load AntiXSS
-    $antiXss = new AntiXSS();
 
     try {
         // Set language and SMTPDebug
         $mail->setLanguage('en', $languageDir);
         $mail->SMTPDebug = ($cron || $silent) ? 0 : $SETTINGS['email_debug_level'];
-
-        /*
-        // Define custom Debug output function
-        $mail->Debugoutput = function($str, $level) {
-            // Path to your log file
-            $logFilePath = '/var/log/phpmailer.log';
-            file_put_contents($logFilePath, gmdate('Y-m-d H:i:s'). "\t$level\t$str\n", FILE_APPEND | LOCK_EX);
-        };
-        */
 
         // Configure SMTP
         $mail->isSMTP();

diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
@@ -21,7 +21,7 @@
     'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
     '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
     'b46ad4fe52f4d1899a2951c7e6ea56b0' => $vendorDir . '/voku/portable-utf8/bootstrap.php',
-    '2324d0e5cadd603331d27de142371f0b' => $vendorDir . '/symfony/contracts/Deprecation/function.php',
     'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
     '3919eeb97e98d4648304477f8ef734ba' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/Random.php',
+    '2324d0e5cadd603331d27de142371f0b' => $vendorDir . '/symfony/contracts/Deprecation/function.php',
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -54,7 +54,7 @@ public static function getLoader()
             }
         }
 
-        $loader->setApcuPrefix('TxjEmWNbhEz9LB723EHZ6');
+        $loader->setApcuPrefix('S26XSgroh07nl0paFh7fS');
         $loader->register(true);
 
         if ($useStaticLoader) {

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -22,9 +22,9 @@ class ComposerStaticInite3f3ee27f81ca21f7bd7499d7b935c11
         'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php',
         '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
         'b46ad4fe52f4d1899a2951c7e6ea56b0' => __DIR__ . '/..' . '/voku/portable-utf8/bootstrap.php',
-        '2324d0e5cadd603331d27de142371f0b' => __DIR__ . '/..' . '/symfony/contracts/Deprecation/function.php',
         'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
         '3919eeb97e98d4648304477f8ef734ba' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/Crypt/Random.php',
+        '2324d0e5cadd603331d27de142371f0b' => __DIR__ . '/..' . '/symfony/contracts/Deprecation/function.php',
     );
 
     public static $prefixLengthsPsr4 = array (

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -1322,26 +1322,27 @@
         },
         {
             "name": "hackzilla/password-generator",
-            "version": "1.6.0",
-            "version_normalized": "1.6.0.0",
+            "version": "1.7.0",
+            "version_normalized": "1.7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hackzilla/password-generator.git",
-                "reference": "53c13507b5b9875a07618f1f2a7db95e5b8c0638"
+                "reference": "743c8493d2c33ebf9496a1c3c248efeb568fe134"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hackzilla/password-generator/zipball/53c13507b5b9875a07618f1f2a7db95e5b8c0638",
-                "reference": "53c13507b5b9875a07618f1f2a7db95e5b8c0638",
+                "url": "https://api.github.com/repos/hackzilla/password-generator/zipball/743c8493d2c33ebf9496a1c3c248efeb568fe134",
+                "reference": "743c8493d2c33ebf9496a1c3c248efeb568fe134",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.0"
+                "ext-mbstring": "*",
+                "php": ">=8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
             },
-            "time": "2021-01-13T23:18:24+00:00",
+            "time": "2024-08-23T17:13:49+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1363,7 +1364,7 @@
             "description": "Password Generator Library",
             "support": {
                 "issues": "https://github.com/hackzilla/password-generator/issues",
-                "source": "https://github.com/hackzilla/password-generator/tree/1.6.0"
+                "source": "https://github.com/hackzilla/password-generator/tree/1.7.0"
             },
             "install-path": "../hackzilla/password-generator"
         },
@@ -3501,17 +3502,17 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.10",
-            "version_normalized": "6.4.10.0",
+            "version": "v6.4.11",
+            "version_normalized": "6.4.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "af29198d87112bebdd397bd7735fbd115997824c"
+                "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/af29198d87112bebdd397bd7735fbd115997824c",
-                "reference": "af29198d87112bebdd397bd7735fbd115997824c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
+                "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
                 "shasum": ""
             },
             "require": {
@@ -3520,7 +3521,7 @@
             "require-dev": {
                 "symfony/filesystem": "^6.0|^7.0"
             },
-            "time": "2024-07-24T07:06:38+00:00",
+            "time": "2024-08-13T14:27:37+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3548,7 +3549,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.10"
+                "source": "https://github.com/symfony/finder/tree/v6.4.11"
             },
             "funding": [
                 {
@@ -3648,17 +3649,17 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.9",
-            "version_normalized": "6.4.9.0",
+            "version": "v6.4.11",
+            "version_normalized": "6.4.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "7d048964877324debdcb4e0549becfa064a20d43"
+                "reference": "dba5d5f6073baf7a3576b580cc4a208b4ca00553"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43",
-                "reference": "7d048964877324debdcb4e0549becfa064a20d43",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/dba5d5f6073baf7a3576b580cc4a208b4ca00553",
+                "reference": "dba5d5f6073baf7a3576b580cc4a208b4ca00553",
                 "shasum": ""
             },
             "require": {
@@ -3684,7 +3685,7 @@
                 "symfony/property-info": "^5.4|^6.0|^7.0",
                 "symfony/serializer": "^6.4.3|^7.0.3"
             },
-            "time": "2024-06-28T09:49:33+00:00",
+            "time": "2024-08-13T12:15:02+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3716,7 +3717,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.9"
+                "source": "https://github.com/symfony/mime/tree/v6.4.11"
             },
             "funding": [
                 {