X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fhttp.c;h=c2dbef4d947123bec24983242650982bf1d9ded4;hb=635385b7e731d1b536a63db4d881f32603c22cfd;hp=1121362dfb17028fe103805a97142ff2ac0aec0c;hpb=ed5ab8253db569e0ed85a35cc9beff02a2d204bc;p=bertos.git diff --git a/bertos/net/http.c b/bertos/net/http.c index 1121362d..c2dbef4d 100644 --- a/bertos/net/http.c +++ b/bertos/net/http.c @@ -38,6 +38,8 @@ * the cases where SD is not present or page not found, using embedded pages. * Quering from browser the /status page, the server return a json dictionary where are store * some board status info, like board temperature, up-time, etc. + * + * notest: avr */ #include "http.h" @@ -53,80 +55,144 @@ #include #include +#include #include -static const char http_html_hdr_200[] = "HTTP/1.1 200 OK\r\nContent-type: text/html\r\n\r\n"; -static const char http_html_hdr_404[] = "HTTP/1.1 404 Not Found\r\nContent-type: text/html\r\n\r\n"; -static const char http_html_hdr_500[] = "HTTP/1.1 500 Internal Server Error\r\nContent-type: text/html\r\n\r\n"; +static const char http_html_hdr_200[] = "HTTP/1.0 200 OK\r\nContent-type: text/html\r\n\r\n"; +static const char http_html_hdr_404[] = "HTTP/1.0 404 Not Found\r\nContent-type: text/html\r\n\r\n"; +static const char http_html_hdr_500[] = "HTTP/1.0 500 Internal Server Error\r\nContent-type: text/html\r\n\r\n"; static HttpCGI *cgi_table; static http_handler_t http_callback; /** - * Send on \param client socket - * the 200 Ok http header + * Get key value from tokenized buffer */ -void http_sendOk(struct netconn *client) +int http_getValue(char *tolenized_buf, size_t tolenized_buf_len, const char *key, char *value, size_t len) { - netconn_write(client, http_html_hdr_200, sizeof(http_html_hdr_200) - 1, NETCONN_NOCOPY); -} + if (!tolenized_buf || !key || !value) + return -1; + + char *p = tolenized_buf; + size_t value_len = 0; + + memset(value, 0, len); + + for (size_t i = 0; i < tolenized_buf_len; i++) + { + if (!strcmp(key, p)) + { + /* skip key */ + size_t jump = strlen(p) + 1; + p += jump; + value_len = strlen(p); + if (value_len >= len) + return -1; + + strcpy(value, p); + break; + } + /* jump to next pair */ + p += strlen(p) + 1; + } + + return value_len; +} /** - * Send on \param client socket - * the 404 File not found http header + * tokenize a buffer */ -void http_sendFileNotFound(struct netconn *client) +int http_tokenizeGetRequest(char *raw_buf, size_t raw_len) { - netconn_write(client, http_html_hdr_404, sizeof(http_html_hdr_404) - 1, NETCONN_NOCOPY); + size_t token = 0; + + for(size_t i = 0; (i < raw_len) && raw_buf; i++) + { + if (raw_buf[i] == '&') + { + token++; + raw_buf[i] = '\0'; + } + + if (raw_buf[i] == '=') + raw_buf[i] = '\0'; + } + + return token + 1; } -/** - * Send on \param client socket - * the 500 internal server error http header - */ -void http_sendInternalErr(struct netconn *client) +static char http_hexToAscii(char first, char second) { - netconn_write(client, http_html_hdr_500, sizeof(http_html_hdr_500) - 1, NETCONN_NOCOPY); + char hex[5], *stop; + hex[0] = '0'; + hex[1] = 'x'; + hex[2] = first; + hex[3] = second; + hex[4] = 0; + return strtol(hex, &stop, 16); } -static void get_fileName(const char *revc_buf, size_t recv_len, char *name, size_t len) +void http_decodeUri(const char *raw_buf, size_t raw_len, char *decodec_buf, size_t len) { - int i = 0; - char *p = strstr(revc_buf, "GET"); - if (p) + char value; + for (size_t i = 0; i < raw_len; i++) { - //Find the end of the page request. - char *stop = strstr(revc_buf, "HTTP"); - if (!stop) - { - LOG_ERR("Bad GET request\n"); - name[0] = '\0'; + if (!len) return; - } - //skip the "/" in get string request - p += sizeof("GET") + 1; - - while (p != stop) + if (raw_buf[i] == '%') { - if ((size_t)i == len || (size_t)i >= recv_len) + if (i + 2 < raw_len) { - name[i] = '\0'; - break; + /* convert hex value after % */ + value = http_hexToAscii(raw_buf[i + 1], raw_buf[i + 2]); + if (value) + { + *decodec_buf++ = value; + len--; + /* decoded two digit of hex value, go to next value*/ + i += 2; + continue; + } } - - name[i++] = *(p++); } + *decodec_buf++ = raw_buf[i]; + len--; } +} - //Trail white space in the string. - while ( --i >= 0 ) - if (name[i] != ' ' && name[i] != '\t' && name[i] != '\n') - break; +void http_getPageName(const char *recv_buf, size_t recv_len, char *page_name, size_t len) +{ + int i = 0; + bool str_ok = false; + const char *p = recv_buf; + if (p && (recv_len > sizeof("GET /"))) + { + if (*p++ == 'G' && + *p++ == 'E' && *p++ == 'T') + { + str_ok = true; + /* skip the space and "/" */ + p += 2; + } + } + + if (str_ok) + { + while ((size_t)i < recv_len) + { + char ch = *(p++); + if (ch == ' ' || ch == '\t' || ch == '\n') + break; + if((size_t)i == len - 1) + break; + page_name[i++] = ch; + } + } - name[i + 1] = '\0'; + page_name[i] = '\0'; } INLINE const char *get_ext(const char *name) @@ -138,6 +204,35 @@ INLINE const char *get_ext(const char *name) return NULL; } + +/** + * Send on \param client socket + * the 200 Ok http header + */ +void http_sendOk(struct netconn *client) +{ + netconn_write(client, http_html_hdr_200, sizeof(http_html_hdr_200) - 1, NETCONN_NOCOPY); +} + + +/** + * Send on \param client socket + * the 404 File not found http header + */ +void http_sendFileNotFound(struct netconn *client) +{ + netconn_write(client, http_html_hdr_404, sizeof(http_html_hdr_404) - 1, NETCONN_NOCOPY); +} + +/** + * Send on \param client socket + * the 500 internal server error http header + */ +void http_sendInternalErr(struct netconn *client) +{ + netconn_write(client, http_html_hdr_500, sizeof(http_html_hdr_500) - 1, NETCONN_NOCOPY); +} + static http_handler_t cgi_search(const char *name, HttpCGI *table) { if (!table) @@ -154,9 +249,15 @@ static http_handler_t cgi_search(const char *name, HttpCGI *table) if (!strcmp(table[i].name, ext)) break; } - else /* (table[i].type == CGI_MATCH_NAME) */ + else if (table[i].type == CGI_MATCH_NAME) { LOG_INFO("Match all name %s\n", name); + if (strstr(name, table[i].name) != NULL) + break; + } + else /* (table[i].type == CGI_MATCH_WORD) */ + { + LOG_INFO("Match all word %s\n", name); if (!strcmp(table[i].name, name)) break; } @@ -193,7 +294,7 @@ void http_poll(struct netconn *server) if (rx_buf) { memset(req_string, 0, sizeof(req_string)); - get_fileName(rx_buf, len, req_string, sizeof(req_string)); + http_getPageName(rx_buf, len, req_string, sizeof(req_string)); LOG_INFO("Search %s\n", req_string); if (req_string[0] == '\0')