diff --git a/test/testdata/address_key.json b/test/testdata/address_key.json index a3537752..8a03b895 100644 --- a/test/testdata/address_key.json +++ b/test/testdata/address_key.json @@ -1,13 +1,13 @@ [ - { - "ID": "MhF8dxtN5Lz_GruskN3L9kTKWusZHBdhWaxc7w1tgze2qB6uM9AyC6mWRQg1B7WGZ_r-9gn-XC95-IkpNJr0jg==", - "Primary": 1, - "Active": 1, - "Flags": 3, - "Version": 3, - "Activation": null, - "PrivateKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n\n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\nYYsMDlA=\n=ZwJf\n-----END PGP PRIVATE KEY BLOCK-----", - "Token": null, - "Signature": null - } + { + "ID": "MhF8dxtN5Lz_GruskN3L9kTKWusZHBdhWaxc7w1tgze2qB6uM9AyC6mWRQg1B7WGZ_r-9gn-XC95-IkpNJr0jg==", + "Primary": 1, + "Active": 1, + "Flags": 3, + "Version": 3, + "Activation": null, + "PrivateKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n\n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\n=Uc7+\n-----END PGP PRIVATE KEY BLOCK-----", + "Token": null, + "Signature": null + } ] diff --git a/test/testdata/user_key.json b/test/testdata/user_key.json index fd354045..7169a2c3 100644 --- a/test/testdata/user_key.json +++ b/test/testdata/user_key.json @@ -1,11 +1,11 @@ [ - { - "ID": "IlnTbqicN-2HfUGIn-ki8bqZfLqNj5ErUB0z24Qx5g-4NvrrIc6GLvEpj2EPfwGDv28aKYVRRrSgEFhR_zhlkA==", - "Version": 3, - "PrivateKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\r\n\r\n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\r\na7RmMPBR30nWAMrvteun5z2n8rizgEZHcmE=\r\n=2e5K\r\n-----END PGP PRIVATE KEY BLOCK-----", - "Fingerprint": "c93f767df53b0ca8395cfde90483475164ec6353", - "Activation": null, - "Primary": 1, - "Active": 1 - } + { + "ID": "IlnTbqicN-2HfUGIn-ki8bqZfLqNj5ErUB0z24Qx5g-4NvrrIc6GLvEpj2EPfwGDv28aKYVRRrSgEFhR_zhlkA==", + "Version": 3, + "PrivateKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n\n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\n=Uc7+\n-----END PGP PRIVATE KEY BLOCK-----", + "Fingerprint": "c93f767df53b0ca8395cfde90483475164ec6353", + "Activation": null, + "Primary": 1, + "Active": 1 + } ] diff --git a/test/users_setup_test.go b/test/users_setup_test.go index 21f16d86..890b1b85 100644 --- a/test/users_setup_test.go +++ b/test/users_setup_test.go @@ -78,19 +78,19 @@ func thereIsDisconnectedUser(bddUserID string) error { } err := ctx.GetPMAPIController().AddUser(account) if err != nil { - return internalError(err, "adding user %s", account.Username()) + return internalError(err, "adding user %q", account.Username()) } err = ctx.LoginUser(account.Username(), account.Password(), account.MailboxPassword()) if err != nil { - return internalError(err, "logging user %s in", account.Username()) + return internalError(err, "logging user %q in", account.Username()) } user, err := ctx.GetUser(account.Username()) if err != nil { - return internalError(err, "getting user %s", account.Username()) + return internalError(err, "getting user %q", account.Username()) } err = user.Logout() if err != nil { - return internalError(err, "disconnecting user %s", account.Username()) + return internalError(err, "disconnecting user %q", account.Username()) } // We need to wait till event loop is stopped because when it's stopped diff --git a/utils/update_test_keys.sh b/utils/update_test_keys.sh new file mode 100755 index 00000000..9f5900d1 --- /dev/null +++ b/utils/update_test_keys.sh @@ -0,0 +1,80 @@ +# Copyright (c) 2022 Proton AG +# +# This file is part of Proton Mail Bridge. +# +# Proton Mail Bridge is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Proton Mail Bridge is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Proton Mail Bridge. If not, see . + + +FINGERPRINT=7E8B0DD8EC8EAAFAD9BE0115927CCDB2C9C9CFD5 +PASSPHRASE=$(jq -r '.mailboxPasswords.user' < ./test/accounts/fake.json) + + +export_key_from_testdata(){ + jq -r '.[0].PrivateKey' < ./test/testdata/user_key.json +} + +import_tmp_key() { + echo "$PASSPHRASE" | gpg --batch --yes --passphrase-fd 0 --import "$1" +} + +delete_test_keys_from_keyring() { + gpg --delete-secret-key ${FINGERPRINT} +} + +update_key_expiration(){ + echo -n "$PASSPHRASE" | xclip + echo "RUN: + key 0 + expire + 2y + y + ${PASSPHRASE} (should be in clipboard) + key 1 + expire + 2y + y + save + + " + gpg --edit-key ${FINGERPRINT} +} + +export_new_key_to_armor() { + echo -n "$PASSPHRASE" | xclip + echo "passphrase '${PASSPHRASE}' is in your clipboard" >&2 + gpg --export-secret-keys --armor ${FINGERPRINT} +} + +replace_testdata_keys() { + jq ".[0].PrivateKey=\"$(cat "$1")\"" < "$2" > tmp + mv tmp "$2" +} + +update_test_keys(){ + tmpkey=tmp_key.asc + + export_key_from_testdata > ${tmpkey} + import_tmp_key ${tmpkey} + + update_key_expiration + + export_new_key_to_armor > ${tmpkey} + replace_testdata_keys ${tmpkey} ./test/testdata/user_key.json + replace_testdata_keys ${tmpkey} ./test/testdata/address_key.json + + delete_test_keys_from_keyring + rm -f ${tmpkey} +} + +update_test_keys