X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=http%2Fhttp_blerg.c;h=e2057491ff5a899a0a801ceba0d5b95f19916466;hb=ec8746b44dc85fd3e3b42835f779890684a9e90a;hp=e994574b8d8f7b4ae6fdfd04f124aae696489541;hpb=e2f51ade69169968d9d54d3b601527a51c66f6ba;p=blerg.git

diff --git a/http/http_blerg.c b/http/http_blerg.c
index e994574..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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -5,6 +8,7 @@
 #include <yajl/yajl_gen.h>
 #include "database.h"
 #include "tags.h"
+#include "subscription.h"
 #include "auth.h"
 #include "canned_responses.h"
 #include "app.h"
@@ -20,10 +24,17 @@ struct auth_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;
@@ -33,10 +44,10 @@ 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;
 };
@@ -71,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);
@@ -101,66 +112,66 @@ 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);
+	b = blerg_open(bs->results[bs->i].author);
 	if (b != NULL) {
-		json_generate_one_record(ts->g, ts->results[ts->i].author, b, ts->results[ts->i].record);
+		json_generate_one_record(bs->g, bs->results[bs->i].author, b, bs->results[bs->i].record, 0);
 		blerg_close(b);
 	}
 
-	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_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) {
@@ -196,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;
@@ -225,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
@@ -256,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);
@@ -309,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);
 
 		int recs = 50;
-		struct tag *taglist = tag_list(info.author, 0, &recs, -1);
+		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)
@@ -333,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);
@@ -345,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;
 		}
@@ -370,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;
@@ -404,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);
 
@@ -533,12 +554,84 @@ ahc_derp (void *cls, struct MHD_Connection *connection, const char *url, const c
 		}
 
 		const char *given_token = MHD_lookup_connection_value(connection, MHD_COOKIE_KIND, "auth");
-		if (given_token != NULL && auth_check_token(as->username, given_token)) {
+		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);
 	}
@@ -552,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;