Skip to content

Commit b3001ff

Browse files
committed
Merge branch 'release' into 'master'
v5.5.0 on master See merge request passbolt/passbolt-ce-api!438
2 parents e6cec35 + 3050ab8 commit b3001ff

File tree

88 files changed

+2664
-940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2664
-940
lines changed

.ddev/commands/host/analyze

100644100755
File mode changed.

.ddev/commands/host/refresh

100644100755
File mode changed.

.ddev/config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name: passbolt-pro-api
1+
name: passbolt-api
22
type: cakephp
33
docroot: webroot
4-
php_version: "8.3"
4+
php_version: "8.4"
55
webserver_type: nginx-fpm
66
xdebug_enabled: false
77
additional_hostnames: []
@@ -11,16 +11,16 @@ database:
1111
version: "10.11"
1212
hooks:
1313
post-start:
14-
- exec: sudo apt-get update
14+
- exec: "sudo apt-get update && sudo apt-get install -y git unzip nano"
1515
- exec: sh -c "if [ ! -f /var/www/html/config/app.php ]; then cp /var/www/html/config/app.default.php /var/www/html/config/app.php; fi"
1616
- exec: gpg --list-keys
1717
mailpit_https_port: "9102"
18-
webimage_extra_packages: [php8.3-gnupg, php8.3-xdebug]
18+
webimage_extra_packages: ["php${DDEV_PHP_VERSION}-gnupg", "php${DDEV_PHP_VERSION}-xdebug"]
1919
use_dns_when_possible: true
2020
composer_version: "2"
2121
web_environment:
2222
- DEBUG=true
23-
- APP_FULL_BASE_URL=https://passbolt-pro-api.ddev.site
23+
- APP_FULL_BASE_URL=https://passbolt-api.ddev.site
2424
- PASSBOLT_SELENIUM_ACTIVE=true
2525
- DATASOURCES_DEFAULT_HOST=db
2626
- DATASOURCES_DEFAULT_USERNAME=db

.ddev/docker-compose.openldap.yaml

Lines changed: 0 additions & 69 deletions
This file was deleted.

.ddev/nginx_full/nginx-site.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
# and ddev will respect it and won't overwrite the file.
66
# See https://ddev.readthedocs.io/en/stable/users/extend/customization-extendibility/#custom-nginx-configuration
77

8+
# catch-all server: we prefer to avoid that nginx answers any domains in order to exclude any wrong routing
89
server {
910
listen 80 default_server;
1011
listen 443 ssl default_server;
1112

13+
server_name _;
14+
1215
root /var/www/html/webroot;
1316

1417
ssl_certificate /etc/ssl/certs/master.crt;

.gitlab-ci/jobs/php_unit_tests/sequential/php_unit_tests.yml

Lines changed: 85 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
PASSBOLT_SELENIUM_ACTIVE: 1
104104
# This is the development dummy fingerprint
105105
PASSBOLT_GPG_SERVER_KEY_FINGERPRINT: 2FC8945833C51946E937F9FED47B0811573EE67E
106-
PHPUNIT_COMMAND: vendor/bin/phpunit --log-junit unitreport.xml
106+
PHPUNIT_COMMAND: vendor/bin/phpunit --testsuite $TEST_SUITE_GROUP -c tmp/tests/testsuitesplit.xml --log-junit unitreport.xml
107107
COMPOSER_ALLOW_SUPERUSER: 1
108108
image: $CI_REGISTRY_IMAGE_TEST:$PHP_VERSION
109109
script:
@@ -112,6 +112,7 @@
112112
- gpg --import config/gpg/unsecure_private.key
113113
- gpg --import config/gpg/unsecure.key
114114
- ./bin/cake passbolt create_jwt_keys
115+
- composer create-split-testsuite
115116
- $PHPUNIT_COMMAND
116117
artifacts:
117118
reports:
@@ -122,10 +123,22 @@
122123
##
123124
## CUSTOM COMBINATIONS
124125
##
125-
seq-php8.2-mysql5.7:
126+
seq-php8.2-mysql5.7-testsuite-1-of-2:
126127
variables:
127128
PHP_VERSION: "8.2"
128129
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
130+
TEST_SUITE_GROUP: "1"
131+
extends:
132+
- .mysql-template
133+
- .test-template
134+
rules:
135+
- if: "$TEST_DISABLED == null"
136+
137+
seq-php8.2-mysql5.7-testsuite-2-of-2:
138+
variables:
139+
PHP_VERSION: "8.2"
140+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:5.7"
141+
TEST_SUITE_GROUP: "2"
129142
extends:
130143
- .mysql-template
131144
- .test-template
@@ -191,10 +204,23 @@ seq-php8.2-mysql5.7:
191204
# - if: '$TEST_DISABLED == null'
192205

193206
## UBUNTU 22.04 LTS JAMMY
194-
seq-php8.2-mysql8:
207+
seq-php8.2-mysql8-testsuite-1-of-2:
195208
variables:
196209
PHP_VERSION: "8.2"
197210
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
211+
TEST_SUITE_GROUP: "1"
212+
extends:
213+
- .mysql-template
214+
- .test-template
215+
rules:
216+
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
217+
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
218+
219+
seq-php8.2-mysql8-testsuite-2-of-2:
220+
variables:
221+
PHP_VERSION: "8.2"
222+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mysql:8.0"
223+
TEST_SUITE_GROUP: "2"
198224
extends:
199225
- .mysql-template
200226
- .test-template
@@ -227,10 +253,20 @@ seq-php8.2-mysql8:
227253
# - if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
228254
# - if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
229255

230-
seq-php8.2-postgres15:
256+
seq-php8.2-postgres15-testsuite-1-of-2:
257+
variables:
258+
PHP_VERSION: "8.2"
259+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:15-alpine"
260+
TEST_SUITE_GROUP: "1"
261+
extends:
262+
- .postgres-template
263+
- .test-template
264+
265+
seq-php8.2-postgres15-testsuite-2-of-2:
231266
variables:
232267
PHP_VERSION: "8.2"
233268
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:15-alpine"
269+
TEST_SUITE_GROUP: "2"
234270
extends:
235271
- .postgres-template
236272
- .test-template
@@ -245,35 +281,63 @@ seq-php8.2-postgres15:
245281
# rules:
246282
# - if: "$TEST_DISABLED == null"
247283

248-
seq-php8.3-postgres13:
284+
seq-php8.3-postgres13-testsuite-1-of-2:
285+
variables:
286+
PHP_VERSION: "8.3"
287+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
288+
TEST_SUITE_GROUP: "1"
289+
extends:
290+
- .postgres-template
291+
- .test-template
292+
rules:
293+
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
294+
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
295+
296+
seq-php8.3-postgres13-testsuite-2-of-2:
249297
variables:
250298
PHP_VERSION: "8.3"
251299
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/postgres:13-alpine"
300+
TEST_SUITE_GROUP: "2"
252301
extends:
253302
- .postgres-template
254303
- .test-template
255304
rules:
256305
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
257306
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
258307

308+
259309
# Mariadb 11.5 tests
260310

261311
# This is what we ship with the docker image as of 14 Nov 2024
262-
seq-php8.2-mariadb11.5:
312+
seq-php8.2-mariadb11.5-testsuite-1-of-2:
263313
variables:
264314
PHP_VERSION: "8.2"
265315
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:11.5"
316+
TEST_SUITE_GROUP: "1"
266317
extends:
267318
- .mariadb-template
268319
- .test-template
269320
rules:
270321
- if: "$TEST_DISABLED == null"
271322
allow_failure: true
272323

273-
seq-php8.3-mariadb11.5:
324+
seq-php8.2-mariadb11.5-testsuite-2-of-2:
325+
variables:
326+
PHP_VERSION: "8.2"
327+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:11.5"
328+
TEST_SUITE_GROUP: "2"
329+
extends:
330+
- .mariadb-template
331+
- .test-template
332+
rules:
333+
- if: "$TEST_DISABLED == null"
334+
allow_failure: true
335+
336+
seq-php8.3-mariadb11.5-testsuite-1-of-2:
274337
variables:
275338
PHP_VERSION: "8.3"
276339
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:11.5"
340+
TEST_SUITE_GROUP: "1"
277341
extends:
278342
- .mariadb-template
279343
- .test-template
@@ -282,3 +346,17 @@ seq-php8.3-mariadb11.5:
282346
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
283347
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "release"'
284348
allow_failure: true
349+
350+
seq-php8.3-mariadb11.5-testsuite-2-of-2:
351+
variables:
352+
PHP_VERSION: "8.3"
353+
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:11.5"
354+
TEST_SUITE_GROUP: "2"
355+
extends:
356+
- .mariadb-template
357+
- .test-template
358+
rules:
359+
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
360+
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
361+
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "release"'
362+
allow_failure: true

CHANGELOG.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,69 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [5.5.0] - 2025-09-15
6+
### Added
7+
- PB-44639 As an administrator, when updating metadata settings from friendly mode to zero knowledge, I should see the server key dropped in DB
8+
- PB-44756 Updates metadata keys settings endpoint to accept server metadata private key
9+
- PB-44752 Adds a new data check for existing resources v5 encrypted with hard or soft deleted shared metadata key
10+
11+
### Fixed
12+
- PB-45060 Fixes custom fields json schema properties type
13+
- PB-45062 Fixes user_setup_complete.php template in LU folder instead of AD
14+
- PB-44760 Fixes health check "record not found in table organization_settings" issue (GITHUB #563)
15+
16+
### Maintenance
17+
- PB-44915 Changes DDEV containers names and URLs from passbolt-ce-api to passbolt-api
18+
- PB-44813 Updates ddev config
19+
- PB-44772 Speeds up continuous integration by splitting pipelines in two distinct test suites
20+
21+
## [5.5.0-rc.1] - 2025-09-12
22+
### Added
23+
- PB-44639 As an administrator, when updating metadata settings from friendly mode to zero knowledge, I should see the server key dropped in DB
24+
- PB-44756 Updates metadata keys settings endpoint to accept server metadata private key
25+
- PB-44752 Adds a new data check for existing resources v5 encrypted with hard or soft deleted shared metadata key
26+
27+
### Fixed
28+
- PB-45060 Fixes custom fields json schema properties type
29+
- PB-45062 Fixes user_setup_complete.php template in LU folder instead of AD
30+
- PB-44760 Fixes health check "record not found in table organization_settings" issue (GITHUB #563)
31+
32+
### Maintenance
33+
- PB-44915 Changes DDEV containers names and URLs from passbolt-ce-api to passbolt-api
34+
- PB-44813 Updates ddev config
35+
- PB-44772 Speeds up continuous integration by splitting pipelines in two distinct test suites
36+
37+
## [5.5.0-test.2] - 2025-09-08
38+
### Added
39+
- PB-44639 As an administrator, when updating metadata settings from friendly mode to zero knowledge, I should see the server key dropped in DB
40+
- PB-44756 Updates metadata keys settings endpoint to accept server metadata private key
41+
- PB-44752 Adds a new data check for existing resources v5 encrypted with hard or soft deleted shared metadata key
42+
43+
### Fixed
44+
- PB-45060 Fixes custom fields json schema properties type
45+
- PB-45062 Fixes user_setup_complete.php template in LU folder instead of AD
46+
- PB-44760 Fixes health check "record not found in table organization_settings" issue (GITHUB #563)
47+
48+
### Maintenance
49+
- PB-44915 Changes DDEV containers names and URLs from passbolt-ce-api to passbolt-api
50+
- PB-44813 Updates ddev config
51+
- PB-44772 Speeds up continuous integration by splitting pipelines in two distinct test suites
52+
53+
## [5.5.0-test.1] - 2025-09-02
54+
### Added
55+
- PB-44639 As an administrator when updating metadata settings from friendly mode to zero knowledge I should see the server key dropped in DB
56+
- PB-44756 Update metadata keys settings endpoint to accept server metadata private key
57+
- PB-44752 Add new datacheck for existing resources v5 encrypted with hard or soft deleted shared metadata key
58+
59+
### Fixed
60+
- PB-45060 Fixes custom fields json schema properties type
61+
- PB-45062 Fix user_setup_complete.php template in LU folder instead of AD
62+
- PB-44760 Fix healthcheck "record not found in table organization_settings" issue (GITHUB #563)
63+
64+
### Maintenance
65+
- PB-44915 Change DDEV containers names and URLs from passbolt-ce-api to passbolt-api
66+
- PB-44813 Update ddev config
67+
568
## [5.4.1] - 2025-08-13
669
### Fixed
770
- PB-44220 Enforces the format to datetime string when persisting the last_logged_in field on users login

0 commit comments

Comments
 (0)