Merge pull request #1668 from nuxsmin/v3.2

v3.2.2
nuxsmin · Mar 13, 2021 · 5882699 · 5882699
2 parents 4c3312d + 861ce46
commit 5882699
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/lib/SP/Http/Request.php b/lib/SP/Http/Request.php
@@ -171,16 +171,18 @@ public function getForwardedFor()
         $forwarded = $this->headers->get('HTTP_FORWARDED');
 
         if ($forwarded !== null &&
-            preg_match_all('/(?:for=([\w.:]+))|(?:for="\[([\w.:]+)\]")/i',
-                $forwarded, $matches)
+            preg_match_all(
+                '/(?:for=([\w.:]+))|(?:for="\[([\w.:]+)\]")/i',
+                $forwarded,
+                $matches)
         ) {
             return array_filter(array_merge($matches[1], $matches[2]), function ($value) {
                 return !empty($value);
             });
         }
 
         // eg: X-Forwarded-For: 192.0.2.43, 2001:db8:cafe::17
-        $xForwarded = $this->headers->exists('HTTP_X_FORWARDED_FOR');
+        $xForwarded = $this->headers->get('HTTP_X_FORWARDED_FOR');
 
         if ($xForwarded !== null) {
             $matches = preg_split('/(?<=[\w])+,\s?/i',

diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php
@@ -60,9 +60,9 @@ final class Installer extends Service
     /**
      * sysPass' version and build number
      */
-    const VERSION = [3, 2, 1];
+    const VERSION = [3, 2, 2];
     const VERSION_TEXT = '3.2';
-    const BUILD = 21011601;
+    const BUILD = 21031301;
 
     /**
      * @var DatabaseSetupInterface

diff --git a/public/js/app-util.js b/public/js/app-util.js
@@ -444,7 +444,9 @@ sysPass.Util = function (log) {
                     }
                 }
 
-                if (password.config.complexity.uppercase) {
+                if (password.config.complexity.chars
+                    && password.config.complexity.uppercase
+                ) {
                     const chars = password.config.charset.char.toUpperCase();
                     const res = inPassArray.some(
                         function (el) {

diff --git a/public/js/app-util.min.js b/public/js/app-util.min.js