From f7889e1af7bb70d050de55b01594a0a48430c73f Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Fri, 4 Aug 2017 08:35:45 +0530 Subject: [PATCH] Add TLS request for healthcheck (#4740) --- buildscripts/healthcheck.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/buildscripts/healthcheck.sh b/buildscripts/healthcheck.sh index 142eca50e..325c97c74 100644 --- a/buildscripts/healthcheck.sh +++ b/buildscripts/healthcheck.sh @@ -16,17 +16,28 @@ # _init () { - address="http://127.0.0.1:9000" + scheme="http://" + address="127.0.0.1:9000" resource="/minio/index.html" } HealthCheckMain () { # Get the http response code - http_response=$(curl -s -o /dev/null -I -w "%{http_code}" ${address}${resource}) + http_response=$(curl -s -k -o /dev/null -I -w "%{http_code}" ${scheme}${address}${resource}) + + # Get the http response body + http_response_body=$(curl -k -s ${scheme}${address}${resource}) + + # server returns response 403 and body "SSL required" if non-TLS connection is attempted on a TLS-configured server. + # change the scheme and try again + if [ "$http_response" = "403" ] && [ "$http_response_body" = "SSL required" ]; then + scheme="https://" + http_response=$(curl -s -k -o /dev/null -I -w "%{http_code}" ${scheme}${address}${resource}) + fi # If http_repsonse is 200 - server is up. # When MINIO_BROWSER is set to off, curl responds with 404. We assume that the the server is up - [ "$http_response" == "200" ] || [ "$http_response" == "404" ] + [ "$http_response" = "200" ] || [ "$http_response" = "404" ] } _init && HealthCheckMain