X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Ffastcgi.c;h=af92efdeae0cf67a468f2c91ec1166be4f4c09c4;hb=2c380e71b15c2fc7fd5a4d3d5e1bbbfc46ba58f9;hp=a77a3a454109bf6c03abed9a982f533d2e537e9f;hpb=f7e1e1e4b7c22ef34702cff9b01025612809aab8;p=matches%2FMCTX3420.git

diff --git a/server/fastcgi.c b/server/fastcgi.c
index a77a3a4..af92efd 100644
--- a/server/fastcgi.c
+++ b/server/fastcgi.c
@@ -33,9 +33,9 @@
  * @param context The context to work in
  * @param params User specified paramters: [actuators, sensors]
  */ 
-static void IdentifyHandler(FCGIContext *context, char *params) {
+static void IdentifyHandler(FCGIContext *context, char *params)
+{
 	bool ident_sensors = false, ident_actuators = false;
-	bool has_control = FCGI_HasControl(context, getenv("COOKIE_STRING"));
 	int i;
 
 	FCGIValue values[2] = {{"sensors", &ident_sensors, FCGI_BOOL_T},
@@ -46,9 +46,16 @@ static void IdentifyHandler(FCGIContext *context, char *params) {
 	FCGI_BeginJSON(context, STATUS_OK);
 	FCGI_JSONPair("description", "MCTX3420 Server API (2013)");
 	FCGI_JSONPair("build_date", __DATE__ " " __TIME__);
+	struct timespec t;
+	t.tv_sec = 0; t.tv_nsec = 0;
+	clock_getres(CLOCK_MONOTONIC, &t);
+	FCGI_JSONDouble("clock_getres", TIMEVAL_TO_DOUBLE(t));
 	FCGI_JSONLong("api_version", API_VERSION);
+	
+	bool has_control = FCGI_HasControl(context);
 	FCGI_JSONBool("logged_in", has_control);
 	FCGI_JSONPair("user_name", has_control ? context->user_name : "");
+	
 
 	//Sensor and actuator information
 	if (ident_sensors) {
@@ -89,6 +96,7 @@ bool FCGI_LockControl(FCGIContext *context, const char * user_name, UserType use
 	// Get current time
 	time_t now = time(NULL);
 	bool expired = now - context->control_timestamp > CONTROL_TIMEOUT;
+	int i;
 
 	// Can't lock control if: User not actually logged in (sanity), or key is still valid and the user is not an admin
 	if (user_type == USER_UNAUTH || 
@@ -104,7 +112,7 @@ bool FCGI_LockControl(FCGIContext *context, const char * user_name, UserType use
 	// Generate a SHA1 hash for the user
 	SHA_CTX sha1ctx;
 	unsigned char sha1[20];
-	int i = rand();
+	i = rand();
 	SHA1_Init(&sha1ctx);
 	SHA1_Update(&sha1ctx, &now, sizeof(now));
 	SHA1_Update(&sha1ctx, &i, sizeof(i));
@@ -112,25 +120,38 @@ bool FCGI_LockControl(FCGIContext *context, const char * user_name, UserType use
 	for (i = 0; i < sizeof(sha1); i++)
 		sprintf(context->control_key + i * 2, "%02x", sha1[i]);
 
-	// Set the IP address
+	// Set the IPv4 address
 	snprintf(context->control_ip, 16, "%s", getenv("REMOTE_ADDR"));
+
 	// Set the user name
 	int uname_len = strlen(user_name);
-	if (snprintf(context->user_name, sizeof(context->user_name), "%s", user_name) < uname_len)
-	{
-		Log(LOGERR, "Username at %d characters too long (limit %d)", uname_len, sizeof(context->user_name));
+	i = snprintf(context->user_name, sizeof(context->user_name), "%s", user_name);
+	if (i < uname_len) {
+		Log(LOGERR, "Username at %d characters too long (limit %d)", 
+			uname_len, sizeof(context->user_name));
 		return false; // :-(
 	}
 	// Set the user type
 	context->user_type = user_type;
+
+	// Build the user directory
+	i = snprintf(context->user_dir, sizeof(context->user_dir), "%s/%s", 
+					g_options.experiment_dir, context->user_name);
+	if (i >= sizeof(context->user_dir)) {
+		Log(LOGERR, "Experiment dir too long (required %d, limit %d)",
+			i, sizeof(context->user_dir));
+		return false;
+	}
+
+	Log(LOGDEBUG, "User dir: %s", context->user_dir);
 	// Create directory
-	if (mkdir(user_name, 0777) != 0 && errno != EEXIST)
+	if (mkdir(context->user_dir, 0777) != 0 && errno != EEXIST)
 	{
-		Log(LOGERR, "Couldn't create user directory %s/%s - %s", g_options.root_dir, user_name, strerror(errno));
+		Log(LOGERR, "Couldn't create user directory %s - %s", 
+			context->user_dir, strerror(errno));
 		return false; // :-(
 	}
 
-
 	return true; // :-)
 }
 
@@ -142,11 +163,12 @@ bool FCGI_LockControl(FCGIContext *context, const char * user_name, UserType use
  * @param key The control key to be validated.
  * @return TRUE if authorized, FALSE if not.
  */
-bool FCGI_HasControl(FCGIContext *context, const char *key) {
+bool FCGI_HasControl(FCGIContext *context)
+{
 	time_t now = time(NULL);
 	int result = (now - context->control_timestamp) <= CONTROL_TIMEOUT &&
-			key != NULL && context->control_key[0] != '\0' &&
-			!strcmp(context->control_key, key);
+			context->control_key[0] != '\0' &&
+			!strcmp(context->control_key, context->received_key);
 	if (result) {
 		context->control_timestamp = now; //Update the control_timestamp
 	}
@@ -158,12 +180,50 @@ bool FCGI_HasControl(FCGIContext *context, const char *key) {
  * Revokes the current control key, if present.
  * @param context The context to work in
  */
-void FCGI_ReleaseControl(FCGIContext *context) {
+void FCGI_ReleaseControl(FCGIContext *context)
+{
 	*(context->control_key) = 0;
 	// Note: context->user_name should *not* be cleared
 	return;
 }
 
+/**
+ * Gets the control cookie
+ * @param buffer A storage buffer of exactly CONTROL_KEY_BUFSIZ length to
+                 store the control key
+ */
+void FCGI_GetControlCookie(char buffer[CONTROL_KEY_BUFSIZ])
+{
+	const char *cookies = getenv("COOKIE_STRING");
+	const char *start = strstr(cookies, "mctxkey=");
+
+	*buffer = 0; //Clear the buffer
+	if (start != NULL) {
+		int i;
+		start += 8; //length of mctxkey=
+		for (i = 0; i < CONTROL_KEY_BUFSIZ; i++) {
+			if (*start == 0 || *start == ';') {
+				break;
+			}
+			buffer[i] = *start++;
+		}
+		buffer[i] = 0;
+	}
+}
+
+/**
+ * Sends the control key to the user as a cookie.
+ * @param context the context to work in
+ * @param set Whether to set or unset the control cookie
+ */
+void FCGI_SendControlCookie(FCGIContext *context, bool set) {
+	if (set) {
+		printf("Set-Cookie: mctxkey=%s\r\n", context->control_key);
+	} else {
+		printf("Set-Cookie: mctxkey=\r\n");
+	}
+}
+
 /**
  * Extracts a key/value pair from a request string.
  * Note that the input is modified by this function.
@@ -310,8 +370,8 @@ void FCGI_BeginJSON(FCGIContext *context, StatusCodes status_code)
 	printf("\t\"module\" : \"%s\"", context->current_module);
 	FCGI_JSONLong("status", status_code);
 	//Time and running statistics
-	struct timeval now;
-	gettimeofday(&now, NULL);
+	struct timespec now;
+	clock_gettime(CLOCK_MONOTONIC, &now);
 	FCGI_JSONDouble("start_time", TIMEVAL_TO_DOUBLE(g_options.start_time));
 	FCGI_JSONDouble("current_time", TIMEVAL_TO_DOUBLE(now));
 	FCGI_JSONDouble("running_time", TIMEVAL_DIFF(now, g_options.start_time));
@@ -324,12 +384,9 @@ void FCGI_BeginJSON(FCGIContext *context, StatusCodes status_code)
  * @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)
+void FCGI_AcceptJSON(FCGIContext *context, const char *description)
 {
 	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);
@@ -365,7 +422,7 @@ void FCGI_JSONLong(const char *key, long value)
  */
 void FCGI_JSONDouble(const char *key, double value)
 {
-	printf(",\r\n\t\"%s\" : %f", key, value);
+	printf(",\r\n\t\"%s\" : %.9f", key, value);
 }
 
 /**
@@ -492,15 +549,14 @@ void * FCGI_RequestLoop (void *data)
 		
 		ModuleHandler module_handler = NULL;
 		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"));
 
+		FCGI_GetControlCookie(context.received_key);
 		Log(LOGDEBUG, "Got request #%d - Module %s, params %s", context.response_number, module, params);
-		Log(LOGDEBUG, "Cookie: %s", cookie);
+		Log(LOGDEBUG, "Control key: %s", context.received_key);
 
 		
 		//Remove trailing slashes (if present) from module query
@@ -535,10 +591,10 @@ void * FCGI_RequestLoop (void *data)
 		
 		if (module_handler) 
 		{
-			if (module_handler != Login_Handler && module_handler != IdentifyHandler && module_handler)
+			if (g_options.auth_method != AUTH_NONE && module_handler != Login_Handler && module_handler != IdentifyHandler && module_handler)
 			//if (false) // Testing
 			{
-				if (!FCGI_HasControl(&context, cookie))
+				if (!FCGI_HasControl(&context))
 				{
 					FCGI_RejectJSON(&context, "Please login. Invalid control key.");
 					continue;