X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=http_blerg.c;h=a73ac1e80b125609bab091a59466d4323b418fc5;hb=268230019ea44f384c6c0b34df71fbcdcb3602fc;hp=58dd1150035e79cba0ecec6d17747ee7743819e4;hpb=3035f80046de7ff579302324660df9a4e49dbcd9;p=blerg.git
diff --git a/http_blerg.c b/http_blerg.c
index 58dd115..a73ac1e 100644
--- a/http_blerg.c
+++ b/http_blerg.c
@@ -6,12 +6,17 @@
#include "database.h"
#include "tags.h"
#include "auth.h"
+#include "canned_responses.h"
+#include "http.h"
#include "config.h"
-#define URL_INFO_AUTHOR 0x1
-#define URL_INFO_RECORD 0x2
+#define URL_INFO_AUTHOR 0x1
+#define URL_INFO_RECORD 0x2
+#define URL_INFO_RECORD_TO 0x4
#define DERP "DERP DERP DERP"
+yajl_gen_config yajl_c = { 0, 0 };
+
struct create_state {
struct MHD_PostProcessor *pp;
char username[33];
@@ -28,60 +33,15 @@ struct get_state {
struct blerg *b;
yajl_gen g;
unsigned int yoff;
- uint64_t from;
- uint64_t to;
+ uint64_t *entries;
+ uint64_t i;
int done;
};
-struct MHD_Response *response_401;
-struct MHD_Response *response_404;
-struct MHD_Response *response_405;
-struct MHD_Response *response_JSON_Success;
-struct MHD_Response *response_JSON_Failure;
-
-void init_responses() {
-#define CONTENT_401 "401 Unauthorized401 Unauthorized
DENIED"
- response_401 = MHD_create_response_from_data(strlen (CONTENT_401), CONTENT_401, MHD_NO, MHD_NO);
-
-#define CONTENT_404 "404 Not Found404 Not Found
I couldn't find that."
- response_404 = MHD_create_response_from_data(strlen(CONTENT_404), CONTENT_404, MHD_NO, MHD_NO);
-
-#define CONTENT_405 "405 Method Not Allowed405 Method Not Allowed
I'm sorry, Dave. I'm afraid I can't do that."
- response_405 = MHD_create_response_from_data(strlen(CONTENT_405), CONTENT_405, MHD_NO, MHD_NO);
-
-#define JSON_SUCCESS "{status: \"success\"}"
- response_JSON_Success = MHD_create_response_from_data(strlen(JSON_SUCCESS), JSON_SUCCESS, MHD_NO, MHD_NO);
-
-#define JSON_FAILURE "{status: \"failure\"}"
- response_JSON_Failure = MHD_create_response_from_data(strlen(JSON_FAILURE), JSON_FAILURE, MHD_NO, MHD_NO);
-}
-
-#define REALM "Blerg"
-#define OPAQUE "d29fb6db8f21a6e99903651a9f87470e"
-int respond_401(struct MHD_Connection *connection, int signal_stale) {
- return MHD_queue_auth_fail_response(connection, REALM, OPAQUE, response_401, signal_stale);
-}
-
-int respond_404(struct MHD_Connection *connection) {
- return MHD_queue_response(connection, MHD_HTTP_NOT_FOUND, response_404);
-}
-
-int respond_405(struct MHD_Connection *connection) {
- return MHD_queue_response(connection, MHD_HTTP_METHOD_NOT_ALLOWED, response_405);
-}
-
-int respond_JSON_Success(struct MHD_Connection *connection) {
- return MHD_queue_response(connection, MHD_HTTP_OK, response_JSON_Success);
-}
-
-int respond_JSON_Failure(struct MHD_Connection *connection) {
- return MHD_queue_response(connection, MHD_HTTP_OK, response_JSON_Failure);
-}
-
-int parse_url_info(const char *url, char *author, uint64_t *record) {
+int parse_url_info(const char *url, struct url_info *info) {
const char *c;
- int ret = 0;
int len;
+ info->contents = 0;
c = strchr(url, '/');
if (c == NULL) {
@@ -91,22 +51,43 @@ int parse_url_info(const char *url, char *author, uint64_t *record) {
}
if (len == 0)
return 0;
- memcpy(author, url, len);
- author[len] = 0;
- ret |= URL_INFO_AUTHOR;
+ memcpy(info->author, url, len);
+ info->author[len] = 0;
+ info->contents |= URL_INFO_AUTHOR;
+
+ if (c == NULL || c[1] == 0)
+ return info->contents;
- if (c != NULL && c[1] != 0) {
- *record = strtoull(c + 1, NULL, 10);
- ret |= URL_INFO_RECORD;
+ info->record = strtoull(c + 1, NULL, 10);
+ info->contents |= URL_INFO_RECORD;
+
+ c = strchr(c, '-');
+ if (c == NULL || c[1] == 0)
+ return info->contents;
+
+ info->record_to = strtoull(c + 1, NULL, 10);
+ info->contents |= URL_INFO_RECORD_TO;
+
+ return info->contents;
+}
+
+uint64_t *make_sequential_list(uint64_t from, uint64_t to) {
+ uint64_t len = to - from + 1;
+ uint64_t *list = malloc(len * sizeof(uint64_t));
+ uint64_t i;
+
+ for (i = 0; i < len; i++) {
+ list[i] = from + i;
}
- return ret;
+ return list;
}
ssize_t GET_generate_list(void *cls, uint64_t pos, char *buf, size_t max) {
struct get_state *gs = cls;
const unsigned char *ybuf;
char *data;
+ char number[21];
unsigned int len;
if (gs->yoff > 0) {
@@ -115,13 +96,11 @@ ssize_t GET_generate_list(void *cls, uint64_t pos, char *buf, size_t max) {
if (bytes_remaining > max) {
memcpy(buf, ybuf + gs->yoff, max);
gs->yoff += max;
- printf("generate list: gave %d bytes\n", max);
return max;
} else {
memcpy(buf, ybuf + gs->yoff, bytes_remaining);
gs->yoff = 0;
yajl_gen_clear(gs->g);
- printf("generate list: gave %d bytes\n", bytes_remaining);
return bytes_remaining;
}
}
@@ -130,41 +109,36 @@ ssize_t GET_generate_list(void *cls, uint64_t pos, char *buf, size_t max) {
return -1;
if (pos == 0) { /* Start iterating */
- gs->yoff = 0;
yajl_gen_array_open(gs->g);
- uint64_t record_count = blerg_get_record_count(gs->b);
- if (record_count == 0) {
- gs->from = 1;
- gs->to = 0;
- } else {
- gs->to = record_count - 1;
- gs->from = (record_count > 50 ? gs->to - 49 : 0);
- }
}
- if (gs->from > gs->to) { /* Done iterating */
+ /* Snarf one record */
+ blerg_fetch(gs->b, gs->entries[gs->i], &data, &len);
+
+ yajl_gen_map_open(gs->g);
+ yajl_gen_string(gs->g, "record", 6);
+ snprintf(number, 21, "%llu", gs->entries[gs->i]);
+ yajl_gen_string(gs->g, number, strlen(number));
+ yajl_gen_string(gs->g, "data", 4);
+ yajl_gen_string(gs->g, data, len);
+ yajl_gen_map_close(gs->g);
+
+ free(data);
+ if (gs->i == 0) {
yajl_gen_array_close(gs->g);
gs->done = 1;
- } else {
- /* Snarf one record */
- blerg_fetch(gs->b, gs->from, &data, &len);
- yajl_gen_string(gs->g, data, len);
- free(data);
- gs->from++;
}
+ gs->i--;
yajl_gen_get_buf(gs->g, &ybuf, &len);
- printf("%d bytes in yajl buffer\n", len);
if (len > max) {
memcpy(buf, ybuf, max);
gs->yoff = max;
- printf("generate list: gave %d bytes\n", max);
return max;
} else {
memcpy(buf, ybuf, len);
yajl_gen_clear(gs->g);
- printf("generate list: gave %d bytes\n", len);
return len;
}
}
@@ -174,6 +148,7 @@ void GET_generate_list_free(void *cls) {
blerg_close(gs->b);
yajl_gen_free(gs->g);
+ free(gs->entries);
free(gs);
}
@@ -207,7 +182,6 @@ int POST_put_iterator(void *cls, enum MHD_ValueKind kind, const char *key, const
ps->data_size += size;
ps->data = realloc(ps->data, ps->data_size);
}
- printf("Copying %d bytes, total size %d\n", size, ps->data_size);
memcpy(ps->data + off, data, size);
if (ps->data_size == MAX_RECORD_SIZE)
return MHD_NO;
@@ -216,13 +190,40 @@ int POST_put_iterator(void *cls, enum MHD_ValueKind kind, const char *key, const
return MHD_YES;
}
+struct MHD_Response *create_response_for_range(struct blerg *b, uint64_t from, uint64_t to) {
+ struct MHD_Response *response;
+ struct get_state *gs = malloc(sizeof(struct get_state));
+ gs->b = b;
+
+ uint64_t record_count = blerg_get_record_count(b);
+
+ if (from > to || from >= record_count || to >= record_count || to - from > 99) {
+ blerg_close(b);
+ free(gs);
+ return NULL;
+ }
+
+ if (record_count == 0) {
+ response = MHD_create_response_from_data(2, "[]", MHD_NO, MHD_NO);
+ } else {
+ gs->entries = make_sequential_list(from, to);
+ gs->i = to - from;
+
+ gs->g = yajl_gen_alloc(&yajl_c, NULL);
+ gs->yoff = gs->done = 0;
+
+ response = MHD_create_response_from_callback(-1, 262144, &GET_generate_list, gs, &GET_generate_list_free);
+ }
+
+ return response;
+}
+
static int
ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const char *method,
const char *version, const char *upload_data, size_t *upload_data_size, void **ptr) {
struct MHD_Response *response;
int ret, len;
- char author[33];
- uint64_t record;
+ struct url_info info;
char *data;
if (strncmp(url, "/get", 4) == 0 && strlen(url) > 4) {
@@ -237,44 +238,44 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c
if (url[4] != '/')
return respond_404(connection);
- ret = parse_url_info(url + 5, author, &record);
+ ret = parse_url_info(url + 5, &info);
if ((ret & URL_INFO_AUTHOR) == 0)
return respond_404(connection);
- if (!blerg_exists(author))
+ if (!blerg_exists(info.author))
return respond_404(connection);
*ptr == NULL;
- if (ret & URL_INFO_RECORD) {
- struct blerg *b = blerg_open(author);
- ret = blerg_fetch(b, record, &data, &len);
+ struct blerg *b = blerg_open(info.author);
+
+ if ((ret & URL_INFO_RECORD) && (ret & URL_INFO_RECORD_TO)) {
+ response = create_response_for_range(b, info.record, info.record_to);
+ } else if (ret & URL_INFO_RECORD) {
+ ret = blerg_fetch(b, info.record, &data, &len);
blerg_close(b);
- if (ret == 0) {
+ if (ret == 0)
return respond_404(connection);
+ response = MHD_create_response_from_data(len, data, MHD_YES, MHD_NO);
+ } else {
+ uint64_t record_count, from, to;
+ record_count = blerg_get_record_count(b);
+ if (record_count == 0) {
+ response = create_response_for_range(b, 0, 0);
} else {
- response = MHD_create_response_from_data(len, data, MHD_YES, MHD_NO);
- ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+ to = record_count - 1;
+ from = (record_count > 50 ? to - 49 : 0);
+ response = create_response_for_range(b, from, to);
}
- MHD_destroy_response(response);
- return ret;
- } else {
- yajl_gen_config c;
- c.beautify = 0;
-
- struct get_state *gs = malloc(sizeof(struct get_state));
- gs->b = blerg_open(author);
- gs->g = yajl_gen_alloc(&c, NULL);
- gs->yoff = 0;
- gs->done = 0;
+ }
- response = MHD_create_response_from_callback(-1, 262144, &GET_generate_list, gs, &GET_generate_list_free);
- ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
- MHD_destroy_response(response);
+ if (response == NULL)
+ return respond_JSON_Failure(connection);
- return ret;
- }
+ ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+ MHD_destroy_response(response);
+ return ret;
} else if (strncmp(url, "/put", 4) == 0) {
struct put_state *ps = (struct put_state *) *ptr;
char *username;
@@ -334,6 +335,50 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c
*ptr = NULL;
return respond_JSON_Success(connection);
+ } else if (strncmp(url, "/info", 5) == 0) {
+ if (*ptr == NULL) {
+ *ptr = (void *) 1;
+
+ if (strcmp(method, MHD_HTTP_METHOD_GET) != 0)
+ return respond_405(connection);
+ return MHD_YES;
+ }
+
+
+ if (url[5] != '/')
+ return respond_404(connection);
+
+ ret = parse_url_info(url + 6, &info);
+ if ((ret & URL_INFO_AUTHOR) == 0)
+ return respond_404(connection);
+
+ if (!blerg_exists(info.author))
+ return respond_404(connection);
+
+ *ptr == NULL;
+
+ struct blerg *b = blerg_open(info.author);
+ uint64_t record_count = blerg_get_record_count(b);
+ blerg_close(b);
+
+ char number[21];
+ yajl_gen g = yajl_gen_alloc(&yajl_c, NULL);
+ yajl_gen_map_open(g);
+ yajl_gen_string(g, "record_count", 12);
+ snprintf(number, 21, "%llu", record_count);
+ yajl_gen_string(g, number, strlen(number));
+ yajl_gen_map_close(g);
+
+ const unsigned char *ybuf;
+ yajl_gen_get_buf(g, &ybuf, &len);
+
+ response = MHD_create_response_from_data(len, (void *)ybuf, MHD_NO, MHD_YES);
+ ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+ MHD_destroy_response(response);
+
+ yajl_gen_free(g);
+
+ return ret;
} else if (strncmp(url, "/create", 8) == 0) {
struct create_state *cs = (struct create_state *) *ptr;