X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=http%2Fhttp_blerg.c;h=e2057491ff5a899a0a801ceba0d5b95f19916466;hb=ec8746b44dc85fd3e3b42835f779890684a9e90a;hp=73f88fe9393263a9f94771bcd7ee7577eee15ea4;hpb=1cf0f1ebfbd5b5a621af2a49ac0328fd0cec4bf4;p=blerg.git diff --git a/http/http_blerg.c b/http/http_blerg.c index 73f88fe..e205749 100644 --- a/http/http_blerg.c +++ b/http/http_blerg.c @@ -1,3 +1,6 @@ +/* Blerg is (C) 2011 The Dominion of Awesome, and is distributed under a + * BSD-style license. Please see the COPYING file for details. + */ #include #include #include @@ -5,19 +8,15 @@ #include #include "database.h" #include "tags.h" +#include "subscription.h" #include "auth.h" #include "canned_responses.h" -#include "http.h" +#include "app.h" #include "config.h" -#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 auth_state { struct MHD_PostProcessor *pp; char username[33]; char password[33]; @@ -25,10 +24,17 @@ struct create_state { struct put_state { struct MHD_PostProcessor *pp; + char username[33]; char *data; int data_size; }; +struct subscribe_state { + struct MHD_PostProcessor *pp; + char username[33]; + char to[33]; +}; + struct get_state { struct blerg *b; yajl_gen g; @@ -38,86 +44,14 @@ struct get_state { int done; }; -struct tag_state { +struct blergref_state { yajl_gen g; unsigned int yoff; - struct tag *results; + struct blergref *results; uint64_t i; int done; }; -int parse_url_info(const char *url, struct url_info *info) { - const char *c; - int len; - info->contents = 0; - - c = strchr(url, '/'); - if (c == NULL) { - len = strlen(url); - } else { - len = c - url; - } - if (len == 0) - return 0; - memcpy(info->author, url, len); - info->author[len] = 0; - info->contents |= URL_INFO_AUTHOR; - - if (c == NULL || c[1] == 0) - return info->contents; - - 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 list; -} - -void json_generate_one_record(yajl_gen g, const char *author, struct blerg *b, uint64_t record) { - char *data; - char number[21]; - int len; - - if (!blerg_fetch(b, record, &data, &len)) { - fprintf(stderr, "Could not fetch record\n"); - return; - } - - yajl_gen_map_open(g); - if (author != NULL) { - yajl_gen_string(g, "author", 6); - yajl_gen_string(g, author, strlen(author)); - } - yajl_gen_string(g, "record", 6); - snprintf(number, 21, "%llu", record); - yajl_gen_string(g, number, strlen(number)); - yajl_gen_string(g, "timestamp", 9); - yajl_gen_integer(g, blerg_get_timestamp(b, record)); - yajl_gen_string(g, "data", 4); - yajl_gen_string(g, data, len); - yajl_gen_map_close(g); - - free(data); -} - ssize_t GET_generate_list(void *cls, uint64_t pos, char *buf, size_t max) { struct get_state *gs = cls; const unsigned char *ybuf; @@ -148,7 +82,7 @@ ssize_t GET_generate_list(void *cls, uint64_t pos, char *buf, size_t max) { } /* Snarf one record */ - json_generate_one_record(gs->g, NULL, gs->b, gs->entries[gs->i]); + json_generate_one_record(gs->g, NULL, gs->b, gs->entries[gs->i], 0); if (gs->i == 0) { yajl_gen_array_close(gs->g); @@ -178,82 +112,79 @@ void GET_generate_list_free(void *cls) { free(gs); } -ssize_t GET_generate_taglist(void *cls, uint64_t pos, char *buf, size_t max) { - struct tag_state *ts = cls; +ssize_t GET_generate_blergref_list(void *cls, uint64_t pos, char *buf, size_t max) { + struct blergref_state *bs = cls; struct blerg *b; const unsigned char *ybuf; unsigned int len; - if (ts->yoff > 0) { - yajl_gen_get_buf(ts->g, &ybuf, &len); - size_t bytes_remaining = len - ts->yoff; + if (bs->yoff > 0) { + yajl_gen_get_buf(bs->g, &ybuf, &len); + size_t bytes_remaining = len - bs->yoff; if (bytes_remaining > max) { - memcpy(buf, ybuf + ts->yoff, max); - ts->yoff += max; + memcpy(buf, ybuf + bs->yoff, max); + bs->yoff += max; return max; } else { - memcpy(buf, ybuf + ts->yoff, bytes_remaining); - ts->yoff = 0; - yajl_gen_clear(ts->g); + memcpy(buf, ybuf + bs->yoff, bytes_remaining); + bs->yoff = 0; + yajl_gen_clear(bs->g); return bytes_remaining; } } - if (ts->done) + if (bs->done) return -1; if (pos == 0) { /* Start iterating */ - yajl_gen_array_open(ts->g); + yajl_gen_array_open(bs->g); } /* Snarf one record */ - b = blerg_open(ts->results[ts->i].author); - if (b == NULL) - goto skip_bad_blerg; - - json_generate_one_record(ts->g, ts->results[ts->i].author, b, ts->results[ts->i].record); - - blerg_close(b); + b = blerg_open(bs->results[bs->i].author); + if (b != NULL) { + json_generate_one_record(bs->g, bs->results[bs->i].author, b, bs->results[bs->i].record, 0); + blerg_close(b); + } -skip_bad_blerg: - if (ts->i == 0) { - yajl_gen_array_close(ts->g); - ts->done = 1; + if (bs->i == 0) { + yajl_gen_array_close(bs->g); + bs->done = 1; } - ts->i--; + bs->i--; - yajl_gen_get_buf(ts->g, &ybuf, &len); + yajl_gen_get_buf(bs->g, &ybuf, &len); if (len > max) { memcpy(buf, ybuf, max); - ts->yoff = max; + bs->yoff = max; return max; } else { memcpy(buf, ybuf, len); - yajl_gen_clear(ts->g); + yajl_gen_clear(bs->g); return len; } } -void GET_generate_taglist_free(void *cls) { - struct tag_state *ts = cls; +void GET_generate_blergref_list_free(void *cls) { + struct blergref_state *bs = cls; - yajl_gen_free(ts->g); - free(ts->results); - free(ts); + yajl_gen_free(bs->g); + free(bs->results); + free(bs); } -int POST_create_iterator(void *cls, enum MHD_ValueKind kind, const char *key, const char *filename, const char *content_type, const char *transfer_encoding, const char *data, uint64_t off, size_t size) { - struct create_state *cs = cls; +int POST_auth_iterator(void *cls, enum MHD_ValueKind kind, const char *key, const char *filename, const char *content_type, const char *transfer_encoding, const char *data, uint64_t off, size_t size) { + struct auth_state *as = cls; if (strncmp(key, "username", 9) == 0) { if (size > 32) size = 32; - memcpy(cs->username, data, size); - cs->username[size] = 0; + memcpy(as->username, data, size); + as->username[size] = 0; } else if (strncmp(key, "password", 9) == 0) { if (size > 32) size = 32; - memcpy(cs->password, data, size); - cs->password[size] = 0; + memcpy(as->password, data, size); + as->password[size] = 0; } return MHD_YES; @@ -276,6 +207,26 @@ int POST_put_iterator(void *cls, enum MHD_ValueKind kind, const char *key, const memcpy(ps->data + off, data, size); if (ps->data_size == MAX_RECORD_SIZE) return MHD_NO; + } else if (strncmp(key, "username", 9) == 0) { + if (size > 32) size = 32; + memcpy(ps->username, data, size); + ps->username[size] = 0; + } + + return MHD_YES; +} + +int POST_subscribe_iterator(void *cls, enum MHD_ValueKind kind, const char *key, const char *filename, const char *content_type, const char *transfer_encoding, const char *data, uint64_t off, size_t size) { + struct subscribe_state *ss = cls; + + if (strncmp(key, "username", 9) == 0) { + if (size > 32) size = 32; + memcpy(ss->username, data, size); + ss->username[size] = 0; + } else if (strncmp(key, "to", 3) == 0) { + if (size > 32) size = 32; + memcpy(ss->to, data, size); + ss->to[size] = 0; } return MHD_YES; @@ -305,14 +256,14 @@ struct MHD_Response *create_response_for_range(struct blerg *b, uint64_t from, u return response; } -struct MHD_Response *create_tag_response(struct tag *results, uint64_t len) { - struct tag_state *ts = malloc(sizeof(struct tag_state)); - ts->g = yajl_gen_alloc(&yajl_c, NULL); - ts->results = results; - ts->i = len - 1; - ts->yoff = ts->done = 0; +struct MHD_Response *create_blergref_response(struct blergref *results, uint64_t len) { + struct blergref_state *bs = malloc(sizeof(struct blergref_state)); + bs->g = yajl_gen_alloc(&yajl_c, NULL); + bs->results = results; + bs->i = len - 1; + bs->yoff = bs->done = 0; - return MHD_create_response_from_callback(-1, 262144, &GET_generate_taglist, ts, &GET_generate_taglist_free); + return MHD_create_response_from_callback(-1, 262144, &GET_generate_blergref_list, bs, &GET_generate_blergref_list_free); } static int @@ -336,15 +287,15 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c return respond_404(connection); ret = parse_url_info(url + 5, &info); - if ((ret & URL_INFO_AUTHOR) == 0) + if ((ret & URL_INFO_NAME) == 0) return respond_404(connection); - if (!blerg_exists(info.author)) + if (!blerg_exists(info.name)) return respond_404(connection); *ptr == NULL; - struct blerg *b = blerg_open(info.author); + struct blerg *b = blerg_open(info.name); if ((ret & URL_INFO_RECORD) && (ret & URL_INFO_RECORD_TO)) { response = create_response_for_range(b, info.record, info.record_to); @@ -389,19 +340,21 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c return respond_404(connection); ret = parse_url_info(url + 5, &info); - if ((ret & URL_INFO_AUTHOR) == 0) + if ((ret & URL_INFO_NAME) == 0) return respond_404(connection); - if (!tag_exists(info.author)) + if (info.name[0] == 'H') + info.name[0] = '#'; + if (!tag_exists(info.name)) return respond_404(connection); - uint64_t recs = 50; - struct tag *taglist = tag_list(info.author, 0, &recs, -1); + int recs = 50; + struct blergref *taglist = tag_list(info.name, 0, &recs, -1); if (recs == 0) { response = MHD_create_response_from_data(2, "[]", MHD_NO, MHD_NO); } else { - response = create_tag_response(taglist, recs); + response = create_blergref_response(taglist, recs); } if (response == NULL) @@ -413,9 +366,6 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c return ret; } else if (strncmp(url, "/put", 4) == 0) { struct put_state *ps = (struct put_state *) *ptr; - char *username; - char password[33]; - if (*ptr == NULL) { if (strcmp(method, MHD_HTTP_METHOD_POST) != 0) return respond_405(connection); @@ -425,21 +375,11 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c *ptr = (void *) 1; - username = MHD_digest_auth_get_username(connection); - if (username == NULL) - return respond_401(connection, MHD_NO); - auth_get_password(username, password); - - ret = MHD_digest_auth_check(connection, REALM, username, password, 300); - free(username); - - if (ret == MHD_INVALID_NONCE || ret == MHD_NO) - return respond_401(connection, (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO); - struct put_state *ps = malloc(sizeof(struct put_state)); ps->data = NULL; ps->data_size = 0; ps->pp = MHD_create_post_processor(connection, 16384, &POST_put_iterator, ps); + ps->username[0] = 0; *ptr = ps; return MHD_YES; } @@ -450,21 +390,22 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c return MHD_YES; } - if (ps->data == NULL || ps->data_size == 0) + if (ps->data == NULL || ps->data_size == 0 || ps->username[0] == 0) return respond_JSON_Failure(connection); - username = MHD_digest_auth_get_username(connection); - struct blerg *b = blerg_open(username); - if (b == NULL) + const char *given_token = MHD_lookup_connection_value(connection, MHD_COOKIE_KIND, "auth"); + if (!auth_check_token(ps->username, given_token)) return respond_JSON_Failure(connection); - if (blerg_store(b, ps->data, ps->data_size) == -1) { - blerg_close(b); + + struct blerg *b = blerg_open(ps->username); + if (b == NULL) return respond_JSON_Failure(connection); - } + ret = blerg_store(b, ps->data, ps->data_size); blerg_close(b); + if (ret == -1) + return respond_JSON_Failure(connection); MHD_destroy_post_processor(ps->pp); - free(username); free(ps->data); free(ps); *ptr = NULL; @@ -484,15 +425,15 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c return respond_404(connection); ret = parse_url_info(url + 6, &info); - if ((ret & URL_INFO_AUTHOR) == 0) + if ((ret & URL_INFO_NAME) == 0) return respond_404(connection); - if (!blerg_exists(info.author)) + if (!blerg_exists(info.name)) return respond_404(connection); *ptr == NULL; - struct blerg *b = blerg_open(info.author); + struct blerg *b = blerg_open(info.name); uint64_t record_count = blerg_get_record_count(b); blerg_close(b); @@ -515,40 +456,182 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c return ret; } else if (strncmp(url, "/create", 8) == 0) { - struct create_state *cs = (struct create_state *) *ptr; + struct auth_state *as = (struct auth_state *) *ptr; - if (cs == NULL) { + if (as == NULL) { if (strcmp(method, MHD_HTTP_METHOD_POST) != 0) return respond_405(connection); - struct create_state *cs = malloc(sizeof(struct create_state)); - cs->username[0] = cs->password[0] = 0; - cs->pp = MHD_create_post_processor(connection, 1024, &POST_create_iterator, cs); - *ptr = cs; + struct auth_state *as = malloc(sizeof(struct auth_state)); + as->username[0] = as->password[0] = 0; + as->pp = MHD_create_post_processor(connection, 1024, &POST_auth_iterator, as); + *ptr = as; return MHD_YES; } if (*upload_data_size) { - MHD_post_process(cs->pp, upload_data, *upload_data_size); + MHD_post_process(as->pp, upload_data, *upload_data_size); *upload_data_size = 0; return MHD_YES; } - if (cs->username[0] == 0 || cs->password[0] == 0) + if (as->username[0] == 0 || as->password[0] == 0) return respond_JSON_Failure(connection); - if (blerg_exists(cs->username)) + if (blerg_exists(as->username)) return respond_JSON_Failure(connection); - struct blerg *b = blerg_open(cs->username); + struct blerg *b = blerg_open(as->username); blerg_close(b); - auth_set_password(cs->username, cs->password); + auth_set_password(as->username, as->password); - MHD_destroy_post_processor(cs->pp); - free(cs); + MHD_destroy_post_processor(as->pp); + free(as); *ptr = NULL; return respond_JSON_Success(connection); + } else if (strncmp(url, "/login", 7) == 0) { + struct auth_state *as = (struct auth_state *) *ptr; + + if (as == NULL) { + if (strcmp(method, MHD_HTTP_METHOD_POST) != 0) + return respond_405(connection); + + struct auth_state *as = malloc(sizeof(struct auth_state)); + as->username[0] = as->password[0] = 0; + as->pp = MHD_create_post_processor(connection, 1024, &POST_auth_iterator, as); + *ptr = as; + return MHD_YES; + } + + if (*upload_data_size) { + MHD_post_process(as->pp, upload_data, *upload_data_size); + *upload_data_size = 0; + return MHD_YES; + } + + if (as->username[0] == 0 || as->password[0] == 0) + return respond_JSON_Failure(connection); + + if (!auth_login(as->username, as->password)) + return respond_JSON_Failure(connection); + + response = MHD_create_response_from_data(strlen(JSON_SUCCESS), JSON_SUCCESS, MHD_NO, MHD_NO); + + char *token = auth_get_token(as->username); + data = malloc(512); + snprintf(data, 512, "auth=%s", token); + MHD_add_response_header(response, "Set-Cookie", data); + free(token); + free(data); + + MHD_destroy_post_processor(as->pp); + free(as); + *ptr = NULL; + + ret = MHD_queue_response(connection, MHD_HTTP_OK, response); + MHD_destroy_response(response); + + return ret; + } else if (strncmp(url, "/logout", 8) == 0) { + struct auth_state *as = (struct auth_state *) *ptr; + + if (as == NULL) { + if (strcmp(method, MHD_HTTP_METHOD_POST) != 0) + return respond_405(connection); + + struct auth_state *as = malloc(sizeof(struct auth_state)); + as->username[0] = as->password[0] = 0; + as->pp = MHD_create_post_processor(connection, 1024, &POST_auth_iterator, as); + *ptr = as; + return MHD_YES; + } + + if (*upload_data_size) { + MHD_post_process(as->pp, upload_data, *upload_data_size); + *upload_data_size = 0; + return MHD_YES; + } + + const char *given_token = MHD_lookup_connection_value(connection, MHD_COOKIE_KIND, "auth"); + if (auth_check_token(as->username, given_token)) { + auth_logout(as->username); + return respond_JSON_Success(connection); + } else { + return respond_JSON_Failure(connection); + } + } else if (strncmp(url, "/subscribe", 11) == 0 || strncmp(url, "/unsubscribe", 13) == 0) { + struct subscribe_state *ss = (struct subscribe_state *) *ptr; + + if (ss == NULL) { + if (strcmp(method, MHD_HTTP_METHOD_POST) != 0) + return respond_405(connection); + + struct subscribe_state *ss = malloc(sizeof(struct subscribe_state)); + ss->username[0] = ss->to[0] = 0; + ss->pp = MHD_create_post_processor(connection, 1024, &POST_subscribe_iterator, ss); + *ptr = ss; + return MHD_YES; + } + + if (*upload_data_size) { + MHD_post_process(ss->pp, upload_data, *upload_data_size); + *upload_data_size = 0; + return MHD_YES; + } + + const char *given_token = MHD_lookup_connection_value(connection, MHD_COOKIE_KIND, "auth"); + if (auth_check_token(ss->username, given_token)) { + if (url[1] == 'u') { + subscription_remove(ss->username, ss->to); + } else { + subscription_add(ss->username, ss->to); + } + return respond_JSON_Success(connection); + } else { + return respond_JSON_Failure(connection); + } + } else if (strncmp(url, "/feed", 6) == 0) { + struct auth_state *as = (struct auth_state *) *ptr; + + if (as == NULL) { + if (strcmp(method, MHD_HTTP_METHOD_POST) != 0) + return respond_405(connection); + + struct auth_state *as = malloc(sizeof(struct auth_state)); + as->username[0] = as->password[0] = 0; + as->pp = MHD_create_post_processor(connection, 1024, &POST_auth_iterator, as); + *ptr = as; + return MHD_YES; + } + + if (*upload_data_size) { + MHD_post_process(as->pp, upload_data, *upload_data_size); + *upload_data_size = 0; + return MHD_YES; + } + + const char *given_token = MHD_lookup_connection_value(connection, MHD_COOKIE_KIND, "auth"); + if (auth_check_token(as->username, given_token)) { + int recs = 50; + struct blergref *feedlist = subscription_list(as->username, 0, &recs, -1); + + if (recs == 0) { + response = MHD_create_response_from_data(2, "[]", MHD_NO, MHD_NO); + } else { + response = create_blergref_response(feedlist, recs); + } + + if (response == NULL) + return respond_JSON_Failure(connection); + + ret = MHD_queue_response(connection, MHD_HTTP_OK, response); + MHD_destroy_response(response); + + return ret; + } else { + return respond_JSON_Failure(connection); + } } else { return respond_404(connection); } @@ -562,7 +645,7 @@ int main(int argc, char *argv[]) { init_responses(); - daemon = MHD_start_daemon(MHD_USE_DEBUG, 8080, NULL, NULL, &ahc_derp, NULL, MHD_OPTION_END); + daemon = MHD_start_daemon(MHD_USE_DEBUG, HTTP_BLERG_PORT, NULL, NULL, &ahc_derp, NULL, MHD_OPTION_END); if (daemon == NULL) { fprintf(stderr, "Could not start web server\n"); return 1;