if (uh->ssl)
ustream_free(&uh->ussl.stream);
ustream_free(&uh->ufd.stream);
- close(uh->ufd.fd.fd);
+ if(uh->ufd.fd.fd)
+ close(uh->ufd.fd.fd);
uh->us = NULL;
}
return;
}
- if (uh->content_length < 0 && uh->read_chunked >= 0)
+ if ((uh->content_length < 0 && uh->read_chunked >= 0) ||
+ uh->content_length == 0)
uh->uc.data_eof = true;
uclient_backend_set_eof(&uh->uc);
*ofs = cur - *buf;
}
-static void
+static int
uclient_http_add_auth_digest(struct uclient_http *uh)
{
struct uclient_url *url = uh->uc.url;
const char *user, *password;
char *buf, *next;
int len, ofs;
+ int err = 0;
char cnonce_str[9];
char nc_str[9];
};
len = strlen(uh->auth_str) + 1;
- if (len > 512)
- return;
+ if (len > 512) {
+ err = -EINVAL;
+ goto fail;
+ }
buf = alloca(len);
+ if (!buf) {
+ err = -ENOMEM;
+ goto fail;
+ }
+
strcpy(buf, uh->auth_str);
/* skip auth type */
*dest = digest_unquote_sep(&next);
}
- if (!realm || !data.qop || !data.nonce)
- return;
+ if (!realm || !data.qop || !data.nonce) {
+ err = -EINVAL;
+ goto fail;
+ }
sprintf(nc_str, "%08x", uh->nc++);
get_cnonce(cnonce_str);
char *user_buf;
len = password - url->auth;
- if (len > 256)
- return;
+ if (len > 256) {
+ err = -EINVAL;
+ goto fail;
+ }
user_buf = alloca(len + 1);
+ if (!user_buf) {
+ err = -ENOMEM;
+ goto fail;
+ }
+
strncpy(user_buf, url->auth, len);
user_buf[len] = 0;
user = user_buf;
add_field(&buf, &ofs, &len, "opaque", opaque);
ustream_printf(uh->us, "Authorization: Digest nc=%s, qop=%s%s\r\n", data.nc, data.qop, buf);
+
free(buf);
+
+ return 0;
+
+fail:
+ return err;
}
-static void
+static int
uclient_http_add_auth_header(struct uclient_http *uh)
{
if (!uh->uc.url->auth)
- return;
+ return 0;
switch (uh->auth_type) {
case AUTH_TYPE_UNKNOWN:
case AUTH_TYPE_NONE:
break;
case AUTH_TYPE_BASIC:
- uclient_http_add_auth_basic(uh);
- break;
+ return uclient_http_add_auth_basic(uh);
case AUTH_TYPE_DIGEST:
- uclient_http_add_auth_digest(uh);
- break;
+ return uclient_http_add_auth_digest(uh);
}
+
+ return 0;
}
-static void
+static int
uclient_http_send_headers(struct uclient_http *uh)
{
struct uclient_url *url = uh->uc.url;
struct blob_attr *cur;
enum request_type req_type = uh->req_type;
bool literal_ipv6;
- int rem;
+ int err;
+ size_t rem;
if (uh->state >= HTTP_STATE_HEADERS_SENT)
- return;
+ return 0;
if (uh->uc.proxy_url)
url = uh->uc.proxy_url;
if (uclient_request_supports_body(uh->req_type))
ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n");
- uclient_http_add_auth_header(uh);
+ err = uclient_http_add_auth_header(uh);
+ if (err)
+ return err;
ustream_printf(uh->us, "\r\n");
uh->state = HTTP_STATE_HEADERS_SENT;
+
+ return 0;
}
static void uclient_http_headers_complete(struct uclient_http *uh)
struct uclient_http *uh;
uh = calloc_a(sizeof(*uh));
+ if (!uh)
+ return NULL;
+
uh->disconnect_t.cb = uclient_http_disconnect_cb;
blob_buf_init(&uh->headers, 0);
uclient_http_set_request_type(struct uclient *cl, const char *type)
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
- int i;
+ unsigned int i;
if (cl->backend != &uclient_backend_http)
return -1;
uclient_http_send_data(struct uclient *cl, const char *buf, unsigned int len)
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+ int err;
if (uh->state >= HTTP_STATE_REQUEST_DONE)
return -1;
- uclient_http_send_headers(uh);
+ err = uclient_http_send_headers(uh);
+ if (err)
+ return err;
if (len > 0) {
ustream_printf(uh->us, "%X\r\n", len);
uclient_http_request_done(struct uclient *cl)
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+ int err;
if (uh->state >= HTTP_STATE_REQUEST_DONE)
return -1;
- uclient_http_send_headers(uh);
+ err = uclient_http_send_headers(uh);
+ if (err)
+ return err;
+
if (uclient_request_supports_body(uh->req_type))
ustream_printf(uh->us, "0\r\n\r\n");
uh->state = HTTP_STATE_REQUEST_DONE;
if (!url)
return false;
- free(cl->url);
- cl->url = url;
+ if (cl->proxy_url) {
+ free(cl->proxy_url);
+ cl->proxy_url = url;
+ }
+ else {
+ free(cl->url);
+ cl->url = url;
+ }
+
if (uclient_http_connect(cl))
return -1;