X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;ds=sidebyside;f=cgi%2Fcgi_blerg.c;h=becaa968e977d1e0d0fa1fbe6e0a7cc166be3b8e;hb=8f635fec79961b4aaabaab184e9576c5b97122af;hp=cfe8031e84ac7045cb87d9d365fe26e2ac73a34e;hpb=0df2dcd3ff73b8c887757366fa989d7d3c17b2fe;p=blerg.git

diff --git a/cgi/cgi_blerg.c b/cgi/cgi_blerg.c
index cfe8031..becaa96 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"
@@ -100,6 +101,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 +260,18 @@ 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);
+		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", len);
-		fwrite(ybuf, len, 1, stdout);
+		printf("Content-length: %d\r\n\r\n", content_len);
+		fwrite(ybuf, content_len, 1, stdout);
 
 		yajl_gen_free(g);
 	} else if (strncmp(path, "/create", 8) == 0) {
@@ -289,10 +294,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();
@@ -376,6 +385,10 @@ int main(int argc, char *argv[]) {
 		} else {
 			respond_blergref_list(feedlist, recs);
 		}
+
+		struct blerg *b = blerg_open(username);
+		blerg_set_subscription_mark(b);
+		blerg_close(b);
 	} else if (strncmp(path, "/feedinfo", 9) == 0) {
 		const char *username = cgi_getentrystr("username");
 		if (!check_auth(username))
@@ -388,10 +401,10 @@ int main(int argc, char *argv[]) {
 			uint64_t subscription_mark = blerg_get_subscription_mark(b);
 			blerg_close(b);
 
-			yajl_gen_string(g, "new", 3);
+			yajl_gen_string(g, (unsigned char *)"new", 3);
 			yajl_gen_integer(g, subscription_count_items(username) - subscription_mark);
 		} else {
-			yajl_gen_string(g, "subscribed", 10);
+			yajl_gen_string(g, (unsigned char *)"subscribed", 10);
 			ret = parse_url_info(path + 10, &info);
 			if ((ret & URL_INFO_NAME) == 1) {
 				yajl_gen_bool(g, is_subscribed(username, info.name));
@@ -402,13 +415,31 @@ int main(int argc, char *argv[]) {
 		yajl_gen_map_close(g);
 
 		const unsigned char *ybuf;
-		yajl_gen_get_buf(g, &ybuf, &len);
+		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", len);
-		fwrite(ybuf, len, 1, stdout);
+		printf("Content-length: %d\r\n\r\n", content_len);
+		fwrite(ybuf, content_len, 1, stdout);
 
 		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);