From: Fuad Muhic <fmuhic@capeannenterprises.com>
Date: Wed, 27 Jun 2018 12:10:54 +0000 (+0200)
Subject: getConnection now works correctly when ARVADOS_API_HOST_INSECURE is set to TRUE
X-Git-Tag: 1.2.0~69^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/116f934f0359b27ae3bd3047860fc5e7f27bdcf5

getConnection now works correctly when ARVADOS_API_HOST_INSECURE is set to TRUE

Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic@capeannenterprises.com>
---

diff --git a/sdk/R/R/HttpRequest.R b/sdk/R/R/HttpRequest.R
index 95dd375deb..abbe5b7b44 100644
--- a/sdk/R/R/HttpRequest.R
+++ b/sdk/R/R/HttpRequest.R
@@ -30,7 +30,7 @@ HttpRequest <- R6::R6Class(
 
             config <- httr::add_headers(unlist(headers))
             if(toString(Sys.getenv("ARVADOS_API_HOST_INSECURE") == "TRUE"))
-               config$options = list(ssl_verifypeer = FALSE)
+               config$options = list(ssl_verifypeer = 0L)
 
             # times = 1 regular call + numberOfRetries
             response <- httr::RETRY(verb, url = url, body = body,
diff --git a/sdk/R/R/RESTService.R b/sdk/R/R/RESTService.R
index ac65d0df3f..7048b159cc 100644
--- a/sdk/R/R/RESTService.R
+++ b/sdk/R/R/RESTService.R
@@ -195,6 +195,9 @@ RESTService <- R6::R6Class(
             h <- curl::new_handle()
             curl::handle_setheaders(h, .list = headers)
 
+            if(toString(Sys.getenv("ARVADOS_API_HOST_INSECURE") == "TRUE"))
+               curl::handle_setopt(h, ssl_verifypeer = 0L)
+
             conn <- curl::curl(url = fileURL, open = openMode, handle = h)
 
             conn