X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=cgi%2Fcgi_blerg.c;h=8bd5189acbbc4fc760b739259d28b7b2cdad231f;hb=5e89558c1afec270c54f4827380817e3ef8591f4;hp=1bba24dff716d27d4ed05f5931b4bfa7f167c3ad;hpb=b8df1ce6b0bb9bd51d46b8ad6dce195122126d5a;p=blerg.git

diff --git a/cgi/cgi_blerg.c b/cgi/cgi_blerg.c
index 1bba24d..8bd5189 100644
--- a/cgi/cgi_blerg.c
+++ b/cgi/cgi_blerg.c
@@ -10,6 +10,7 @@
 #include "tags.h"
 #include "auth.h"
 #include "subscription.h"
+#include "json.h"
 #include "canned_responses.h"
 #include "app.h"
 #include "config.h"
@@ -30,6 +31,16 @@ int check_auth(const char *username) {
 	return 1;
 }
 
+void respond_yajl(yajl_gen g) {
+	const unsigned char *ybuf;
+	unsigned int content_len;
+
+	yajl_gen_get_buf(g, &ybuf, &content_len);
+
+	printf("Content-type: application/json\r\n");
+	printf("Content-length: %d\r\n\r\n", content_len);
+	fwrite(ybuf, content_len, 1, stdout);
+}
 
 void respond_for_range(struct blerg *b, uint64_t from, uint64_t to) {
 	const unsigned char *ybuf;
@@ -100,6 +111,9 @@ int main(int argc, char *argv[]) {
 	struct url_info info;
 	char *data;
 
+	if (!blerg_init())
+		exit(1);
+
 	if (cgi_init() != CGIERR_NONE)
 		exit(0);
 
@@ -256,17 +270,12 @@ int main(int argc, char *argv[]) {
 		char number[21];
 		yajl_gen g = yajl_gen_alloc(&yajl_c, NULL);
 		yajl_gen_map_open(g);
-		yajl_gen_string(g, "record_count", 12);
+		yajl_gen_string(g, (unsigned char *)"record_count", 12);
 		snprintf(number, 21, "%llu", record_count);
-		yajl_gen_string(g, number, strlen(number));
+		yajl_gen_string(g, (unsigned char *)number, strlen(number));
 		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);
+		respond_yajl(g);
 
 		yajl_gen_free(g);
 	} else if (strncmp(path, "/create", 8) == 0) {
@@ -289,10 +298,14 @@ int main(int argc, char *argv[]) {
 		}
 
 		struct blerg *b = blerg_open(username);
-		blerg_close(b);
-		auth_set_password(username, password);
-		
-		respond_JSON_Success();
+		if (b != NULL) {
+			blerg_close(b);
+			auth_set_password(username, password);
+			
+			respond_JSON_Success();
+		} else {
+			respond_JSON_Failure();
+		}
 	} else if (strncmp(path, "/login", 7) == 0) {
 		if (strcmp(request_method, "POST") != 0) {
 			respond_405();
@@ -307,12 +320,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);
 
@@ -327,10 +340,10 @@ int main(int argc, char *argv[]) {
 		if (!check_auth(username))
 			exit(0);
 
-		auth_logout(username);
+		const char *given_token = cgi_getcookie("auth");
+		auth_logout(username, given_token);
 		respond_JSON_Success();
-	} else if (strncmp(path, "/subscribe", 11) == 0 || strncmp(path, "/unsubscribe", 13) == 0) {
-
+	} else if (strncmp(path, "/subscribe", 10) == 0 || strncmp(path, "/unsubscribe", 12) == 0) {
 		const char *username = cgi_getentrystr("username");
 		if (!check_auth(username))
 			exit(0);
@@ -376,36 +389,83 @@ int main(int argc, char *argv[]) {
 		} else {
 			respond_blergref_list(feedlist, recs);
 		}
-	} else if (strncmp(path, "/feedinfo", 9) == 0) {
+	} else if (strncmp(path, "/status", 7) == 0) {
 		const char *username = cgi_getentrystr("username");
 		if (!check_auth(username))
 			exit(0);
 
-		if (path[9] != '/') {
-			respond_404();
+		if (strncmp(request_method, "POST", 4) != 0) {
+			respond_405();
 			exit(0);
 		}
 
-		ret = parse_url_info(path + 10, &info);
-		if ((ret & URL_INFO_NAME) == 0) {
-			respond_404();
-			exit(0);
-		}
+		yajl_gen g;
+
+		if (path[7] == 0) {  /* No username */
+			const char *clear = cgi_getentrystr("clear");
+
+			if (strncmp(clear, "feed", 4) == 0) {
+				struct blerg *b = blerg_open(username);
+				blerg_set_subscription_mark(b);
+				blerg_close(b);
+				respond_JSON_Success();
+			} else if (strncmp(clear, "mentioned", 9) == 0) {
+				struct blerg *b = blerg_open(username);
+				blerg_set_status(b, BLERGSTATUS_MENTIONED, 0);
+				blerg_close(b);
+				respond_JSON_Success();
+			} else {
+				g = yajl_gen_alloc(&yajl_c, NULL);
+				yajl_gen_map_open(g);
 
-		yajl_gen g = yajl_gen_alloc(&yajl_c, NULL);
-		yajl_gen_map_open(g);
-		yajl_gen_string(g, "subscribed", 10);
-		yajl_gen_bool(g, is_subscribed(username, info.name));
-		yajl_gen_map_close(g);
+				struct blerg *b = blerg_open(username);
+				uint64_t subscription_mark = blerg_get_subscription_mark(b);
+				int mentioned = blerg_get_status(b, BLERGSTATUS_MENTIONED);
+				blerg_close(b);
 
-		const unsigned char *ybuf;
-		yajl_gen_get_buf(g, &ybuf, &len);
+				yajl_gen_string(g, (unsigned char *)"feed_new", 7);
+				yajl_gen_integer(g, subscription_count_items(username) - subscription_mark);
 
-		printf("Content-type: application/json\r\n");
-		printf("Content-length: %d\r\n\r\n", len);
-		fwrite(ybuf, len, 1, stdout);
+				yajl_gen_string(g, (unsigned char *)"mentioned", 9);
+				yajl_gen_bool(g, mentioned);
 
-		yajl_gen_free(g);
+				yajl_gen_map_close(g);
+				respond_yajl(g);
+				yajl_gen_free(g);
+			}
+		} else {  /* with username */
+			g = yajl_gen_alloc(&yajl_c, NULL);
+			yajl_gen_map_open(g);
+
+			yajl_gen_string(g, (unsigned char *)"subscribed", 10);
+			ret = parse_url_info(path + 8, &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);
+			respond_yajl(g);
+			yajl_gen_free(g);
+		}
+	} else if (strncmp(path, "/passwd", 7) == 0) {
+		const char *username = cgi_getentrystr("username");
+		if (!check_auth(username))
+			exit(0);
+
+		const char *password = cgi_getentrystr("password");
+		const char *new_password = cgi_getentrystr("new_password");
+		if (password == NULL || new_password == NULL) {
+			respond_JSON_Failure();
+		} else {
+			if (auth_check_password(username, password)) {
+				auth_set_password(username, new_password);
+				respond_JSON_Success();
+			} else {
+				respond_JSON_Failure();
+			}
+		}
 	} else {
 		respond_404();
 		exit(0);