X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=cgi%2Fcgi_blerg.c;h=cfe8031e84ac7045cb87d9d365fe26e2ac73a34e;hb=0df2dcd3ff73b8c887757366fa989d7d3c17b2fe;hp=83dd53d1b58506091d1d74416b00b6de7a8ad2c6;hpb=e1a81b2e181e32aaa3df2a6da957c788ad77a229;p=blerg.git

diff --git a/cgi/cgi_blerg.c b/cgi/cgi_blerg.c
index 83dd53d..cfe8031 100644
--- a/cgi/cgi_blerg.c
+++ b/cgi/cgi_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 <string.h>
 #include <stdlib.h>
@@ -6,12 +9,28 @@
 #include "database.h"
 #include "tags.h"
 #include "auth.h"
+#include "subscription.h"
 #include "canned_responses.h"
 #include "app.h"
 #include "config.h"
 
 yajl_gen_config yajl_c = { 0, 0 };
 
+int check_auth(const char *username) {
+	if (username == NULL || username[0] == 0) {
+		respond_403();
+		return 0;
+	}
+
+	const char *given_token = cgi_getcookie("auth");
+	if (!auth_check_token(username, given_token)) {
+		respond_403();
+		return 0;
+	}
+	return 1;
+}
+
+
 void respond_for_range(struct blerg *b, uint64_t from, uint64_t to) {
 	const unsigned char *ybuf;
 	unsigned int len;
@@ -30,7 +49,7 @@ void respond_for_range(struct blerg *b, uint64_t from, uint64_t to) {
 	yajl_gen_array_open(g);
 
 	for (i = to; i != from - 1; i--) {
-		json_generate_one_record(g, NULL, b, i);
+		json_generate_one_record(g, NULL, b, i, 0);
 		yajl_gen_get_buf(g, &ybuf, &len);
 		fwrite(ybuf, len, 1, stdout);
 		yajl_gen_clear(g);
@@ -42,7 +61,7 @@ void respond_for_range(struct blerg *b, uint64_t from, uint64_t to) {
 	yajl_gen_free(g);
 }
 
-void respond_taglist(struct tag *results, int i) {
+void respond_blergref_list(struct blergref * results, int i) {
 	const unsigned char *ybuf;
 	unsigned int len;
 	struct blerg *b;
@@ -58,7 +77,7 @@ void respond_taglist(struct tag *results, int i) {
 	while (i >= 0) {
 		b = blerg_open(results[i].author);
 		if (b != NULL) {
-			json_generate_one_record(g, results[i].author, b, results[i].record);
+			json_generate_one_record(g, results[i].author, b, results[i].record, 0);
 			blerg_close(b);
 		}
 		yajl_gen_get_buf(g, &ybuf, &len);
@@ -107,17 +126,17 @@ int main(int argc, char *argv[]) {
 		}
 
 		ret = parse_url_info(path + 5, &info);
-		if ((ret & URL_INFO_AUTHOR) == 0) {
+		if ((ret & URL_INFO_NAME) == 0) {
 			respond_404();
 			exit(0);
 		}
 
-		if (!blerg_exists(info.author)) {
+		if (!blerg_exists(info.name)) {
 			respond_404();
 			exit(0);
 		}
 
-		struct blerg *b = blerg_open(info.author);
+		struct blerg *b = blerg_open(info.name);
 
 		if ((ret & URL_INFO_RECORD) && (ret & URL_INFO_RECORD_TO)) {
 			respond_for_range(b, info.record, info.record_to);
@@ -154,25 +173,25 @@ int main(int argc, char *argv[]) {
 		}
 
 		ret = parse_url_info(path + 5, &info);
-		if ((ret & URL_INFO_AUTHOR) == 0) {
+		if ((ret & URL_INFO_NAME) == 0) {
 			respond_404();
 			exit(0);
 		}
 
-		if (info.author[0] == 'H')
-			info.author[0] = '#';
-		if (!tag_exists(info.author)) {
+		if (info.name[0] == 'H')
+			info.name[0] = '#';
+		if (!tag_exists(info.name)) {
 			respond_404();
 			exit(0);
 		}
 
 		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) {
 			respond_simple_data("[]", 2);
 		} else {
-			respond_taglist(taglist, recs);
+			respond_blergref_list(taglist, recs);
 		}
 	} else if (strncmp(path, "/put", 4) == 0) {
 		if (strcmp(request_method, "POST") != 0) {
@@ -180,21 +199,17 @@ int main(int argc, char *argv[]) {
 			exit(0);
 		}
 
+		const char *username = cgi_getentrystr("username");
+		if (!check_auth(username))
+			exit(0);
+
 		if (path[4] == '/') {
 			respond_404();
 			exit(0);
 		}
 
-		const char *username = cgi_getentrystr("username");
 		const char *data = cgi_getentrystr("data");
-		if (username == NULL || username[0] == 0 ||
-		    data == NULL || data[0] == 0) {
-			respond_JSON_Failure();
-			exit(0);
-		}
-
-		const char *given_token = cgi_getcookie("auth");
-		if (!auth_check_token(username, given_token)) {
+		if (data == NULL || data[0] == 0) {
 			respond_JSON_Failure();
 			exit(0);
 		}
@@ -224,17 +239,17 @@ int main(int argc, char *argv[]) {
 		}
 
 		ret = parse_url_info(path + 6, &info);
-		if ((ret & URL_INFO_AUTHOR) == 0) {
+		if ((ret & URL_INFO_NAME) == 0) {
 			respond_404();
 			exit(0);
 		}
 
-		if (!blerg_exists(info.author)) {
+		if (!blerg_exists(info.name)) {
 			respond_404();
 			exit(0);
 		}
 
-		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);
 
@@ -292,12 +307,12 @@ int main(int argc, char *argv[]) {
 			exit(0);
 		}
 
-		if (!auth_login(username, password)) {
+		char *token = auth_login(username, password);
+		if (token == NULL) {
 			respond_JSON_Failure();
 			exit(0);
 		}
 
-		char *token = auth_get_token(username);
 		printf("Set-Cookie: auth=%s\r\n", token);
 		free(token);
 
@@ -309,19 +324,91 @@ int main(int argc, char *argv[]) {
 		}
 
 		const char *username = cgi_getentrystr("username");
-		if (username == NULL || username[0] == 0) {
-			respond_JSON_Failure();
+		if (!check_auth(username))
 			exit(0);
+
+		const char *given_token = cgi_getcookie("auth");
+		auth_logout(username, given_token);
+		respond_JSON_Success();
+	} else if (strncmp(path, "/subscribe", 10) == 0 || strncmp(path, "/unsubscribe", 12) == 0) {
+		const char *username = cgi_getentrystr("username");
+		if (!check_auth(username))
+			exit(0);
+
+		if (path[1] == 'u') {
+			if (path[12] != '/') {
+				respond_404();
+				exit(0);
+			}
+
+			ret = parse_url_info(path + 13, &info);
+			if ((ret & URL_INFO_NAME) == 0) {
+				respond_404();
+				exit(0);
+			}
+
+			subscription_remove(username, info.name);
+		} else {
+			if (path[10] != '/') {
+				respond_404();
+				exit(0);
+			}
+
+			ret = parse_url_info(path + 11, &info);
+			if ((ret & URL_INFO_NAME) == 0) {
+				respond_404();
+				exit(0);
+			}
+
+			subscription_add(username, info.name);
 		}
+		respond_JSON_Success();
+	} else if (strncmp(path, "/feed", 6) == 0) {
+		const char *username = cgi_getentrystr("username");
+		if (!check_auth(username))
+			exit(0);
 
+		int recs = 50;
+		struct blergref *feedlist = subscription_list(username, 0, &recs, -1);
 
-		const char *given_token = cgi_getcookie("auth");
-		if (auth_check_token(username, given_token)) {
-			auth_logout(username);
-			respond_JSON_Success();
+		if (recs == 0) {
+			respond_simple_data("[]", 2);
 		} else {
-			respond_JSON_Failure();
+			respond_blergref_list(feedlist, recs);
+		}
+	} else if (strncmp(path, "/feedinfo", 9) == 0) {
+		const char *username = cgi_getentrystr("username");
+		if (!check_auth(username))
+			exit(0);
+
+		yajl_gen g = yajl_gen_alloc(&yajl_c, NULL);
+		yajl_gen_map_open(g);
+		if (path[9] == 0) {
+			struct blerg *b = blerg_open(username);
+			uint64_t subscription_mark = blerg_get_subscription_mark(b);
+			blerg_close(b);
+
+			yajl_gen_string(g, "new", 3);
+			yajl_gen_integer(g, subscription_count_items(username) - subscription_mark);
+		} else {
+			yajl_gen_string(g, "subscribed", 10);
+			ret = parse_url_info(path + 10, &info);
+			if ((ret & URL_INFO_NAME) == 1) {
+				yajl_gen_bool(g, is_subscribed(username, info.name));
+			} else {
+				yajl_gen_bool(g, 0);
+			}
 		}
+		yajl_gen_map_close(g);
+
+		const unsigned char *ybuf;
+		yajl_gen_get_buf(g, &ybuf, &len);
+
+		printf("Content-type: application/json\r\n");
+		printf("Content-length: %d\r\n\r\n", len);
+		fwrite(ybuf, len, 1, stdout);
+
+		yajl_gen_free(g);
 	} else {
 		respond_404();
 		exit(0);