struct ustream_ssl_ctx *ssl_ctx;
struct ustream *us;
- struct ustream_fd ufd;
- struct ustream_ssl ussl;
+ union {
+ struct ustream_fd ufd;
+ struct ustream_ssl ussl;
+ };
struct uloop_timeout disconnect_t;
unsigned int seq;
+ int fd;
bool ssl_require_validation;
bool ssl;
return -1;
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
- ustream_fd_init(&uh->ufd, fd);
+ uh->fd = fd;
sl = sizeof(uh->uc.local_addr);
memset(&uh->uc.local_addr, 0, sl);
if (uh->ssl)
ustream_free(&uh->ussl.stream);
- ustream_free(&uh->ufd.stream);
- close(uh->ufd.fd.fd);
+ else
+ ustream_free(&uh->ufd.stream);
+ if(uh->fd >= 0)
+ close(uh->fd >= 0);
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)
if (uh->eof || seq != uh->uc.seq)
return;
- if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) {
+ if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204 ||
+ uh->content_length == 0) {
uh->eof = true;
uclient_notify_eof(uh);
}
if (uh->state == HTTP_STATE_RECV_DATA) {
/* Now it's uclient user turn to read some data */
uloop_timeout_cancel(&uc->connection_timeout);
-
- if (uc->cb->data_read)
- uc->cb->data_read(uc);
+ uclient_backend_read_notify(uc);
}
}
struct ustream *us = &uh->ufd.stream;
int ret;
+ memset(&uh->ufd, 0, sizeof(uh->ufd));
uh->us = us;
uh->ssl = false;
if (ret)
return UCLIENT_ERROR_CONNECT;
+ ustream_fd_init(&uh->ufd, uh->fd);
+
return 0;
}
static void uclient_ssl_notify_error(struct ustream_ssl *ssl, int error, const char *str)
{
struct uclient_http *uh = container_of(ssl, struct uclient_http, ussl);
+ struct uclient *uc = &uh->uc;
+ if (uc->cb->log_msg)
+ uc->cb->log_msg(uc, UCLIENT_LOG_SSL_ERROR, str);
uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
}
static void uclient_ssl_notify_verify_error(struct ustream_ssl *ssl, int error, const char *str)
{
struct uclient_http *uh = container_of(ssl, struct uclient_http, ussl);
+ struct uclient *uc = &uh->uc;
if (!uh->ssl_require_validation)
return;
+ if (uc->cb->log_msg)
+ uc->cb->log_msg(uc, UCLIENT_LOG_SSL_VERIFY_ERROR, str);
uclient_http_error(uh, UCLIENT_ERROR_SSL_INVALID_CERT);
}
struct ustream *us = &uh->ussl.stream;
int ret;
+ memset(&uh->ussl, 0, sizeof(uh->ussl));
uh->ssl = true;
uh->us = us;
uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
uh->ussl.notify_connected = uclient_ssl_notify_connected;
uh->ussl.server_name = uh->uc.url->host;
- uh->ssl_ops->init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
+ uh->ssl_ops->init_fd(&uh->ussl, uh->fd, uh->ssl_ctx, false);
uh->ssl_ops->set_peer_cn(&uh->ussl, uh->uc.url->host);
return 0;
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;
return 0;
data = ustream_get_read_buf(uh->us, &read_len);
- if (!data || !read_len)
- return 0;
+ if (!data || !read_len) {
+ ustream_poll(uh->us);
+ data = ustream_get_read_buf(uh->us, &read_len);
+ if (!data || !read_len)
+ return 0;
+ }
data_end = data + read_len;
read_len = 0;
}
}
- if (len > data_end - data)
- len = data_end - data;
+ unsigned int diff = data_end - data;
+ if (len > diff)
+ len = diff;
if (uh->read_chunked >= 0) {
- if (len > uh->read_chunked)
+ if (len > (unsigned long) uh->read_chunked)
len = uh->read_chunked;
uh->read_chunked -= len;
} else if (uh->content_length >= 0) {
- if (len > uh->content_length)
+ if (len > (unsigned long) uh->content_length)
len = uh->content_length;
uh->content_length -= len;
if (cl->backend != &uclient_backend_http)
return false;
- switch (cl->status_code) {
- case 301:
- case 302:
- case 307:
- break;
- default:
+ if (!uclient_http_status_redirect(cl))
return false;
- }
blobmsg_parse(&location, 1, &tb, blob_data(uh->meta.head), blob_len(uh->meta.head));
if (!tb)
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;
return 0;
}
+static int
+uclient_http_pending_bytes(struct uclient *cl, bool write)
+{
+ struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+
+ return ustream_pending_data(uh->us, write);
+}
+
const struct uclient_backend uclient_backend_http = {
.prefix = uclient_http_prefix,
.read = uclient_http_read,
.write = uclient_http_send_data,
.request = uclient_http_request_done,
+ .pending_bytes = uclient_http_pending_bytes,
};
projects / project / uclient.git / blobdiff