Page MenuHomeFreeBSD
Files F144662221

D29533.id86704.diff
No OneTemporary
Actions

D29533.id86704.diff
View Options

diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -73,6 +73,7 @@
#include <locale.h>
#include <netdb.h>
#include <stdarg.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -1387,6 +1388,8 @@
int verbose;
int af, val;
int serrno;
+ bool isproxyauth = false;
+ http_auth_challenges_t proxy_challenges;
#ifdef INET6
af = AF_UNSPEC;
@@ -1404,18 +1407,58 @@
curl = (purl != NULL) ? purl : URL;
+retry:
if ((conn = fetch_connect(curl->host, curl->port, af, verbose)) == NULL)
/* fetch_connect() has already set an error code */
return (NULL);
init_http_headerbuf(&headerbuf);
if (strcmp(URL->scheme, SCHEME_HTTPS) == 0 && purl) {
- http_cmd(conn, "CONNECT %s:%d HTTP/1.1",
- URL->host, URL->port);
- http_cmd(conn, "Host: %s:%d",
- URL->host, URL->port);
+ init_http_auth_challenges(&proxy_challenges);
+ http_cmd(conn, "CONNECT %s:%d HTTP/1.1", URL->host, URL->port);
+ http_cmd(conn, "Host: %s:%d", URL->host, URL->port);
+ if (isproxyauth) {
+ http_auth_params_t aparams;
+ init_http_auth_params(&aparams);
+ if (*purl->user || *purl->pwd) {
+ aparams.user = strdup(purl->user);
+ aparams.password = strdup(purl->pwd);
+ } else if ((p = getenv("HTTP_PROXY_AUTH")) != NULL &&
+ *p != '\0') {
+ if (http_authfromenv(p, &aparams) < 0) {
+ http_seterr(HTTP_NEED_PROXY_AUTH);
+ fetch_syserr();
+ goto ouch;
+ }
+ } else if (fetch_netrc_auth(purl) == 0) {
+ aparams.user = strdup(purl->user);
+ aparams.password = strdup(purl->pwd);
+ } else {
+ /*
+ * No auth information found in system - exiting with
+ * warning.
+ */
+ warnx("Missing username and/or password set");
+ fetch_syserr();
+ goto ouch;
+ }
+ http_authorize(conn, "Proxy-Authorization", &proxy_challenges,
+ &aparams, purl);
+ clean_http_auth_params(&aparams);
+ }
http_cmd(conn, "");
- if (http_get_reply(conn) != HTTP_OK) {
- http_seterr(conn->err);
+ /* Get reply from CONNECT Tunnel attempt */
+ int httpreply = http_get_reply(conn);
+ if (httpreply != HTTP_OK) {
+ http_seterr(httpreply);
+ /* If the error is a 407/HTTP_NEED_PROXY_AUTH */
+ if (httpreply == HTTP_NEED_PROXY_AUTH &&
+ ! isproxyauth) {
+ /* Try again with authentication. */
+ clean_http_headerbuf(&headerbuf);
+ fetch_close(conn);
+ isproxyauth = true;
+ goto retry;
+ }
goto ouch;
}
/* Read and discard the rest of the proxy response */

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 11, 6:31 PM (5 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28659807
Default Alt Text
D29533.id86704.diff (2 KB)

Event Timeline