diff options
Diffstat (limited to 'lib/libfetch/http.c')
-rw-r--r-- | lib/libfetch/http.c | 1478 |
1 files changed, 742 insertions, 736 deletions
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c index 04b7964..eed12f2 100644 --- a/lib/libfetch/http.c +++ b/lib/libfetch/http.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); * no representations about the suitability of this software for any * purpose. It is provided "as is" without express or implied * warranty. - * + * * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF @@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$"); #include "common.h" #include "httperr.h" -extern char *__progname; /* XXX not portable */ +extern char *__progname; /* XXX not portable */ /* Maximum number of redirects to follow */ #define MAX_REDIRECT 5 @@ -96,28 +96,28 @@ extern char *__progname; /* XXX not portable */ #define HTTP_PROTOCOL_ERROR 999 #define HTTP_REDIRECT(xyz) ((xyz) == HTTP_MOVED_PERM \ - || (xyz) == HTTP_MOVED_TEMP \ - || (xyz) == HTTP_SEE_OTHER) + || (xyz) == HTTP_MOVED_TEMP \ + || (xyz) == HTTP_SEE_OTHER) #define HTTP_ERROR(xyz) ((xyz) > 400 && (xyz) < 599) - + /***************************************************************************** * I/O functions for decoding chunked streams */ struct cookie { - int fd; - char *buf; - size_t b_size; - ssize_t b_len; - int b_pos; - int eof; - int error; - size_t chunksize; + int fd; + char *buf; + size_t b_size; + ssize_t b_len; + int b_pos; + int eof; + int error; + size_t chunksize; #ifndef NDEBUG - size_t total; + size_t total; #endif }; @@ -127,36 +127,42 @@ struct cookie static int _http_new_chunk(struct cookie *c) { - char *p; - - if (_fetch_getln(c->fd, &c->buf, &c->b_size, &c->b_len) == -1) - return -1; - - if (c->b_len < 2 || !ishexnumber(*c->buf)) - return -1; - - for (p = c->buf; !isspace(*p) && *p != ';' && p < c->buf + c->b_len; ++p) - if (!ishexnumber(*p)) - return -1; - else if (isdigit(*p)) - c->chunksize = c->chunksize * 16 + *p - '0'; - else - c->chunksize = c->chunksize * 16 + 10 + tolower(*p) - 'a'; - + char *p; + + if (_fetch_getln(c->fd, &c->buf, &c->b_size, &c->b_len) == -1) + return (-1); + + if (c->b_len < 2 || !ishexnumber(*c->buf)) + return (-1); + + for (p = c->buf; !isspace(*p) && p < c->buf + c->b_len; ++p) { + if (*p == ';') + break; + if (!ishexnumber(*p)) + return (-1); + if (isdigit(*p)) { + c->chunksize = c->chunksize * 16 + + *p - '0'; + } else { + c->chunksize = c->chunksize * 16 + + 10 + tolower(*p) - 'a'; + } + } + #ifndef NDEBUG - if (fetchDebug) { - c->total += c->chunksize; - if (c->chunksize == 0) - fprintf(stderr, "_http_fillbuf(): " - "end of last chunk\n"); - else - fprintf(stderr, "_http_fillbuf(): " - "new chunk: %lu (%lu)\n", - (unsigned long)c->chunksize, (unsigned long)c->total); - } + if (fetchDebug) { + c->total += c->chunksize; + if (c->chunksize == 0) + fprintf(stderr, "_http_fillbuf(): " + "end of last chunk\n"); + else + fprintf(stderr, "_http_fillbuf(): " + "new chunk: %lu (%lu)\n", + (unsigned long)c->chunksize, (unsigned long)c->total); + } #endif - - return c->chunksize; + + return (c->chunksize); } /* @@ -165,45 +171,45 @@ _http_new_chunk(struct cookie *c) static int _http_fillbuf(struct cookie *c) { - if (c->error) - return -1; - if (c->eof) - return 0; - - if (c->chunksize == 0) { - switch (_http_new_chunk(c)) { - case -1: - c->error = 1; - return -1; - case 0: - c->eof = 1; - return 0; + if (c->error) + return (-1); + if (c->eof) + return (0); + + if (c->chunksize == 0) { + switch (_http_new_chunk(c)) { + case -1: + c->error = 1; + return (-1); + case 0: + c->eof = 1; + return (0); + } } - } - - if (c->b_size < c->chunksize) { - char *tmp; - - if ((tmp = realloc(c->buf, c->chunksize)) == NULL) - return -1; - c->buf = tmp; - c->b_size = c->chunksize; - } - - if ((c->b_len = read(c->fd, c->buf, c->chunksize)) == -1) - return -1; - c->chunksize -= c->b_len; - - if (c->chunksize == 0) { - char endl; - if (read(c->fd, &endl, 1) == -1 || - read(c->fd, &endl, 1) == -1) - return -1; - } - - c->b_pos = 0; - - return c->b_len; + + if (c->b_size < c->chunksize) { + char *tmp; + + if ((tmp = realloc(c->buf, c->chunksize)) == NULL) + return (-1); + c->buf = tmp; + c->b_size = c->chunksize; + } + + if ((c->b_len = read(c->fd, c->buf, c->chunksize)) == -1) + return (-1); + c->chunksize -= c->b_len; + + if (c->chunksize == 0) { + char endl; + if (read(c->fd, &endl, 1) == -1 || + read(c->fd, &endl, 1) == -1) + return (-1); + } + + c->b_pos = 0; + + return (c->b_len); } /* @@ -212,29 +218,29 @@ _http_fillbuf(struct cookie *c) static int _http_readfn(void *v, char *buf, int len) { - struct cookie *c = (struct cookie *)v; - int l, pos; - - if (c->error) - return -1; - if (c->eof) - return 0; - - for (pos = 0; len > 0; pos += l, len -= l) { - /* empty buffer */ - if (!c->buf || c->b_pos == c->b_len) - if (_http_fillbuf(c) < 1) - break; - l = c->b_len - c->b_pos; - if (len < l) - l = len; - bcopy(c->buf + c->b_pos, buf + pos, l); - c->b_pos += l; - } - - if (!pos && c->error) - return -1; - return pos; + struct cookie *c = (struct cookie *)v; + int l, pos; + + if (c->error) + return (-1); + if (c->eof) + return (0); + + for (pos = 0; len > 0; pos += l, len -= l) { + /* empty buffer */ + if (!c->buf || c->b_pos == c->b_len) + if (_http_fillbuf(c) < 1) + break; + l = c->b_len - c->b_pos; + if (len < l) + l = len; + bcopy(c->buf + c->b_pos, buf + pos, l); + c->b_pos += l; + } + + if (!pos && c->error) + return (-1); + return (pos); } /* @@ -243,9 +249,9 @@ _http_readfn(void *v, char *buf, int len) static int _http_writefn(void *v, const char *buf, int len) { - struct cookie *c = (struct cookie *)v; - - return write(c->fd, buf, len); + struct cookie *c = (struct cookie *)v; + + return (write(c->fd, buf, len)); } /* @@ -254,14 +260,14 @@ _http_writefn(void *v, const char *buf, int len) static int _http_closefn(void *v) { - struct cookie *c = (struct cookie *)v; - int r; - - r = close(c->fd); - if (c->buf) - free(c->buf); - free(c); - return r; + struct cookie *c = (struct cookie *)v; + int r; + + r = close(c->fd); + if (c->buf) + free(c->buf); + free(c); + return (r); } /* @@ -270,58 +276,59 @@ _http_closefn(void *v) static FILE * _http_funopen(int fd) { - struct cookie *c; - FILE *f; - - if ((c = calloc(1, sizeof *c)) == NULL) { - _fetch_syserr(); - return NULL; - } - c->fd = fd; - if (!(f = funopen(c, _http_readfn, _http_writefn, NULL, _http_closefn))) { - _fetch_syserr(); - free(c); - return NULL; - } - return f; + struct cookie *c; + FILE *f; + + if ((c = calloc(1, sizeof *c)) == NULL) { + _fetch_syserr(); + return (NULL); + } + c->fd = fd; + f = funopen(c, _http_readfn, _http_writefn, NULL, _http_closefn); + if (f == NULL) { + _fetch_syserr(); + free(c); + return (NULL); + } + return (f); } - + /***************************************************************************** * Helper functions for talking to the server and parsing its replies */ /* Header types */ typedef enum { - hdr_syserror = -2, - hdr_error = -1, - hdr_end = 0, - hdr_unknown = 1, - hdr_content_length, - hdr_content_range, - hdr_last_modified, - hdr_location, - hdr_transfer_encoding, - hdr_www_authenticate + hdr_syserror = -2, + hdr_error = -1, + hdr_end = 0, + hdr_unknown = 1, + hdr_content_length, + hdr_content_range, + hdr_last_modified, + hdr_location, + hdr_transfer_encoding, + hdr_www_authenticate } hdr_t; /* Names of interesting headers */ static struct { - hdr_t num; - const char *name; + hdr_t num; + const char *name; } hdr_names[] = { - { hdr_content_length, "Content-Length" }, - { hdr_content_range, "Content-Range" }, - { hdr_last_modified, "Last-Modified" }, - { hdr_location, "Location" }, - { hdr_transfer_encoding, "Transfer-Encoding" }, - { hdr_www_authenticate, "WWW-Authenticate" }, - { hdr_unknown, NULL }, + { hdr_content_length, "Content-Length" }, + { hdr_content_range, "Content-Range" }, + { hdr_last_modified, "Last-Modified" }, + { hdr_location, "Location" }, + { hdr_transfer_encoding, "Transfer-Encoding" }, + { hdr_www_authenticate, "WWW-Authenticate" }, + { hdr_unknown, NULL }, }; -static char *reply_buf; -static size_t reply_size; -static size_t reply_length; +static char *reply_buf; +static size_t reply_size; +static size_t reply_length; /* * Send a formatted line; optionally echo to terminal @@ -329,30 +336,30 @@ static size_t reply_length; static int _http_cmd(int fd, const char *fmt, ...) { - va_list ap; - size_t len; - char *msg; - int r; - - va_start(ap, fmt); - len = vasprintf(&msg, fmt, ap); - va_end(ap); - - if (msg == NULL) { - errno = ENOMEM; - _fetch_syserr(); - return -1; - } - - r = _fetch_putln(fd, msg, len); - free(msg); - - if (r == -1) { - _fetch_syserr(); - return -1; - } - - return 0; + va_list ap; + size_t len; + char *msg; + int r; + + va_start(ap, fmt); + len = vasprintf(&msg, fmt, ap); + va_end(ap); + + if (msg == NULL) { + errno = ENOMEM; + _fetch_syserr(); + return (-1); + } + + r = _fetch_putln(fd, msg, len); + free(msg); + + if (r == -1) { + _fetch_syserr(); + return (-1); + } + + return (0); } /* @@ -361,50 +368,47 @@ _http_cmd(int fd, const char *fmt, ...) static int _http_get_reply(int fd) { - char *p; - - if (_fetch_getln(fd, &reply_buf, &reply_size, &reply_length) == -1) - return -1; - /* - * A valid status line looks like "HTTP/m.n xyz reason" where m - * and n are the major and minor protocol version numbers and xyz - * is the reply code. - * Unfortunately, there are servers out there (NCSA 1.5.1, to name - * just one) that do not send a version number, so we can't rely - * on finding one, but if we do, insist on it being 1.0 or 1.1. - * We don't care about the reason phrase. - */ - if (strncmp(reply_buf, "HTTP", 4) != 0) - return HTTP_PROTOCOL_ERROR; - p = reply_buf + 4; - if (*p == '/') { - if (p[1] != '1' || p[2] != '.' || (p[3] != '0' && p[3] != '1')) - return HTTP_PROTOCOL_ERROR; - p += 4; - } - if (*p != ' ' - || !isdigit(p[1]) - || !isdigit(p[2]) - || !isdigit(p[3])) - return HTTP_PROTOCOL_ERROR; - - return ((p[1] - '0') * 100 + (p[2] - '0') * 10 + (p[3] - '0')); + char *p; + + if (_fetch_getln(fd, &reply_buf, &reply_size, &reply_length) == -1) + return (-1); + /* + * A valid status line looks like "HTTP/m.n xyz reason" where m + * and n are the major and minor protocol version numbers and xyz + * is the reply code. + * Unfortunately, there are servers out there (NCSA 1.5.1, to name + * just one) that do not send a version number, so we can't rely + * on finding one, but if we do, insist on it being 1.0 or 1.1. + * We don't care about the reason phrase. + */ + if (strncmp(reply_buf, "HTTP", 4) != 0) + return (HTTP_PROTOCOL_ERROR); + p = reply_buf + 4; + if (*p == '/') { + if (p[1] != '1' || p[2] != '.' || (p[3] != '0' && p[3] != '1')) + return (HTTP_PROTOCOL_ERROR); + p += 4; + } + if (*p != ' ' || !isdigit(p[1]) || !isdigit(p[2]) || !isdigit(p[3])) + return (HTTP_PROTOCOL_ERROR); + + return ((p[1] - '0') * 100 + (p[2] - '0') * 10 + (p[3] - '0')); } /* - * Check a header; if the type matches the given string, return a - * pointer to the beginning of the value. + * Check a header; if the type matches the given string, return a pointer + * to the beginning of the value. */ static const char * _http_match(const char *str, const char *hdr) { - while (*str && *hdr && tolower(*str++) == tolower(*hdr++)) - /* nothing */; - if (*str || *hdr != ':') - return NULL; - while (*hdr && isspace(*++hdr)) - /* nothing */; - return hdr; + while (*str && *hdr && tolower(*str++) == tolower(*hdr++)) + /* nothing */; + if (*str || *hdr != ':') + return (NULL); + while (*hdr && isspace(*++hdr)) + /* nothing */; + return (hdr); } /* @@ -413,25 +417,25 @@ _http_match(const char *str, const char *hdr) static hdr_t _http_next_header(int fd, const char **p) { - int i; - - if (_fetch_getln(fd, &reply_buf, &reply_size, &reply_length) == -1) - return hdr_syserror; - while (reply_length && isspace(reply_buf[reply_length-1])) - reply_length--; - reply_buf[reply_length] = 0; - if (reply_length == 0) - return hdr_end; - /* - * We could check for malformed headers but we don't really care. - * A valid header starts with a token immediately followed by a - * colon; a token is any sequence of non-control, non-whitespace - * characters except "()<>@,;:\\\"{}". - */ - for (i = 0; hdr_names[i].num != hdr_unknown; i++) - if ((*p = _http_match(hdr_names[i].name, reply_buf)) != NULL) - return hdr_names[i].num; - return hdr_unknown; + int i; + + if (_fetch_getln(fd, &reply_buf, &reply_size, &reply_length) == -1) + return (hdr_syserror); + while (reply_length && isspace(reply_buf[reply_length-1])) + reply_length--; + reply_buf[reply_length] = 0; + if (reply_length == 0) + return (hdr_end); + /* + * We could check for malformed headers but we don't really care. + * A valid header starts with a token immediately followed by a + * colon; a token is any sequence of non-control, non-whitespace + * characters except "()<>@,;:\\\"{}". + */ + for (i = 0; hdr_names[i].num != hdr_unknown; i++) + if ((*p = _http_match(hdr_names[i].name, reply_buf)) != NULL) + return (hdr_names[i].num); + return (hdr_unknown); } /* @@ -440,22 +444,22 @@ _http_next_header(int fd, const char **p) static int _http_parse_mtime(const char *p, time_t *mtime) { - char locale[64], *r; - struct tm tm; - - strncpy(locale, setlocale(LC_TIME, NULL), sizeof locale); - setlocale(LC_TIME, "C"); - r = strptime(p, "%a, %d %b %Y %H:%M:%S GMT", &tm); - /* XXX should add support for date-2 and date-3 */ - setlocale(LC_TIME, locale); - if (r == NULL) - return -1; - DEBUG(fprintf(stderr, "last modified: [%04d-%02d-%02d " + char locale[64], *r; + struct tm tm; + + strncpy(locale, setlocale(LC_TIME, NULL), sizeof locale); + setlocale(LC_TIME, "C"); + r = strptime(p, "%a, %d %b %Y %H:%M:%S GMT", &tm); + /* XXX should add support for date-2 and date-3 */ + setlocale(LC_TIME, locale); + if (r == NULL) + return (-1); + DEBUG(fprintf(stderr, "last modified: [%04d-%02d-%02d " "%02d:%02d:%02d]\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec)); - *mtime = timegm(&tm); - return 0; + *mtime = timegm(&tm); + return (0); } /* @@ -464,16 +468,16 @@ _http_parse_mtime(const char *p, time_t *mtime) static int _http_parse_length(const char *p, off_t *length) { - off_t len; - - for (len = 0; *p && isdigit(*p); ++p) - len = len * 10 + (*p - '0'); - if (*p) - return -1; - DEBUG(fprintf(stderr, "content length: [%lld]\n", - (long long)len)); - *length = len; - return 0; + off_t len; + + for (len = 0; *p && isdigit(*p); ++p) + len = len * 10 + (*p - '0'); + if (*p) + return (-1); + DEBUG(fprintf(stderr, "content length: [%lld]\n", + (long long)len)); + *length = len; + return (0); } /* @@ -482,31 +486,31 @@ _http_parse_length(const char *p, off_t *length) static int _http_parse_range(const char *p, off_t *offset, off_t *length, off_t *size) { - off_t first, last, len; - - if (strncasecmp(p, "bytes ", 6) != 0) - return -1; - for (first = 0, p += 6; *p && isdigit(*p); ++p) - first = first * 10 + *p - '0'; - if (*p != '-') - return -1; - for (last = 0, ++p; *p && isdigit(*p); ++p) - last = last * 10 + *p - '0'; - if (first > last || *p != '/') - return -1; - for (len = 0, ++p; *p && isdigit(*p); ++p) - len = len * 10 + *p - '0'; - if (*p || len < last - first + 1) - return -1; - DEBUG(fprintf(stderr, "content range: [%lld-%lld/%lld]\n", - (long long)first, (long long)last, (long long)len)); - *offset = first; - *length = last - first + 1; - *size = len; - return 0; + off_t first, last, len; + + if (strncasecmp(p, "bytes ", 6) != 0) + return (-1); + for (first = 0, p += 6; *p && isdigit(*p); ++p) + first = first * 10 + *p - '0'; + if (*p != '-') + return (-1); + for (last = 0, ++p; *p && isdigit(*p); ++p) + last = last * 10 + *p - '0'; + if (first > last || *p != '/') + return (-1); + for (len = 0, ++p; *p && isdigit(*p); ++p) + len = len * 10 + *p - '0'; + if (*p || len < last - first + 1) + return (-1); + DEBUG(fprintf(stderr, "content range: [%lld-%lld/%lld]\n", + (long long)first, (long long)last, (long long)len)); + *offset = first; + *length = last - first + 1; + *size = len; + return (0); } - + /***************************************************************************** * Helper functions for authorization */ @@ -515,56 +519,56 @@ _http_parse_range(const char *p, off_t *offset, off_t *length, off_t *size) * Base64 encoding */ static char * -_http_base64(char *src) +_http_base64(const char *src) { - static const char base64[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789+/"; - char *str, *dst; - size_t l; - int t, r; - - l = strlen(src); - if ((str = malloc(((l + 2) / 3) * 4)) == NULL) - return NULL; - dst = str; - r = 0; - - while (l >= 3) { - t = (src[0] << 16) | (src[1] << 8) | src[2]; - dst[0] = base64[(t >> 18) & 0x3f]; - dst[1] = base64[(t >> 12) & 0x3f]; - dst[2] = base64[(t >> 6) & 0x3f]; - dst[3] = base64[(t >> 0) & 0x3f]; - src += 3; l -= 3; - dst += 4; r += 4; - } - - switch (l) { - case 2: - t = (src[0] << 16) | (src[1] << 8); - dst[0] = base64[(t >> 18) & 0x3f]; - dst[1] = base64[(t >> 12) & 0x3f]; - dst[2] = base64[(t >> 6) & 0x3f]; - dst[3] = '='; - dst += 4; - r += 4; - break; - case 1: - t = src[0] << 16; - dst[0] = base64[(t >> 18) & 0x3f]; - dst[1] = base64[(t >> 12) & 0x3f]; - dst[2] = dst[3] = '='; - dst += 4; - r += 4; - break; - case 0: - break; - } - - *dst = 0; - return str; + static const char base64[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"; + char *str, *dst; + size_t l; + int t, r; + + l = strlen(src); + if ((str = malloc(((l + 2) / 3) * 4)) == NULL) + return (NULL); + dst = str; + r = 0; + + while (l >= 3) { + t = (src[0] << 16) | (src[1] << 8) | src[2]; + dst[0] = base64[(t >> 18) & 0x3f]; + dst[1] = base64[(t >> 12) & 0x3f]; + dst[2] = base64[(t >> 6) & 0x3f]; + dst[3] = base64[(t >> 0) & 0x3f]; + src += 3; l -= 3; + dst += 4; r += 4; + } + + switch (l) { + case 2: + t = (src[0] << 16) | (src[1] << 8); + dst[0] = base64[(t >> 18) & 0x3f]; + dst[1] = base64[(t >> 12) & 0x3f]; + dst[2] = base64[(t >> 6) & 0x3f]; + dst[3] = '='; + dst += 4; + r += 4; + break; + case 1: + t = src[0] << 16; + dst[0] = base64[(t >> 18) & 0x3f]; + dst[1] = base64[(t >> 12) & 0x3f]; + dst[2] = dst[3] = '='; + dst += 4; + r += 4; + break; + case 0: + break; + } + + *dst = 0; + return (str); } /* @@ -573,20 +577,20 @@ _http_base64(char *src) static int _http_basic_auth(int fd, const char *hdr, const char *usr, const char *pwd) { - char *upw, *auth; - int r; - - DEBUG(fprintf(stderr, "usr: [%s]\n", usr)); - DEBUG(fprintf(stderr, "pwd: [%s]\n", pwd)); - if (asprintf(&upw, "%s:%s", usr, pwd) == -1) - return -1; - auth = _http_base64(upw); - free(upw); - if (auth == NULL) - return -1; - r = _http_cmd(fd, "%s: Basic %s", hdr, auth); - free(auth); - return r; + char *upw, *auth; + int r; + + DEBUG(fprintf(stderr, "usr: [%s]\n", usr)); + DEBUG(fprintf(stderr, "pwd: [%s]\n", pwd)); + if (asprintf(&upw, "%s:%s", usr, pwd) == -1) + return (-1); + auth = _http_base64(upw); + free(upw); + if (auth == NULL) + return (-1); + r = _http_cmd(fd, "%s: Basic %s", hdr, auth); + free(auth); + return (r); } /* @@ -595,126 +599,128 @@ _http_basic_auth(int fd, const char *hdr, const char *usr, const char *pwd) static int _http_authorize(int fd, const char *hdr, const char *p) { - /* basic authorization */ - if (strncasecmp(p, "basic:", 6) == 0) { - char *user, *pwd, *str; - int r; - - /* skip realm */ - for (p += 6; *p && *p != ':'; ++p) - /* nothing */ ; - if (!*p || strchr(++p, ':') == NULL) - return -1; - if ((str = strdup(p)) == NULL) - return -1; /* XXX */ - user = str; - pwd = strchr(str, ':'); - *pwd++ = '\0'; - r = _http_basic_auth(fd, hdr, user, pwd); - free(str); - return r; - } - return -1; + /* basic authorization */ + if (strncasecmp(p, "basic:", 6) == 0) { + char *user, *pwd, *str; + int r; + + /* skip realm */ + for (p += 6; *p && *p != ':'; ++p) + /* nothing */ ; + if (!*p || strchr(++p, ':') == NULL) + return (-1); + if ((str = strdup(p)) == NULL) + return (-1); /* XXX */ + user = str; + pwd = strchr(str, ':'); + *pwd++ = '\0'; + r = _http_basic_auth(fd, hdr, user, pwd); + free(str); + return (r); + } + return (-1); } - + /***************************************************************************** * Helper functions for connecting to a server or proxy */ /* - * Connect to the correct HTTP server or proxy. + * Connect to the correct HTTP server or proxy. */ static int _http_connect(struct url *URL, struct url *purl, const char *flags) { - int verbose; - int af, fd; - + int verbose; + int af, fd; + #ifdef INET6 - af = AF_UNSPEC; + af = AF_UNSPEC; #else - af = AF_INET; -#endif - - verbose = CHECK_FLAG('v'); - if (CHECK_FLAG('4')) af = AF_INET; +#endif + + verbose = CHECK_FLAG('v'); + if (CHECK_FLAG('4')) + af = AF_INET; #ifdef INET6 - else if (CHECK_FLAG('6')) - af = AF_INET6; + else if (CHECK_FLAG('6')) + af = AF_INET6; #endif - if (purl) { - URL = purl; - } else if (strcasecmp(URL->scheme, SCHEME_FTP) == 0) { - /* can't talk http to an ftp server */ - /* XXX should set an error code */ - return -1; - } - - if ((fd = _fetch_connect(URL->host, URL->port, af, verbose)) == -1) - /* _fetch_connect() has already set an error code */ - return -1; - return fd; + if (purl) { + URL = purl; + } else if (strcasecmp(URL->scheme, SCHEME_FTP) == 0) { + /* can't talk http to an ftp server */ + /* XXX should set an error code */ + return (-1); + } + + if ((fd = _fetch_connect(URL->host, URL->port, af, verbose)) == -1) + /* _fetch_connect() has already set an error code */ + return (-1); + return (fd); } static struct url * _http_get_proxy(void) { - struct url *purl; - char *p; - - if (((p = getenv("HTTP_PROXY")) || (p = getenv("http_proxy"))) && - (purl = fetchParseURL(p))) { - if (!*purl->scheme) - strcpy(purl->scheme, SCHEME_HTTP); - if (!purl->port) - purl->port = _fetch_default_proxy_port(purl->scheme); - if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0) - return purl; - fetchFreeURL(purl); - } - return NULL; + struct url *purl; + char *p; + + if (((p = getenv("HTTP_PROXY")) || (p = getenv("http_proxy"))) && + (purl = fetchParseURL(p))) { + if (!*purl->scheme) + strcpy(purl->scheme, SCHEME_HTTP); + if (!purl->port) + purl->port = _fetch_default_proxy_port(purl->scheme); + if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0) + return (purl); + fetchFreeURL(purl); + } + return (NULL); } static void _http_print_html(FILE *out, FILE *in) { - size_t len; - char *line, *p, *q; - int comment, tag; - - comment = tag = 0; - while ((line = fgetln(in, &len)) != NULL) { - while (len && isspace(line[len - 1])) - --len; - for (p = q = line; q < line + len; ++q) { - if (comment && *q == '-') { - if (q + 2 < line + len && strcmp(q, "-->") == 0) { - tag = comment = 0; - q += 2; + size_t len; + char *line, *p, *q; + int comment, tag; + + comment = tag = 0; + while ((line = fgetln(in, &len)) != NULL) { + while (len && isspace(line[len - 1])) + --len; + for (p = q = line; q < line + len; ++q) { + if (comment && *q == '-') { + if (q + 2 < line + len && + strcmp(q, "-->") == 0) { + tag = comment = 0; + q += 2; + } + } else if (tag && !comment && *q == '>') { + p = q + 1; + tag = 0; + } else if (!tag && *q == '<') { + if (q > p) + fwrite(p, q - p, 1, out); + tag = 1; + if (q + 3 < line + len && + strcmp(q, "<!--") == 0) { + comment = 1; + q += 3; + } + } } - } if (tag && !comment && *q == '>') { - p = q + 1; - tag = 0; - } else if (!tag && *q == '<') { - if (q > p) - fwrite(p, q - p, 1, out); - tag = 1; - if (q + 3 < line + len && strcmp(q, "<!--") == 0) { - comment = 1; - q += 3; - } - } + if (!tag && q > p) + fwrite(p, q - p, 1, out); + fputc('\n', out); } - if (!tag && q > p) - fwrite(p, q - p, 1, out); - fputc('\n', out); - } } - + /***************************************************************************** * Core */ @@ -724,326 +730,326 @@ _http_print_html(FILE *out, FILE *in) */ FILE * _http_request(struct url *URL, const char *op, struct url_stat *us, - struct url *purl, const char *flags) + struct url *purl, const char *flags) { - struct url *url, *new; - int chunked, direct, need_auth, noredirect, verbose; - int code, fd, i, n; - off_t offset, clength, length, size; - time_t mtime; - const char *p; - FILE *f; - hdr_t h; - char *host; + struct url *url, *new; + int chunked, direct, need_auth, noredirect, verbose; + int code, fd, i, n; + off_t offset, clength, length, size; + time_t mtime; + const char *p; + FILE *f; + hdr_t h; + char *host; #ifdef INET6 - char hbuf[MAXHOSTNAMELEN + 1]; + char hbuf[MAXHOSTNAMELEN + 1]; #endif - direct = CHECK_FLAG('d'); - noredirect = CHECK_FLAG('A'); - verbose = CHECK_FLAG('v'); - - if (direct && purl) { - fetchFreeURL(purl); - purl = NULL; - } - - /* try the provided URL first */ - url = URL; - - /* if the A flag is set, we only get one try */ - n = noredirect ? 1 : MAX_REDIRECT; - i = 0; - - need_auth = 0; - do { - new = NULL; - chunked = 0; - offset = 0; - clength = -1; - length = -1; - size = -1; - mtime = 0; - - /* check port */ - if (!url->port) - url->port = _fetch_default_port(url->scheme); - - /* were we redirected to an FTP URL? */ - if (purl == NULL && strcmp(url->scheme, SCHEME_FTP) == 0) { - if (strcmp(op, "GET") == 0) - return _ftp_request(url, "RETR", us, purl, flags); - else if (strcmp(op, "HEAD") == 0) - return _ftp_request(url, "STAT", us, purl, flags); + direct = CHECK_FLAG('d'); + noredirect = CHECK_FLAG('A'); + verbose = CHECK_FLAG('v'); + + if (direct && purl) { + fetchFreeURL(purl); + purl = NULL; } - - /* connect to server or proxy */ - if ((fd = _http_connect(url, purl, flags)) == -1) - goto ouch; - host = url->host; + /* try the provided URL first */ + url = URL; + + /* if the A flag is set, we only get one try */ + n = noredirect ? 1 : MAX_REDIRECT; + i = 0; + + need_auth = 0; + do { + new = NULL; + chunked = 0; + offset = 0; + clength = -1; + length = -1; + size = -1; + mtime = 0; + + /* check port */ + if (!url->port) + url->port = _fetch_default_port(url->scheme); + + /* were we redirected to an FTP URL? */ + if (purl == NULL && strcmp(url->scheme, SCHEME_FTP) == 0) { + if (strcmp(op, "GET") == 0) + return (_ftp_request(url, "RETR", us, purl, flags)); + else if (strcmp(op, "HEAD") == 0) + return (_ftp_request(url, "STAT", us, purl, flags)); + } + + /* connect to server or proxy */ + if ((fd = _http_connect(url, purl, flags)) == -1) + goto ouch; + + host = url->host; #ifdef INET6 - if (strchr(url->host, ':')) { - snprintf(hbuf, sizeof(hbuf), "[%s]", url->host); - host = hbuf; - } + if (strchr(url->host, ':')) { + snprintf(hbuf, sizeof(hbuf), "[%s]", url->host); + host = hbuf; + } #endif - /* send request */ - if (verbose) - _fetch_info("requesting %s://%s:%d%s", - url->scheme, host, url->port, url->doc); - if (purl) { - _http_cmd(fd, "%s %s://%s:%d%s HTTP/1.1", - op, url->scheme, host, url->port, url->doc); - } else { - _http_cmd(fd, "%s %s HTTP/1.1", - op, url->doc); - } + /* send request */ + if (verbose) + _fetch_info("requesting %s://%s:%d%s", + url->scheme, host, url->port, url->doc); + if (purl) { + _http_cmd(fd, "%s %s://%s:%d%s HTTP/1.1", + op, url->scheme, host, url->port, url->doc); + } else { + _http_cmd(fd, "%s %s HTTP/1.1", + op, url->doc); + } - /* virtual host */ - if (url->port == _fetch_default_port(url->scheme)) - _http_cmd(fd, "Host: %s", host); - else - _http_cmd(fd, "Host: %s:%d", host, url->port); - - /* proxy authorization */ - if (purl) { - if (*purl->user || *purl->pwd) - _http_basic_auth(fd, "Proxy-Authorization", - purl->user, purl->pwd); - else if ((p = getenv("HTTP_PROXY_AUTH")) != NULL && *p != '\0') - _http_authorize(fd, "Proxy-Authorization", p); - } - - /* server authorization */ - if (need_auth || *url->user || *url->pwd) { - if (*url->user || *url->pwd) - _http_basic_auth(fd, "Authorization", url->user, url->pwd); - else if ((p = getenv("HTTP_AUTH")) != NULL && *p != '\0') - _http_authorize(fd, "Authorization", p); - else if (fetchAuthMethod && fetchAuthMethod(url) == 0) { - _http_basic_auth(fd, "Authorization", url->user, url->pwd); - } else { - _http_seterr(HTTP_NEED_AUTH); - goto ouch; - } - } + /* virtual host */ + if (url->port == _fetch_default_port(url->scheme)) + _http_cmd(fd, "Host: %s", host); + else + _http_cmd(fd, "Host: %s:%d", host, url->port); + + /* proxy authorization */ + if (purl) { + if (*purl->user || *purl->pwd) + _http_basic_auth(fd, "Proxy-Authorization", + purl->user, purl->pwd); + else if ((p = getenv("HTTP_PROXY_AUTH")) != NULL && *p != '\0') + _http_authorize(fd, "Proxy-Authorization", p); + } + + /* server authorization */ + if (need_auth || *url->user || *url->pwd) { + if (*url->user || *url->pwd) + _http_basic_auth(fd, "Authorization", url->user, url->pwd); + else if ((p = getenv("HTTP_AUTH")) != NULL && *p != '\0') + _http_authorize(fd, "Authorization", p); + else if (fetchAuthMethod && fetchAuthMethod(url) == 0) { + _http_basic_auth(fd, "Authorization", url->user, url->pwd); + } else { + _http_seterr(HTTP_NEED_AUTH); + goto ouch; + } + } + + /* other headers */ + if ((p = getenv("HTTP_USER_AGENT")) != NULL && *p != '\0') + _http_cmd(fd, "User-Agent: %s", p); + else + _http_cmd(fd, "User-Agent: %s " _LIBFETCH_VER, __progname); + if (url->offset) + _http_cmd(fd, "Range: bytes=%lld-", (long long)url->offset); + _http_cmd(fd, "Connection: close"); + _http_cmd(fd, ""); + + /* get reply */ + switch ((code = _http_get_reply(fd))) { + case HTTP_OK: + case HTTP_PARTIAL: + /* fine */ + break; + case HTTP_MOVED_PERM: + case HTTP_MOVED_TEMP: + case HTTP_SEE_OTHER: + /* + * Not so fine, but we still have to read the headers to + * get the new location. + */ + break; + case HTTP_NEED_AUTH: + if (need_auth) { + /* + * We already sent out authorization code, so there's + * nothing more we can do. + */ + _http_seterr(code); + goto ouch; + } + /* try again, but send the password this time */ + if (verbose) + _fetch_info("server requires authorization"); + break; + case HTTP_NEED_PROXY_AUTH: + /* + * If we're talking to a proxy, we already sent our proxy + * authorization code, so there's nothing more we can do. + */ + _http_seterr(code); + goto ouch; + case HTTP_PROTOCOL_ERROR: + /* fall through */ + case -1: + _fetch_syserr(); + goto ouch; + default: + _http_seterr(code); + if (!verbose) + goto ouch; + /* fall through so we can get the full error message */ + } + + /* get headers */ + do { + switch ((h = _http_next_header(fd, &p))) { + case hdr_syserror: + _fetch_syserr(); + goto ouch; + case hdr_error: + _http_seterr(HTTP_PROTOCOL_ERROR); + goto ouch; + case hdr_content_length: + _http_parse_length(p, &clength); + break; + case hdr_content_range: + _http_parse_range(p, &offset, &length, &size); + break; + case hdr_last_modified: + _http_parse_mtime(p, &mtime); + break; + case hdr_location: + if (!HTTP_REDIRECT(code)) + break; + if (new) + free(new); + if (verbose) + _fetch_info("%d redirect to %s", code, p); + if (*p == '/') + /* absolute path */ + new = fetchMakeURL(url->scheme, url->host, url->port, p, + url->user, url->pwd); + else + new = fetchParseURL(p); + if (new == NULL) { + /* XXX should set an error code */ + DEBUG(fprintf(stderr, "failed to parse new URL\n")); + goto ouch; + } + if (!*new->user && !*new->pwd) { + strcpy(new->user, url->user); + strcpy(new->pwd, url->pwd); + } + new->offset = url->offset; + new->length = url->length; + break; + case hdr_transfer_encoding: + /* XXX weak test*/ + chunked = (strcasecmp(p, "chunked") == 0); + break; + case hdr_www_authenticate: + if (code != HTTP_NEED_AUTH) + break; + /* if we were smarter, we'd check the method and realm */ + break; + case hdr_end: + /* fall through */ + case hdr_unknown: + /* ignore */ + break; + } + } while (h > hdr_end); + + /* we have a hit or an error */ + if (code == HTTP_OK || code == HTTP_PARTIAL || HTTP_ERROR(code)) + break; + + /* we need to provide authentication */ + if (code == HTTP_NEED_AUTH) { + need_auth = 1; + close(fd); + fd = -1; + continue; + } - /* other headers */ - if ((p = getenv("HTTP_USER_AGENT")) != NULL && *p != '\0') - _http_cmd(fd, "User-Agent: %s", p); - else - _http_cmd(fd, "User-Agent: %s " _LIBFETCH_VER, __progname); - if (url->offset) - _http_cmd(fd, "Range: bytes=%lld-", (long long)url->offset); - _http_cmd(fd, "Connection: close"); - _http_cmd(fd, ""); - - /* get reply */ - switch ((code = _http_get_reply(fd))) { - case HTTP_OK: - case HTTP_PARTIAL: - /* fine */ - break; - case HTTP_MOVED_PERM: - case HTTP_MOVED_TEMP: - case HTTP_SEE_OTHER: - /* - * Not so fine, but we still have to read the headers to - * get the new location. - */ - break; - case HTTP_NEED_AUTH: - if (need_auth) { - /* - * We already sent out authorization code, so there's - * nothing more we can do. - */ + /* all other cases: we got a redirect */ + need_auth = 0; + close(fd); + fd = -1; + if (!new) { + DEBUG(fprintf(stderr, "redirect with no new location\n")); + break; + } + if (url != URL) + fetchFreeURL(url); + url = new; + } while (++i < n); + + /* we failed, or ran out of retries */ + if (fd == -1) { _http_seterr(code); goto ouch; - } - /* try again, but send the password this time */ - if (verbose) - _fetch_info("server requires authorization"); - break; - case HTTP_NEED_PROXY_AUTH: - /* - * If we're talking to a proxy, we already sent our proxy - * authorization code, so there's nothing more we can do. - */ - _http_seterr(code); - goto ouch; - case HTTP_PROTOCOL_ERROR: - /* fall through */ - case -1: - _fetch_syserr(); - goto ouch; - default: - _http_seterr(code); - if (!verbose) + } + + DEBUG(fprintf(stderr, "offset %lld, length %lld," + " size %lld, clength %lld\n", + (long long)offset, (long long)length, + (long long)size, (long long)clength)); + + /* check for inconsistencies */ + if (clength != -1 && length != -1 && clength != length) { + _http_seterr(HTTP_PROTOCOL_ERROR); goto ouch; - /* fall through so we can get the full error message */ } - - /* get headers */ - do { - switch ((h = _http_next_header(fd, &p))) { - case hdr_syserror: - _fetch_syserr(); + if (clength == -1) + clength = length; + if (clength != -1) + length = offset + clength; + if (length != -1 && size != -1 && length != size) { + _http_seterr(HTTP_PROTOCOL_ERROR); goto ouch; - case hdr_error: + } + if (size == -1) + size = length; + + /* fill in stats */ + if (us) { + us->size = size; + us->atime = us->mtime = mtime; + } + + /* too far? */ + if (offset > URL->offset) { _http_seterr(HTTP_PROTOCOL_ERROR); goto ouch; - case hdr_content_length: - _http_parse_length(p, &clength); - break; - case hdr_content_range: - _http_parse_range(p, &offset, &length, &size); - break; - case hdr_last_modified: - _http_parse_mtime(p, &mtime); - break; - case hdr_location: - if (!HTTP_REDIRECT(code)) - break; - if (new) - free(new); - if (verbose) - _fetch_info("%d redirect to %s", code, p); - if (*p == '/') - /* absolute path */ - new = fetchMakeURL(url->scheme, url->host, url->port, p, - url->user, url->pwd); - else - new = fetchParseURL(p); - if (new == NULL) { - /* XXX should set an error code */ - DEBUG(fprintf(stderr, "failed to parse new URL\n")); - goto ouch; - } - if (!*new->user && !*new->pwd) { - strcpy(new->user, url->user); - strcpy(new->pwd, url->pwd); - } - new->offset = url->offset; - new->length = url->length; - break; - case hdr_transfer_encoding: - /* XXX weak test*/ - chunked = (strcasecmp(p, "chunked") == 0); - break; - case hdr_www_authenticate: - if (code != HTTP_NEED_AUTH) - break; - /* if we were smarter, we'd check the method and realm */ - break; - case hdr_end: - /* fall through */ - case hdr_unknown: - /* ignore */ - break; - } - } while (h > hdr_end); - - /* we have a hit or an error */ - if (code == HTTP_OK || code == HTTP_PARTIAL || HTTP_ERROR(code)) - break; - - /* we need to provide authentication */ - if (code == HTTP_NEED_AUTH) { - need_auth = 1; - close(fd); - fd = -1; - continue; } - - /* all other cases: we got a redirect */ - need_auth = 0; - close(fd); - fd = -1; - if (!new) { - DEBUG(fprintf(stderr, "redirect with no new location\n")); - break; + + /* report back real offset and size */ + URL->offset = offset; + URL->length = clength; + + /* wrap it up in a FILE */ + if ((f = chunked ? _http_funopen(fd) : fdopen(fd, "r")) == NULL) { + _fetch_syserr(); + goto ouch; } + if (url != URL) - fetchFreeURL(url); - url = new; - } while (++i < n); + fetchFreeURL(url); + if (purl) + fetchFreeURL(purl); + + if (HTTP_ERROR(code)) { + _http_print_html(stderr, f); + fclose(f); + f = NULL; + } - /* we failed, or ran out of retries */ - if (fd == -1) { - _http_seterr(code); - goto ouch; - } + return (f); - DEBUG(fprintf(stderr, "offset %lld, length %lld," - " size %lld, clength %lld\n", - (long long)offset, (long long)length, - (long long)size, (long long)clength)); - - /* check for inconsistencies */ - if (clength != -1 && length != -1 && clength != length) { - _http_seterr(HTTP_PROTOCOL_ERROR); - goto ouch; - } - if (clength == -1) - clength = length; - if (clength != -1) - length = offset + clength; - if (length != -1 && size != -1 && length != size) { - _http_seterr(HTTP_PROTOCOL_ERROR); - goto ouch; - } - if (size == -1) - size = length; - - /* fill in stats */ - if (us) { - us->size = size; - us->atime = us->mtime = mtime; - } - - /* too far? */ - if (offset > URL->offset) { - _http_seterr(HTTP_PROTOCOL_ERROR); - goto ouch; - } - - /* report back real offset and size */ - URL->offset = offset; - URL->length = clength; - - /* wrap it up in a FILE */ - if ((f = chunked ? _http_funopen(fd) : fdopen(fd, "r")) == NULL) { - _fetch_syserr(); - goto ouch; - } - - if (url != URL) - fetchFreeURL(url); - if (purl) - fetchFreeURL(purl); - - if (HTTP_ERROR(code)) { - _http_print_html(stderr, f); - fclose(f); - f = NULL; - } - - return f; - - ouch: - if (url != URL) - fetchFreeURL(url); - if (purl) - fetchFreeURL(purl); - if (fd != -1) - close(fd); - return NULL; +ouch: + if (url != URL) + fetchFreeURL(url); + if (purl) + fetchFreeURL(purl); + if (fd != -1) + close(fd); + return (NULL); } - + /***************************************************************************** * Entry points */ @@ -1054,7 +1060,7 @@ _http_request(struct url *URL, const char *op, struct url_stat *us, FILE * fetchXGetHTTP(struct url *URL, struct url_stat *us, const char *flags) { - return _http_request(URL, "GET", us, _http_get_proxy(), flags); + return (_http_request(URL, "GET", us, _http_get_proxy(), flags)); } /* @@ -1063,7 +1069,7 @@ fetchXGetHTTP(struct url *URL, struct url_stat *us, const char *flags) FILE * fetchGetHTTP(struct url *URL, const char *flags) { - return fetchXGetHTTP(URL, NULL, flags); + return (fetchXGetHTTP(URL, NULL, flags)); } /* @@ -1072,8 +1078,8 @@ fetchGetHTTP(struct url *URL, const char *flags) FILE * fetchPutHTTP(struct url *URL __unused, const char *flags __unused) { - warnx("fetchPutHTTP(): not implemented"); - return NULL; + warnx("fetchPutHTTP(): not implemented"); + return (NULL); } /* @@ -1082,12 +1088,12 @@ fetchPutHTTP(struct url *URL __unused, const char *flags __unused) int fetchStatHTTP(struct url *URL, struct url_stat *us, const char *flags) { - FILE *f; - - if ((f = _http_request(URL, "HEAD", us, _http_get_proxy(), flags)) == NULL) - return -1; - fclose(f); - return 0; + FILE *f; + + if ((f = _http_request(URL, "HEAD", us, _http_get_proxy(), flags)) == NULL) + return (-1); + fclose(f); + return (0); } /* @@ -1096,6 +1102,6 @@ fetchStatHTTP(struct url *URL, struct url_stat *us, const char *flags) struct url_ent * fetchListHTTP(struct url *url __unused, const char *flags __unused) { - warnx("fetchListHTTP(): not implemented"); - return NULL; + warnx("fetchListHTTP(): not implemented"); + return (NULL); } |