* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/socket.h>
#include <stdio.h>
#include <ctype.h>
#include <unistd.h>
#include <stdint.h>
+#include <string.h>
+#include <fcntl.h>
#include <libubox/ustream.h>
#include <libubox/ustream-ssl.h>
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;
long read_chunked;
long content_length;
+ int usock_flags;
+
uint32_t nc;
struct blob_buf headers;
[__PREFIX_MAX] = NULL
};
+static int uclient_http_connect(struct uclient *cl);
+
static int uclient_do_connect(struct uclient_http *uh, const char *port)
{
socklen_t sl;
if (uh->uc.url->port)
port = uh->uc.url->port;
- fd = usock(USOCK_TCP | USOCK_NONBLOCK, uh->uc.url->host, port);
+ memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
+
+ fd = usock_inet_timeout(USOCK_TCP | USOCK_NONBLOCK | uh->usock_flags,
+ uh->uc.url->host, port, &uh->uc.remote_addr,
+ uh->uc.timeout_msecs);
if (fd < 0)
return -1;
- ustream_fd_init(&uh->ufd, fd);
-
- memset(&uh->uc.local_addr, 0, sizeof(uh->uc.local_addr));
- memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
+ fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
+ uh->fd = fd;
sl = sizeof(uh->uc.local_addr);
+ memset(&uh->uc.local_addr, 0, sl);
getsockname(fd, &uh->uc.local_addr.sa, &sl);
- getpeername(fd, &uh->uc.remote_addr.sa, &sl);
return 0;
}
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) ||
+ uh->content_length == 0)
+ uh->uc.data_eof = true;
+
uclient_backend_set_eof(&uh->uc);
if (uh->connection_close)
static void uclient_http_reset_state(struct uclient_http *uh)
{
+ uh->seq++;
uclient_backend_reset_state(&uh->uc);
uh->read_chunked = -1;
uh->content_length = -1;
static void uclient_http_init_request(struct uclient_http *uh)
{
+ uh->seq++;
uclient_http_reset_state(uh);
blob_buf_init(&uh->meta, 0);
}
uh->auth_type = uclient_http_update_auth_type(uh);
}
-static void
+static bool uclient_request_supports_body(enum request_type req_type)
+{
+ switch (req_type) {
+ case REQ_POST:
+ case REQ_PUT:
+ case REQ_DELETE:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static int
uclient_http_add_auth_basic(struct uclient_http *uh)
{
struct uclient_url *url = uh->uc.url;
char *auth_buf;
if (auth_len > 512)
- return;
+ return -EINVAL;
auth_buf = alloca(base64_len(auth_len) + 1);
+ if (!auth_buf)
+ return -ENOMEM;
+
base64_encode(url->auth, auth_len, auth_buf);
ustream_printf(uh->us, "Authorization: Basic %s\r\n", auth_buf);
+
+ return 0;
}
static char *digest_unquote_sep(char **str)
{
uint32_t val = 0;
FILE *f;
+ size_t n;
f = fopen("/dev/urandom", "r");
if (f) {
- fread(&val, sizeof(val), 1, f);
+ n = fread(&val, sizeof(val), 1, f);
fclose(f);
+ if (n != 1)
+ return;
}
bin_to_hex(dest, &val, sizeof(val));
*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;
- int rem;
+ bool literal_ipv6;
+ 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;
+
+ literal_ipv6 = strchr(url->host, ':');
ustream_printf(uh->us,
"%s %s HTTP/1.1\r\n"
- "Host: %s\r\n",
- request_types[req_type],
- url->location, url->host);
+ "Host: %s%s%s%s%s\r\n",
+ request_types[req_type], url->location,
+ literal_ipv6 ? "[" : "",
+ url->host,
+ literal_ipv6 ? "]" : "",
+ url->port ? ":" : "",
+ url->port ? url->port : "");
blobmsg_for_each_attr(cur, uh->headers.head, rem)
- ustream_printf(uh->us, "%s: %s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
+ ustream_printf(uh->us, "%s: %s\r\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
- if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
+ 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)
{
enum auth_type auth_type = uh->auth_type;
+ int seq = uh->uc.seq;
uh->state = HTTP_STATE_RECV_DATA;
uh->uc.meta = uh->meta.head;
if (auth_type == AUTH_TYPE_UNKNOWN && uh->uc.status_code == 401 &&
(uh->req_type == REQ_HEAD || uh->req_type == REQ_GET)) {
- uclient_http_init_request(uh);
+ uclient_http_connect(&uh->uc);
uclient_http_send_headers(uh);
uh->state = HTTP_STATE_REQUEST_DONE;
return;
if (uh->uc.cb->header_done)
uh->uc.cb->header_done(&uh->uc);
- if (uh->eof)
+ 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);
}
static void __uclient_notify_read(struct uclient_http *uh)
{
struct uclient *uc = &uh->uc;
+ unsigned int seq = uh->seq;
char *data;
int len;
return;
if (uh->state < HTTP_STATE_RECV_DATA) {
- char *sep;
+ char *sep, *next;
int cur_len;
do {
- sep = strstr(data, "\r\n");
+ sep = strchr(data, '\n');
if (!sep)
break;
+ next = sep + 1;
+ if (sep > data && sep[-1] == '\r')
+ sep--;
+
/* Check for multi-line HTTP headers */
if (sep > data) {
- if (!sep[2])
+ if (!*next)
return;
- if (isspace(sep[2]) && sep[2] != '\r') {
+ if (isspace(*next) && *next != '\r' && *next != '\n') {
sep[0] = ' ';
- sep[1] = ' ';
+ if (sep + 1 < next)
+ sep[1] = ' ';
continue;
}
}
*sep = 0;
- cur_len = sep + 2 - data;
+ cur_len = next - data;
uclient_parse_http_line(uh, data);
+ if (seq != uh->seq)
+ return;
+
ustream_consume(uh->us, cur_len);
len -= cur_len;
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 uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
+ if (uh->ufd.stream.write_error) {
+ uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
+ return;
+ }
uclient_notify_eof(uh);
}
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_error = uclient_ssl_notify_error;
uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
uh->ussl.notify_connected = uclient_ssl_notify_connected;
- uh->ssl_ops->init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
+ uh->ussl.server_name = uh->uc.url->host;
+ 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 = container_of(cl, struct uclient_http, uc);
int ret;
- if (!cl->eof || uh->disconnect)
+ if (!cl->eof || uh->disconnect || uh->connection_close)
uclient_http_disconnect(uh);
uclient_http_init_request(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);
- if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
+ 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;
return len;
}
-bool uclient_http_redirect(struct uclient *cl)
+int uclient_http_redirect(struct uclient *cl)
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
struct blobmsg_policy location = {
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)
return false;
- url = uclient_get_url(blobmsg_data(tb), url->auth);
+ url = uclient_get_url_location(url, blobmsg_data(tb));
if (!url)
return false;
- free(cl->url);
- cl->url = url;
- uclient_http_connect(cl);
+ 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;
+
uclient_http_request_done(cl);
return true;
return 0;
}
+int uclient_http_set_address_family(struct uclient *cl, int af)
+{
+ struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+
+ if (cl->backend != &uclient_backend_http)
+ return -1;
+
+ switch (af) {
+ case AF_INET:
+ uh->usock_flags = USOCK_IPV4ONLY;
+ break;
+ case AF_INET6:
+ uh->usock_flags = USOCK_IPV6ONLY;
+ break;
+ default:
+ uh->usock_flags = 0;
+ break;
+ }
+
+ 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,
.connect = uclient_http_connect,
.disconnect = uclient_http_request_disconnect,
.update_url = uclient_http_free_url_state,
+ .update_proxy_url = uclient_http_free_url_state,
.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