X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Ffastcgi.c;h=41def56924666e7778378595beabb9afff58ebf9;hb=f7835777d9a2e85ab310919a150a200ea55c7222;hp=0252f784e8ad0757d7216a5bf978a7dcbbe59d29;hpb=218c2d77e10b28315864990acbcf55ffe26a76e9;p=matches%2FMCTX3420.git

diff --git a/server/fastcgi.c b/server/fastcgi.c
index 0252f78..41def56 100644
--- a/server/fastcgi.c
+++ b/server/fastcgi.c
@@ -45,6 +45,8 @@ static void IdentifyHandler(FCGIContext *context, char *params) {
 	FCGI_JSONPair("description", "MCTX3420 Server API (2013)");
 	FCGI_JSONPair("build_date", __DATE__ " " __TIME__);
 	FCGI_JSONLong("api_version", API_VERSION);
+	FCGI_JSONBool("logged_in", FCGI_HasControl(context, getenv("COOKIE_STRING")));
+	FCGI_JSONPair("friendly_name", "");
 
 	//Sensor and actuator information
 	if (ident_sensors) {
@@ -287,6 +289,25 @@ void FCGI_BeginJSON(FCGIContext *context, StatusCodes status_code)
 	FCGI_JSONPair("control_state", Control_GetModeName());
 }
 
+/**
+ * Generic accept response in JSON format.
+ * @param context The context to work in
+ * @param description A short description.
+ * @param cookie Optional. If given, the cookie field is set to that value.
+ */
+void FCGI_AcceptJSON(FCGIContext *context, const char *description, const char *cookie)
+{
+	printf("Content-type: application/json; charset=utf-8\r\n");
+	if (cookie) {
+		printf("Set-Cookie: %s\r\n", cookie);
+	}
+	printf("\r\n{\r\n");
+	printf("\t\"module\" : \"%s\"", context->current_module);
+	FCGI_JSONLong("status", STATUS_OK);
+	FCGI_JSONPair("description", description);
+	FCGI_EndJSON();
+}
+
 /**
  * Adds a key/value pair to a JSON response. The response must have already
  * been initiated by FCGI_BeginJSON. Special characters are not escaped.
@@ -441,15 +462,16 @@ void * FCGI_RequestLoop (void *data)
 	while (FCGI_Accept() >= 0) {
 		
 		ModuleHandler module_handler = NULL;
-		char module[BUFSIZ], params[BUFSIZ], hack[BUFSIZ];
+		char module[BUFSIZ], params[BUFSIZ];
+		//Don't need to copy if we're not modifying string contents
+		const char *cookie = getenv("COOKIE_STRING");
 		
 		//strncpy doesn't zero-truncate properly
 		snprintf(module, BUFSIZ, "%s", getenv("DOCUMENT_URI_LOCAL"));
 		snprintf(params, BUFSIZ, "%s", getenv("QUERY_STRING"));
-		snprintf(hack, BUFSIZ, "%s", getenv("QUERY_STRING"));
 
 		Log(LOGDEBUG, "Got request #%d - Module %s, params %s", context.response_number, module, params);
-
+		Log(LOGDEBUG, "Cookie: %s", cookie);
 
 		
 		//Remove trailing slashes (if present) from module query
@@ -485,10 +507,22 @@ void * FCGI_RequestLoop (void *data)
 		context.current_module = module;
 		context.response_number++;
 		
-
-
 		if (module_handler) 
 		{
+			if (module_handler != Login_Handler && module_handler != IdentifyHandler)
+			{
+				if (cookie[0] == '\0')
+				{
+					FCGI_RejectJSON(&context, "Please login.");
+					continue;
+				}
+				if (!FCGI_HasControl(&context, cookie))
+				{
+					FCGI_RejectJSON(&context, "Invalid control key.");
+					continue;	
+				}
+			}
+
 			module_handler(&context, params);
 		} 
 		else