Skip to content

Commit ca83580

Browse files
committed
Merge branch 'feature/PB-44718_Use-PGP-public-key-format-for-the-Packaging-signing-key' into 'main'
PB-44718 - download Passbolt's signing key as an OpenPGP public key instead of a keyring and use responsive keyservers See merge request passbolt/passbolt-ops/passbolt-dep-scripts!45
2 parents ee1167b + 0a246b0 commit ca83580

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.gitlab-ci/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.test-deb:
2-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
2+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm-slim
33
variables:
44
PASSBOLT_FLAVOUR: ""
55
PACKAGE_MANAGER: "apt"
@@ -60,13 +60,13 @@ Debian 12 PRO:
6060

6161
Raspbian CE:
6262
extends: .test-deb-ce
63-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
63+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm-slim
6464
before_script:
6565
- sed -i "s/ID=debian/ID=raspbian/" /etc/os-release
6666

6767
Raspbian PRO:
6868
extends: .test-deb-pro
69-
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye-slim
69+
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm-slim
7070
before_script:
7171
- sed -i "s/ID=debian/ID=raspbian/" /etc/os-release
7272

passbolt-repo-setup.ce.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ EOF
236236
}
237237

238238
pull_updated_pub_key() {
239-
declare -a serverlist=("keys.mailvelope.com" "keys.openpgp.org" "pgp.mit.edu")
239+
declare -a serverlist=("keys.openpgp.org" "keyserver.ubuntu.com")
240240
for serverin in "${serverlist[@]}"
241241
do
242242
if [ ! -d /root/.gnupg ]
@@ -246,7 +246,7 @@ pull_updated_pub_key() {
246246
# Handle gpg error in case of a server key failure
247247
# Without this check, and because we are using set -euo pipefail
248248
# The script fail in case of failure
249-
if gpg --no-default-keyring --keyring ${PASSBOLT_KEYRING_FILE} --keyserver hkps://"${serverin}" --recv-keys ${PASSBOLT_FINGERPRINT}; then
249+
if curl -sS "https://${serverin}/pks/lookup?op=get&options=mr&search=0x${PASSBOLT_FINGERPRINT}" | gpg --dearmor --yes --output ${PASSBOLT_KEYRING_FILE}; then
250250
break
251251
fi
252252
done

passbolt-repo-setup.pro.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ EOF
236236
}
237237

238238
pull_updated_pub_key() {
239-
declare -a serverlist=("keys.mailvelope.com" "keys.openpgp.org" "pgp.mit.edu")
239+
declare -a serverlist=("keys.openpgp.org" "keyserver.ubuntu.com")
240240
for serverin in "${serverlist[@]}"
241241
do
242242
if [ ! -d /root/.gnupg ]
@@ -246,7 +246,7 @@ pull_updated_pub_key() {
246246
# Handle gpg error in case of a server key failure
247247
# Without this check, and because we are using set -euo pipefail
248248
# The script fail in case of failure
249-
if gpg --no-default-keyring --keyring ${PASSBOLT_KEYRING_FILE} --keyserver hkps://"${serverin}" --recv-keys ${PASSBOLT_FINGERPRINT}; then
249+
if curl -sS "https://${serverin}/pks/lookup?op=get&options=mr&search=0x${PASSBOLT_FINGERPRINT}" | gpg --dearmor --yes --output ${PASSBOLT_KEYRING_FILE}; then
250250
break
251251
fi
252252
done

0 commit comments

Comments
 (0)