More polishing of http basic auth

* Replace "! -z" with "-n"
* Replace "openssl' with "$OPENSSL"
* Redirect stderr output of $OPENSSL to /dev/null to supress "WARNING: can't open config file: /usr/local/etc/ssl/openssl.cnf" message (see #833)
* Remove unnecessary spaces from $GET_REQ11 string.
This commit is contained in:
David Cooper 2020-01-16 13:41:27 -05:00 committed by GitHub
parent 91e14a3840
commit 4b6bdf8cdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18419,10 +18419,10 @@ determine_service() {
$SNEAKY && \
ua="$UA_SNEAKY" || \
ua="$UA_STD"
if [[ ! -z "$BASICAUTH" ]]; then
basicauth_header="Authorization: Basic $(openssl base64 <<< $BASICAUTH) \r\n"
if [[ -n "$BASICAUTH" ]]; then
basicauth_header="Authorization: Basic $($OPENSSL base64 <<< "$BASICAUTH" 2>/dev/null)\r\n"
fi
GET_REQ11="GET $URL_PATH HTTP/1.1\r\nHost: $NODE\r\nUser-Agent: $ua\r\n$basicauth_header Accept-Encoding: identity\r\nAccept: text/*\r\nConnection: Close\r\n\r\n"
GET_REQ11="GET $URL_PATH HTTP/1.1\r\nHost: $NODE\r\nUser-Agent: $ua\r\n${basicauth_header}Accept-Encoding: identity\r\nAccept: text/*\r\nConnection: Close\r\n\r\n"
# returns always 0:
service_detection $OPTIMAL_PROTO
else # STARTTLS