Merge pull request #1454 from dcooper16/basic_auth_polishing

More polishing of http basic auth
This commit is contained in:
Dirk Wetter 2020-01-16 20:24:39 +01:00 committed by GitHub
commit c2060c08f3
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