Merge branch 'release'

passbolt · May 26, 2022 · 1601ad7 · 1601ad7
2 parents 6f2e60d + 681a43a
commit 1601ad7
Show file tree

Hide file tree

Showing 347 changed files with 13,507 additions and 3,788 deletions.
diff --git a/.gitlab-ci/Jobs/artifact_build.yml b/.gitlab-ci/Jobs/artifact_build.yml
@@ -8,7 +8,7 @@
   script:
     - |
       apk add --update curl jq && rm -rf /var/cache/apk/*
-      export PASSBOLT_VERSION=$(jq '.version' package.json)
+      export PASSBOLT_VERSION=$(cat ./debian/changelog | awk 'match($0, /\(([0-9]+\.[0-9]+\.[0-9]+\-[0-9])\)?/) {print substr($0, RSTART, RLENGTH);exit}' | tr -d "()")
       curl --request POST \
         --form "token=$CI_JOB_TOKEN" \
         --form "ref=$BRANCH" \
@@ -19,7 +19,7 @@
         --form "variables[PASSBOLT_VERSION]=$PASSBOLT_VERSION" \
         "https://gitlab.com/api/v4/projects/$TRIGGER_PROJECT_ID/trigger/pipeline"
   rules:
-    - if: '$CI_COMMIT_MESSAGE =~ /publish-package/ && $CI_COMMIT_BRANCH == "release"' 
+    - if: '$CI_COMMIT_MESSAGE =~ /publish-package/ && $CI_COMMIT_BRANCH == "release"'
       when: on_success
 
 
@@ -32,4 +32,3 @@ vm-trigger-build:
   variables:
     TRIGGER_PROJECT_ID: $DOWNSTREAM_VM_PROJECT_ID
   extends: .build-template
-
diff --git a/.gitlab-ci/Jobs/rpm_package_build.yml b/.gitlab-ci/Jobs/rpm_package_build.yml
@@ -20,8 +20,8 @@
 
 .build-passbolt-rpm-package: &build-passbolt-rpm-package |
   rpmdev-setuptree
-  PKG_VERSION=$(jq -r '.version' package.json) \
-  PASSBOLT_VERSION=$(jq -r '.version' package.json) \
+  PKG_VERSION=$(cat rpm/CHANGELOG.md | awk 'match($0, /\[([0-9]+\.[0-9]+\.[0-9]+)\]?/) {print substr($0, RSTART, RLENGTH);exit}' | tr -d "[]")
+  PASSBOLT_PKG_VERSION=$(cat rpm/CHANGELOG.md | awk 'match($0, /\[([0-9]+\.[0-9]+\.[0-9]+\-[0-9])\]?/) {print substr($0, RSTART, RLENGTH);exit}' | awk -F "-" '{print $2}' | tr -d "[]")
   /bin/sh rpm/scripts/build-passbolt-server.sh
   cp ~/rpmbuild/RPMS/noarch/passbolt-* .
 
@@ -112,7 +112,7 @@ build-suse:
     "gs://$REPO"
 
 .publish-rpm:
-  image: rockylinux/rockylinux:8
+  image: registry.gitlab.com/passbolt/passbolt-ci-docker-images/rockylinux-8.5
   stage: publish
   variables:
     GCLOUD_SHA256SUM: "81d0ad64dca3e97d02e873d386bafcc77b416d7c9b45e5ec2387e5075b133fc0"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.6.0]
+### Improved
+- PB-9739 OpenPGP key and message validation refactoring
+- PB-14141 Enhanced public/private key validation rules
+- PB-13685 Enhanced secret validation rules
+- PB-14138 Refactor setup and recover related controllers with dependency injection
+- PB-14510 Three trivial endpoints, such as GET on login are not logged anymore
+
+### Security
+- PB-14400 Upgrade firebase/php-jwt to 6.1
+
+### Fixed
+- PB-14369 Fixes email settings issues in the test suite
+- PB-15046 Handle user lost-passphrase scenarios with API <= v3.5
+
+### Maintenance
+- PB-14812 Upgrade cakephp/cakephp to 4.3
+
 ## [3.5.0] - 2021-01-12
 ### Added
 - PB-13161 As LU I should be able to use passbolt with my Android mobile

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -112,6 +112,9 @@ module.exports = function(grunt) {
             'controls/loading_light.svg',
             'controls/loading_dark.svg',
             'controls/overlay-opacity-50.png',
+            'controls/success.svg',
+            'controls/error.svg',
+            'controls/warning.svg',
             // Login page 3rd party logo
             'third_party/firefox_logo.png',
             'third_party/FirefoxAMO_black.svg',
@@ -132,13 +135,13 @@ module.exports = function(grunt) {
         }, {
           // CSS
           cwd: paths.node_modules_styleguide + 'build/css/themes/default',
-          src: ['api_main.min.css', 'api_webinstaller.min.css', 'api_authentication.min.css', 'ext_authentication.min.css'],
+          src: ['api_main.min.css', 'api_authentication.min.css', 'ext_authentication.min.css'],
           dest: paths.webroot + 'css/themes/default',
           expand: true
         }, {
           // Midgar css theme
           cwd: paths.node_modules_styleguide + 'build/css/themes/midgar',
-          src: ['api_main.min.css', 'api_webinstaller.min.css', 'api_authentication.min.css', 'ext_authentication.min.css'],
+          src: ['api_main.min.css', 'api_authentication.min.css', 'ext_authentication.min.css'],
           dest: paths.webroot + 'css/themes/midgar',
           expand: true
         },{
@@ -150,7 +153,7 @@ module.exports = function(grunt) {
         }, {
           // Javascript applications
           cwd: paths.node_modules_styleguide + 'build/js/dist',
-          src: ['api-app.js', 'api-recover.js', 'api-setup.js', 'api-triage.js', 'api-vendors.js'],
+          src: ['api-account-recovery.js', 'api-app.js', 'api-recover.js', 'api-setup.js', 'api-triage.js', 'api-vendors.js'],
           dest: paths.js + 'app',
           expand: true
         },]

diff --git a/bin/healthcheck b/bin/healthcheck
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-user=${1:-www-data}
 DIR=$(dirname "$(readlink -f "$0")")
 
 # shellcheck source=utils.sh
 # shellcheck disable=SC1091
 source "$DIR"/utils.sh
 
+user="$(get_web_user)"
+
 run_as "$DIR/cake passbolt healthcheck" "$user"
diff --git a/bin/status-report b/bin/status-report
@@ -2,13 +2,14 @@
 
 set -euo pipefail
 
-user=${1:-www-data}
 DIR=$(dirname "$(readlink -f "$0")")
 
 # shellcheck source=utils.sh
 # shellcheck disable=SC1091
 source "$DIR/utils.sh"
 
+user="$(get_web_user)"
+
 "$DIR"/versions "$user"
 run_as "$DIR/cake passbolt healthcheck" "$user"
 run_as "$DIR/cake passbolt cleanup --dry-run" "$user"

diff --git a/bin/update b/bin/update
@@ -3,12 +3,13 @@
 set -euo pipefail
 
 DIR=$(dirname "$(readlink -f "$0")")
-user=${1:-www-data}
 
 # shellcheck source=utils.sh
 # shellcheck disable=SC1091
 source "$DIR"/utils.sh
 
+user="$(get_web_user)"
+
 cd "$DIR"
 run_as "git pull origin master" "$user"
 run_as "composer install --no-dev -n" "$user"

diff --git a/bin/utils.sh b/bin/utils.sh
@@ -43,7 +43,7 @@ run_as() {
       $switch_user "$command" $shell "$user"
       ;;
 
-    www-data | nginx)
+    www-data | nginx | wwwrun)
       #shellcheck disable=SC2086
       $command
       ;;
@@ -63,3 +63,15 @@ oops() {
   local err
   err=$("$@" 2>&1) && echo "$err" || echo -e "$red ERROR: $nc$err"
 }
+
+get_web_user() {
+  if [ -f /etc/debian_version ]
+  then
+    echo "www-data"
+  elif [ -f /usr/bin/zypper ]
+  then
+    echo "wwwrun"
+  else
+    echo "nginx"
+  fi
+}
diff --git a/bin/versions b/bin/versions
@@ -3,12 +3,13 @@
 set -euo pipefail
 
 DIR=$(dirname "$(readlink -f "$0")")
-user=${1:-www-data}
 
 # shellcheck source=utils.sh
 # shellcheck disable=SC1091
 source "$DIR"/utils.sh
 
+user="$(get_web_user)"
+
 run_as "$DIR/cake passbolt version" "$user"
 oops uname -a
 grep -m1 "" <(oops php --version)

diff --git a/composer.json b/composer.json
@@ -51,20 +51,20 @@
         "ext-gnupg" : "*",
         "ext-pdo": "*",
         "ext-openssl": "*",
-        "cakephp/cakephp": "4.2.9",
+        "cakephp/cakephp": "4.3.7",
         "cakephp/migrations": "^3.0.0",
 	      "robmorgan/phinx":"^0.12.8",
         "cakephp/plugin-installer": "^1.3.0",
         "mobiledetect/mobiledetectlib": "^2.8.34",
         "ramsey/uuid": "^4.1.1",
-        "singpolyma/openpgp-php": "0.5.0",
+        "singpolyma/openpgp-php": "dev-master#0a92d91f8e8e26a2c4e4185bf8bb68efab8c4302",
         "donatj/phpuseragentparser": "^1.1.0",
-        "lorenzo/cakephp-email-queue": "^4.0.0",
+        "lorenzo/cakephp-email-queue": "^5.0.0",
         "imagine/imagine": "^1.2.4",
         "league/flysystem": "^2.1.1",
         "cakephp/authentication": "^2.7.0",
         "bcrowe/cakephp-api-pagination": "^2.1.0",
-        "firebase/php-jwt": "^5.2"
+        "firebase/php-jwt": "^6.1"
     },
     "require-dev": {
         "phpstan/phpstan": "0.12.81",
@@ -73,9 +73,9 @@
         "cakephp/bake": "^2.3.0",
         "phpunit/phpunit": "^9.5.2",
         "passbolt/cakephp-codesniffer": "dev-master",
-        "passbolt/passbolt-selenium-api": "^3.1.2",
+        "passbolt/passbolt-selenium-api": "dev-master#ade46d4c3095b18316cbb0553f875c50a4dd67b9",
         "passbolt/passbolt-test-data": "^3.2.0",
-        "vierge-noire/cakephp-fixture-factories": "v2.4",
+        "vierge-noire/cakephp-fixture-factories": "v2.5.1",
         "cakephp/localized": "4.0.0",
         "vimeo/psalm": "^4.9"
     },