X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-http.c;h=ee354c7af6b9f1c167e6cbb5c4a4e74de243015a;hp=045a77296a5b74b2cf5ccaab2b6a2e23481a09ca;hb=cb7867a867e45949950e03de0ea845e483ffc6eb;hpb=5be2b92aec6e0abde419b8128b58d2e96d5d5a34 diff --git a/uclient-http.c b/uclient-http.c index 045a772..ee354c7 100644 --- a/uclient-http.c +++ b/uclient-http.c @@ -1,3 +1,20 @@ +/* + * uclient - ustream based protocol client library + * + * Copyright (C) 2014 Felix Fietkau + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include #include @@ -50,6 +67,7 @@ struct uclient_http { struct ustream_fd ufd; struct ustream_ssl ussl; + bool ssl_require_validation; bool ssl_ctx_ext; bool ssl; bool eof; @@ -118,6 +136,14 @@ static void uclient_http_free_url_state(struct uclient *cl) uclient_http_disconnect(uh); } +static void uclient_http_error(struct uclient_http *uh, int code) +{ + uh->state = HTTP_STATE_ERROR; + uh->us->eof = true; + ustream_state_change(uh->us); + uclient_backend_set_error(&uh->uc, code); +} + static void uclient_notify_eof(struct uclient_http *uh) { struct ustream *us = uh->us; @@ -470,11 +496,14 @@ uclient_http_send_headers(struct uclient_http *uh) uclient_http_add_auth_header(uh); ustream_printf(uh->us, "\r\n"); + + uh->state = HTTP_STATE_HEADERS_SENT; } static void uclient_http_headers_complete(struct uclient_http *uh) { enum auth_type auth_type = uh->auth_type; + socklen_t sl; uh->state = HTTP_STATE_RECV_DATA; uh->uc.meta = uh->meta.head; @@ -487,10 +516,17 @@ static void uclient_http_headers_complete(struct uclient_http *uh) return; } + memset(&uh->uc.local_addr, 0, sizeof(uh->uc.local_addr)); + memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr)); + + sl = sizeof(uh->uc.local_addr); + getsockname(uh->ufd.fd.fd, &uh->uc.local_addr.sa, &sl); + getpeername(uh->ufd.fd.fd, &uh->uc.remote_addr.sa, &sl); + if (uh->uc.cb->header_done) uh->uc.cb->header_done(&uh->uc); - if (uh->req_type == REQ_HEAD) { + if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) { uh->eof = true; uclient_notify_eof(uh); } @@ -552,7 +588,7 @@ static void __uclient_notify_read(struct uclient_http *uh) char *data; int len; - if (uh->state < HTTP_STATE_REQUEST_DONE) + if (uh->state < HTTP_STATE_REQUEST_DONE || uh->state == HTTP_STATE_ERROR) return; data = ustream_get_read_buf(uh->us, &len); @@ -642,6 +678,34 @@ static void uclient_ssl_notify_state(struct ustream *us) uclient_notify_eof(uh); } +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); + + 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); + + if (!uh->ssl_require_validation) + return; + + uclient_http_error(uh, UCLIENT_ERROR_SSL_INVALID_CERT); +} + +static void uclient_ssl_notify_connected(struct ustream_ssl *ssl) +{ + struct uclient_http *uh = container_of(ssl, struct uclient_http, ussl); + + if (!uh->ssl_require_validation) + return; + + if (!uh->ussl.valid_cn) + uclient_http_error(uh, UCLIENT_ERROR_SSL_CN_MISMATCH); +} + static int uclient_setup_https(struct uclient_http *uh) { struct ustream *us = &uh->ussl.stream; @@ -660,7 +724,11 @@ static int uclient_setup_https(struct uclient_http *uh) us->string_data = true; us->notify_state = uclient_ssl_notify_state; us->notify_read = uclient_ssl_notify_read; + 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; ustream_ssl_init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false); + ustream_ssl_set_peer_cn(&uh->ussl, uh->uc.url->host); return 0; } @@ -668,6 +736,7 @@ static int uclient_setup_https(struct uclient_http *uh) static int uclient_http_connect(struct uclient *cl) { struct uclient_http *uh = container_of(cl, struct uclient_http, uc); + int ret; uclient_http_init_request(uh); @@ -677,9 +746,14 @@ static int uclient_http_connect(struct uclient *cl) uh->ssl = cl->url->prefix == PREFIX_HTTPS; if (uh->ssl) - return uclient_setup_https(uh); + ret = uclient_setup_https(uh); else - return uclient_setup_http(uh); + ret = uclient_setup_http(uh); + + if (ret) + uclient_http_error(uh, UCLIENT_ERROR_CONNECT); + + return ret; } static struct uclient *uclient_http_alloc(void) @@ -735,7 +809,7 @@ uclient_http_set_request_type(struct uclient *cl, const char *type) } int -uclient_http_reset_headers(struct uclient *cl, const char *name, const char *value) +uclient_http_reset_headers(struct uclient *cl) { struct uclient_http *uh = container_of(cl, struct uclient_http, uc); @@ -769,10 +843,11 @@ uclient_http_send_data(struct uclient *cl, char *buf, unsigned int len) uclient_http_send_headers(uh); - ustream_printf(uh->us, "%X\r\n", len); - if (len > 0) + if (len > 0) { + ustream_printf(uh->us, "%X\r\n", len); ustream_write(uh->us, buf, len, false); - ustream_printf(uh->us, "\r\n"); + ustream_printf(uh->us, "\r\n"); + } return len; } @@ -786,6 +861,8 @@ uclient_http_request_done(struct uclient *cl) return -1; uclient_http_send_headers(uh); + if (uh->req_type == REQ_POST) + ustream_printf(uh->us, "0\r\n\r\n"); uh->state = HTTP_STATE_REQUEST_DONE; return 0; @@ -898,15 +975,19 @@ bool uclient_http_redirect(struct uclient *cl) return true; } -int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx) +int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx, bool require_validation) { struct uclient_http *uh = container_of(cl, struct uclient_http, uc); + if (cl->backend != &uclient_backend_http) + return -1; + uclient_http_free_url_state(cl); uclient_http_free_ssl_ctx(uh); uh->ssl_ctx = ctx; uh->ssl_ctx_ext = !!ctx; + uh->ssl_require_validation = !!ctx && require_validation; return 0; }