diff options
author | Lars-Dominik Braun <PromyLOPh@lavabit.com> | 2009-05-03 19:54:27 +0200 |
---|---|---|
committer | Lars-Dominik Braun <PromyLOPh@lavabit.com> | 2009-05-03 19:54:27 +0200 |
commit | e38ec37da39765e8eb98fa4ead2e1335ca8bedfc (patch) | |
tree | dfa29fc73b379b6cce89d23e1f115c0a915713d4 | |
parent | 41f37b30b87632b5b666299efc692978010a1994 (diff) | |
download | pianobar-e38ec37da39765e8eb98fa4ead2e1335ca8bedfc.tar.gz pianobar-e38ec37da39765e8eb98fa4ead2e1335ca8bedfc.tar.bz2 pianobar-e38ec37da39765e8eb98fa4ead2e1335ca8bedfc.zip |
waitress: Added
libwaitress is a http library designed to replace curl
-rw-r--r-- | libwaitress/AUTHORS | 2 | ||||
-rw-r--r-- | libwaitress/CMakeLists.txt | 6 | ||||
-rw-r--r-- | libwaitress/COPYING | 20 | ||||
-rw-r--r-- | libwaitress/README | 4 | ||||
-rw-r--r-- | libwaitress/src/CMakeLists.txt | 7 | ||||
-rw-r--r-- | libwaitress/src/config.h.in | 1 | ||||
-rw-r--r-- | libwaitress/src/main.c | 397 | ||||
-rw-r--r-- | libwaitress/src/waitress.h | 72 |
8 files changed, 509 insertions, 0 deletions
diff --git a/libwaitress/AUTHORS b/libwaitress/AUTHORS new file mode 100644 index 0000000..09787cf --- /dev/null +++ b/libwaitress/AUTHORS @@ -0,0 +1,2 @@ +Main code: + Lars-Dominik Braun <PromyLOPh@lavabit.com> diff --git a/libwaitress/CMakeLists.txt b/libwaitress/CMakeLists.txt new file mode 100644 index 0000000..c160521 --- /dev/null +++ b/libwaitress/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required (VERSION 2.4) + +set (PACKAGE "libwaitress") +project (${PACKAGE} C) + +add_subdirectory (src) diff --git a/libwaitress/COPYING b/libwaitress/COPYING new file mode 100644 index 0000000..a30ceaf --- /dev/null +++ b/libwaitress/COPYING @@ -0,0 +1,20 @@ +Copyright (c) 2009 + Lars-Dominik Braun <PromyLOPh@lavabit.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/libwaitress/README b/libwaitress/README new file mode 100644 index 0000000..83b2d02 --- /dev/null +++ b/libwaitress/README @@ -0,0 +1,4 @@ +README +====== + +libwaitress is pianobar's http communication library. diff --git a/libwaitress/src/CMakeLists.txt b/libwaitress/src/CMakeLists.txt new file mode 100644 index 0000000..1facec9 --- /dev/null +++ b/libwaitress/src/CMakeLists.txt @@ -0,0 +1,7 @@ +set (CMAKE_C_FLAGS -Wall) + +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/config.h) + +add_library (waitress STATIC main.c) + diff --git a/libwaitress/src/config.h.in b/libwaitress/src/config.h.in new file mode 100644 index 0000000..60600a7 --- /dev/null +++ b/libwaitress/src/config.h.in @@ -0,0 +1 @@ +#define PACKAGE "${PACKAGE}" diff --git a/libwaitress/src/main.c b/libwaitress/src/main.c new file mode 100644 index 0000000..f51d991 --- /dev/null +++ b/libwaitress/src/main.c @@ -0,0 +1,397 @@ +/* +Copyright (c) 2009 + Lars-Dominik Braun <PromyLOPh@lavabit.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +#include <sys/types.h> +#include <sys/socket.h> +#include <netdb.h> +#include <string.h> +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> + +#include "config.h" +#include "waitress.h" + +typedef struct { + char *buf; + char *pos; + size_t max; +} WaitressFetchBufCbBuffer_t; + +inline void WaitressInit (WaitressHandle_t *waith) { + memset (waith, 0, sizeof (*waith)); +} + +inline void WaitressFree (WaitressHandle_t *waith) { + memset (waith, 0, sizeof (*waith)); +} + +/* Proxy set up? + * @param Waitress handle + * @return true|false + */ +inline char WaitressProxyEnabled (const WaitressHandle_t *waith) { + return *waith->proxyHost != '\0' && *waith->proxyPort != '\0'; +} + +/* Set http proxy + * @param waitress handle + * @param host + * @param port + */ +inline void WaitressSetProxy (WaitressHandle_t *waith, const char *host, + const char *port) { + strncpy (waith->proxyHost, host, sizeof (waith->proxyHost)-1); + strncpy (waith->proxyPort, port, sizeof (waith->proxyPort)-1); +} + +/* urlencode post-data + * @param encode this + * @return malloc'ed encoded string, don't forget to free it + */ +char *WaitressUrlEncode (const char *in) { + /* worst case: encode all characters */ + size_t inLen = strlen (in); + char *out = calloc (inLen * 3 + 1, sizeof (*in)); + const char *inPos = in; + char *outPos = out; + + while (inPos - in < inLen) { + if (!isalnum (*inPos) && *inPos != '_' && *inPos != '-' && *inPos != '.') { + *outPos++ = '%'; + snprintf (outPos, 3, "%02x", *inPos); + outPos += 2; + } else { + /* copy character */ + *outPos++ = *inPos; + } + ++inPos; + } + + return out; +} + +/* Split http url into host, port and path + * @param url + * @param return buffer: host + * @param host buffer size + * @param return buffer: port, defaults to 80 + * @param port buffer size + * @param return buffer: path + * @param path buffer size + * @param 1 = ok, 0 = not a http url; if your buffers are too small horrible + * things will happen... But 1 is returned anyway. + */ +char WaitressSplitUrl (const char *url, char *retHost, size_t retHostSize, + char *retPort, size_t retPortSize, char *retPath, size_t retPathSize) { + size_t urlSize = strlen (url); + const char *urlPos = url, *lastPos; + + if (urlSize > sizeof ("http://")-1 && + memcmp (url, "http://", sizeof ("http://")-1) == 0) { + memset (retHost, 0, retHostSize); + memset (retPort, 0, retPortSize); + strncpy (retPort, "80", retPortSize-1); + memset (retPath, 0, retPathSize); + + urlPos += sizeof ("http://")-1; + lastPos = urlPos; + + /* find host */ + while (*urlPos != ':' && *urlPos != '/' && urlPos - lastPos < retHostSize-1) { + *retHost++ = *urlPos++; + } + lastPos = urlPos; + + /* port, if available */ + if (*urlPos == ':') { + /* skip : */ + ++urlPos; + ++lastPos; + while (*urlPos != '/' && urlPos - lastPos < retPortSize-1) { + *retPort++ = *urlPos++; + } + } + lastPos = urlPos; + + /* path */ + while (*urlPos != '\0' && *urlPos != '#' && urlPos - lastPos < retPathSize-1) { + *retPath++ = *urlPos++; + } + } else { + return 0; + } + return 1; +} + +inline char WaitressSetUrl (WaitressHandle_t *waith, const char *url) { + return WaitressSplitUrl (url, waith->host, sizeof (waith->host), + waith->port, sizeof (waith->port), waith->path, sizeof (waith->path)); +} + +inline void WaitressSetHPP (WaitressHandle_t *waith, const char *host, + const char *port, const char *path) { + strncpy (waith->host, host, sizeof (waith->host)-1); + strncpy (waith->port, port, sizeof (waith->port)-1); + strncpy (waith->path, path, sizeof (waith->path)-1); +} + +/* Callback for WaitressFetchBuf, appends received data to NULL-terminated buffer + * @param received data + * @param data size + * @param buffer structure + */ +char WaitressFetchBufCb (void *recvData, size_t recvDataSize, void *extraData) { + char *recvBytes = recvData; + WaitressFetchBufCbBuffer_t *buffer = extraData; + + if (buffer->pos - buffer->buf + recvDataSize < buffer->max) { + memcpy (buffer->pos, recvBytes, recvDataSize); + buffer->pos += recvDataSize; + *buffer->pos = '\0'; + } else { + printf (PACKAGE ": Buffer overflow!\n"); + return 0; + } + + return 1; +} + +/* Fetch string. Beware! This overwrites your waith->data pointer + * @param waitress handle + * @param Connect to host + * @param Port or service + * @param Resource path + * @param result buffer + * @param result buffer size + */ +WaitressReturn_t WaitressFetchBuf (WaitressHandle_t *waith, char *buf, + size_t bufSize) { + WaitressFetchBufCbBuffer_t buffer; + + buffer.buf = buffer.pos = buf; + buffer.max = bufSize; + waith->data = &buffer; + waith->callback = WaitressFetchBufCb; + + return WaitressFetchCall (waith); +} + +#define CLOSE_RET(ret) close (sockfd); return ret; + +/* Receive data from host and call *callback () + * @param waitress handle + * @param host + * @param port + * @param absolute path + * @param callback function + * @return WaitressReturn_t + */ +WaitressReturn_t WaitressFetchCall (WaitressHandle_t *waith) { + struct addrinfo hints, *res; + int sockfd; + char recvBuf[WAITRESS_RECV_BUFFER]; + char statusBuf[3]; + char writeBuf[2*1024]; + ssize_t recvSize = 0; + WaitressReturn_t wRet = WAITRESS_RET_OK; + + /* initialize */ + waith->contentLength = 0; + waith->contentReceived = 0; + memset (&hints, 0, sizeof hints); + + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + + /* Use proxy? */ + if (WaitressProxyEnabled (waith)) { + if (getaddrinfo (waith->proxyHost, waith->proxyPort, &hints, &res) != 0) { + return WAITRESS_RET_GETADDR_ERR; + } + } else { + if (getaddrinfo (waith->host, waith->port, &hints, &res) != 0) { + return WAITRESS_RET_GETADDR_ERR; + } + } + + if ((sockfd = socket (res->ai_family, res->ai_socktype, res->ai_protocol)) == -1) { + freeaddrinfo (res); + return WAITRESS_RET_SOCK_ERR; + } + + if (connect (sockfd, res->ai_addr, res->ai_addrlen) == -1) { + freeaddrinfo (res); + return WAITRESS_RET_CONNECT_REFUSED; + } + + freeaddrinfo (res); + + /* send request */ + if (WaitressProxyEnabled (waith)) { + snprintf (writeBuf, sizeof (writeBuf), + "%s http://%s:%s%s HTTP/1.1\r\nProxy-Connection: close\r\n", + (waith->method == WAITRESS_METHOD_GET ? "GET" : "POST"), + waith->host, waith->port, waith->path); + } else { + snprintf (writeBuf, sizeof (writeBuf), + "%s %s HTTP/1.1\r\nConnection: close\r\n", + (waith->method == WAITRESS_METHOD_GET ? "GET" : "POST"), + waith->path); + } + write (sockfd, writeBuf, strlen (writeBuf)); + + snprintf (writeBuf, sizeof (writeBuf), + "Host: %s\r\nUser-Agent: " PACKAGE "\r\n", waith->host); + write (sockfd, writeBuf, strlen (writeBuf)); + + if (waith->method == WAITRESS_METHOD_POST && waith->postData != NULL) { + snprintf (writeBuf, sizeof (writeBuf), "Content-Length: %u\r\n", + strlen (waith->postData)); + write (sockfd, writeBuf, strlen (writeBuf)); + } + + if (waith->extraHeaders != NULL) { + write (sockfd, waith->extraHeaders, strlen (waith->extraHeaders)); + } + + write (sockfd, "\r\n", 2); + + if (waith->method == WAITRESS_METHOD_POST && waith->postData != NULL) { + write (sockfd, waith->postData, strlen (waith->postData)); + } + + /* throw "HTTP/1.1 " (length 9) away... */ + read (sockfd, recvBuf, 9); + + /* parse status code */ + read (sockfd, statusBuf, sizeof (statusBuf)); + switch (statusBuf[0]) { + case '2': + if (statusBuf[1] == '0' && statusBuf[2] == '0') { + /* 200 OK */ + } else { + CLOSE_RET (WAITRESS_RET_STATUS_UNKNOWN); + } + break; + + case '4': + /* 40X? */ + switch (statusBuf[1]) { + case '0': + switch (statusBuf[2]) { + case '3': + /* 403 Forbidden */ + CLOSE_RET (WAITRESS_RET_FORBIDDEN); + break; + + case '4': + /* 404 Not found */ + CLOSE_RET (WAITRESS_RET_NOTFOUND); + break; + + default: + CLOSE_RET (WAITRESS_RET_STATUS_UNKNOWN); + break; + } + break; + + default: + CLOSE_RET (WAITRESS_RET_STATUS_UNKNOWN); + break; + } + break; + + default: + CLOSE_RET (WAITRESS_RET_STATUS_UNKNOWN); + break; + } + + /* read and parse header, max sizeof(recvBuf) */ + char *bufPos = recvBuf, *hdrMark = NULL, *hdrBegin = recvBuf; + recvSize = read (sockfd, recvBuf, sizeof (recvBuf)); + + while (bufPos - recvBuf < recvSize) { + /* mark header name end */ + if (*bufPos == ':' && hdrMark == NULL) { + hdrMark = bufPos; + } else if (*bufPos == '\n') { + /* parse header */ + if (hdrMark != NULL && (bufPos - hdrBegin > 12) && + memcmp ("Content-Length", hdrBegin, 12) == 0) { + /* unsigned integer max: 4,294,967,295 = 10 digits */ + char tmpSizeBuf[11]; + + memset (tmpSizeBuf, 0, sizeof (tmpSizeBuf)); + + /* skip ':' => +1; skip '\r' suffix => -1 */ + if ((bufPos-1) - (hdrMark+1) > sizeof (tmpSizeBuf)-1) { + CLOSE_RET (WAITRESS_RET_HDR_OVERFLOW); + } + memcpy (tmpSizeBuf, hdrMark+1, (bufPos-1) - (hdrMark+1)); + waith->contentLength = atol (tmpSizeBuf); + } + + /* end header, containts \r\n == empty line */ + if (bufPos - hdrBegin < 2 && hdrMark == NULL) { + ++bufPos; + /* push remaining bytes to callback */ + if (bufPos - recvBuf < recvSize) { + waith->contentReceived += recvSize - (bufPos - recvBuf); + if (!waith->callback (bufPos, recvSize - (bufPos - recvBuf), + waith->data)) { + CLOSE_RET (WAITRESS_RET_CB_ABORT); + } + } + break; + } + + hdrBegin = bufPos+1; + hdrMark = NULL; + } + ++bufPos; + } + + /* receive content */ + do { + recvSize = read (sockfd, recvBuf, sizeof (recvBuf)); + if (recvSize > 0) { + waith->contentReceived += recvSize; + if (!waith->callback (recvBuf, recvSize, waith->data)) { + wRet = WAITRESS_RET_CB_ABORT; + break; + } + } + } while (recvSize > 0); + + close (sockfd); + + if (wRet == WAITRESS_RET_OK && waith->contentReceived < waith->contentLength) { + return WAITRESS_RET_PARTIAL_FILE; + } + return wRet; +} + +#undef CLOSE_RET + diff --git a/libwaitress/src/waitress.h b/libwaitress/src/waitress.h new file mode 100644 index 0000000..cc999b3 --- /dev/null +++ b/libwaitress/src/waitress.h @@ -0,0 +1,72 @@ +/* +Copyright (c) 2009 + Lars-Dominik Braun <PromyLOPh@lavabit.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +#ifndef _WAITRESS_H +#define _WAITRESS_H + +#include <stdlib.h> + +#define WAITRESS_HOST_SIZE 100 +/* max: 65,535 */ +#define WAITRESS_PORT_SIZE 6 +#define WAITRESS_PATH_SIZE 1000 +#define WAITRESS_RECV_BUFFER 10*1024 + +typedef enum {WAITRESS_METHOD_GET = 0, WAITRESS_METHOD_POST} WaitressMethod_t; + +typedef struct { + char host[WAITRESS_HOST_SIZE]; + char port[WAITRESS_PORT_SIZE]; + char path[WAITRESS_PATH_SIZE]; + WaitressMethod_t method; + const char *extraHeaders; + const char *postData; + size_t contentLength; + size_t contentReceived; + char proxyHost[WAITRESS_HOST_SIZE]; + char proxyPort[WAITRESS_PORT_SIZE]; + /* extra data handed over to callback function */ + void *data; + char (*callback) (void *, size_t, void *); +} WaitressHandle_t; + +typedef enum {WAITRESS_RET_ERR = 0, WAITRESS_RET_OK, WAITRESS_RET_STATUS_UNKNOWN, + WAITRESS_RET_NOTFOUND, WAITRESS_RET_FORBIDDEN, WAITRESS_RET_CONNECT_REFUSED, + WAITRESS_RET_SOCK_ERR, WAITRESS_RET_GETADDR_ERR, + WAITRESS_RET_CB_ABORT, WAITRESS_RET_HDR_OVERFLOW, + WAITRESS_RET_PARTIAL_FILE} WaitressReturn_t; + +void WaitressInit (WaitressHandle_t *); +void WaitressFree (WaitressHandle_t *); +void WaitressSetProxy (WaitressHandle_t *, const char *, const char *); +char *WaitressUrlEncode (const char *); +char WaitressSplitUrl (const char *, char *, size_t, char *, size_t, char *, + size_t); +inline char WaitressSetUrl (WaitressHandle_t *, const char *); +inline void WaitressSetHPP (WaitressHandle_t *, const char *, const char *, + const char *); +WaitressReturn_t WaitressFetchBuf (WaitressHandle_t *, char *, size_t); +WaitressReturn_t WaitressFetchCall (WaitressHandle_t *); + +#endif /* _WAITRESS_H */ + |