Skip to content
This repository was archived by the owner on Jan 18, 2025. It is now read-only.

Commit 381aac7

Browse files
dhermesdhermes
committed
Final iteration to make system tests pass.
Two main things happened here: 1. Manually encrypted files instead of using `travis encrypt-file` 2. Removed OAUTH2CLIENT_TEST_USER_KEY_PATH fallback. The first was because `travis encrypt-file` was failing mysteriously. To make up, I ran openssl enc -d -a -md sha1 -aes-256-cbc -nosalt -p and typed random noise into the keyboard to create a candidate KEY and IV (H/T http://superuser.com/a/471524). After doing this, they were set via travis env set OAUTH2CLIENT_KEY "..KEY.." --repo "google/oauth2client" travis env set OAUTH2CLIENT_IV "..IV.." --repo "google/oauth2client" To actually do the encryption locally: openssl aes-256-cbc -K "..KEY.." \ -iv "..IV.." \ -in file-to-encrypt \ -out file-to-encrypt.enc -e As for the second change, OAUTH2CLIENT_TEST_USER_KEY_PATH was previously allowed to fallback to client._get_well_known_file() in system tests, but this is a problem since that function throws an OSError when the directory does not exist. (It does not exist on Travis.)
1 parent 1929a8c commit 381aac7

5 files changed

Lines changed: 7 additions & 8 deletions

File tree

‎scripts/run_system_tests.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
JSON_KEY_PATH = os.getenv('OAUTH2CLIENT_TEST_JSON_KEY_PATH')
1010
P12_KEY_PATH = os.getenv('OAUTH2CLIENT_TEST_P12_KEY_PATH')
1111
P12_KEY_EMAIL = os.getenv('OAUTH2CLIENT_TEST_P12_KEY_EMAIL')
12-
USER_KEY_PATH = os.getenv('OAUTH2CLIENT_TEST_USER_KEY_PATH',
13-
client._get_well_known_file())
12+
USER_KEY_PATH = os.getenv('OAUTH2CLIENT_TEST_USER_KEY_PATH')
1413
USER_KEY_EMAIL = os.getenv('OAUTH2CLIENT_TEST_USER_KEY_EMAIL')
1514

1615
SCOPE = ('https://www.googleapis.com/auth/plus.login',

‎scripts/run_system_tests.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ if [[ "${TRAVIS}" == "true" ]]; then
2424
[[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
2525
echo "Running in Travis during merge, decrypting stored key file."
2626
# Convert encrypted JSON key file into decrypted file to be used.
27-
openssl aes-256-cbc -K ${encrypted_f2d92020e83e_key} \
28-
-iv ${encrypted_f2d92020e83e_iv} \
27+
openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \
28+
-iv ${OAUTH2CLIENT_IV} \
2929
-in tests/data/key.json.enc \
3030
-out ${OAUTH2CLIENT_TEST_JSON_KEY_PATH} -d
3131
# Convert encrypted P12 key file into decrypted file to be used.
32-
openssl aes-256-cbc -K ${encrypted_f2d92020e83e_key} \
33-
-iv ${encrypted_f2d92020e83e_iv} \
32+
openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \
33+
-iv ${OAUTH2CLIENT_IV} \
3434
-in tests/data/key.p12.enc \
3535
-out ${OAUTH2CLIENT_TEST_P12_KEY_PATH} -d
3636
# Convert encrypted User JSON key file into decrypted file to be used.
37-
openssl aes-256-cbc -K ${encrypted_f2d92020e83e_key} \
38-
-iv ${encrypted_f2d92020e83e_iv} \
37+
openssl aes-256-cbc -K ${OAUTH2CLIENT_KEY} \
38+
-iv ${OAUTH2CLIENT_IV} \
3939
-in tests/data/user-key.json.enc \
4040
-out ${OAUTH2CLIENT_TEST_USER_KEY_PATH} -d
4141
else

‎tests/data/key.json.enc‎

0 Bytes
Binary file not shown.

‎tests/data/key.p12.enc‎

0 Bytes
Binary file not shown.

‎tests/data/user-key.json.enc‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)