From 353f88bcf390be109c677919da70232d08f6ab77 Mon Sep 17 00:00:00 2001 From: Aron Atkins Date: Tue, 21 Jan 2025 16:15:39 -0500 Subject: [PATCH] use base64 encoded secrets in test to avoid base64 errors with new libssl fixes #1130 --- NEWS.md | 3 +++ tests/testthat/_snaps/http.md | 4 ++-- tests/testthat/test-client-cloud.R | 2 +- tests/testthat/test-http.R | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index d31332e1..b857255d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ # rsconnect (development version) +* Use base64 encoded test data. Addresses CRAN test failures when run with + newer libssl. (#1130) + # rsconnect 1.3.3 * Avoid "legacy" time zone names in tests, as they are not available by diff --git a/tests/testthat/_snaps/http.md b/tests/testthat/_snaps/http.md index 3b3530ff..b6278745 100644 --- a/tests/testthat/_snaps/http.md +++ b/tests/testthat/_snaps/http.md @@ -11,11 +11,11 @@ # authHeaders() picks correct method based on supplied fields Code - str(authHeaders(list(secret = "123"), url, "GET")) + str(authHeaders(list(secret = openssl::base64_encode("123")), url, "GET")) Output List of 3 $ Date : chr "Thu, 09 Mar 2023 14:29:00 GMT" - $ X-Auth-Signature : chr "YmJiMjM1Y2E5MjFlNGFkOTMxZjQxNzU4NGQ1ZTk3MzYyYzg1YjcyMzUyMzhlYTY4Y2UxMjI1MzJkZWE1MDA3NQ==; version=1" + $ X-Auth-Signature : chr "ZmQwNjkxNGVmZmZiN2FjNzkzZTkwYzE4OTg1Y2M5NTIxNGZjNTcxY2I5M2RhYzFiNWIxODY5NjFjODMzYjE3ZA==; version=1" $ X-Content-Checksum: chr "d41d8cd98f00b204e9800998ecf8427e" Code str(authHeaders(list(private_key = key), url, "GET")) diff --git a/tests/testthat/test-client-cloud.R b/tests/testthat/test-client-cloud.R index 4db1ed71..e58990f0 100644 --- a/tests/testthat/test-client-cloud.R +++ b/tests/testthat/test-client-cloud.R @@ -120,7 +120,7 @@ configureTestAccount <- function(server = "posit.cloud", name = NULL) { setAccountInfo( name = name, token = "foo", - secret = "bar", + secret = openssl::base64_encode("bar"), server = server ) } diff --git a/tests/testthat/test-http.R b/tests/testthat/test-http.R index 68760cb7..3334cc7c 100644 --- a/tests/testthat/test-http.R +++ b/tests/testthat/test-http.R @@ -54,7 +54,7 @@ a3hEFijsjg/+FDMr+iAVzjry key <- openssl::base64_encode(openssl::read_key(key_string)) expect_snapshot({ - str(authHeaders(list(secret = "123"), url, "GET")) + str(authHeaders(list(secret = openssl::base64_encode("123")), url, "GET")) str(authHeaders(list(private_key = key), url, "GET")) })