X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Ffastcgi.c;h=d88dc20448883289305dfe70d2036f36a6ea3ce9;hb=5a9a05166c4b22e7b7a522063d3dd6f75d1fa589;hp=cdaef79083b0c599231ed26910b896d3ad914601;hpb=6f3aae14ebd9074c87fea90bddb8fb423108683b;p=matches%2FMCTX3420.git

diff --git a/server/fastcgi.c b/server/fastcgi.c
index cdaef79..d88dc20 100644
--- a/server/fastcgi.c
+++ b/server/fastcgi.c
@@ -9,6 +9,8 @@
 #include <fcgi_stdio.h>
 #include <openssl/sha.h>
 #include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "common.h"
 #include "sensor.h"
@@ -44,9 +46,14 @@ 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);
 	FCGI_JSONBool("logged_in", has_control);
-	FCGI_JSONPair("friendly_name", has_control ? context->friendly_name : "");
+	FCGI_JSONPair("user_name", has_control ? context->user_name : "");
+	
 
 	//Sensor and actuator information
 	if (ident_sensors) {
@@ -75,36 +82,61 @@ static void IdentifyHandler(FCGIContext *context, char *params) {
 }
 
 /**
- * Gives the user a key that determines who has control over
- * the system at any one time. The key can be forcibly generated, revoking
- * any previous control keys. To be used in conjunction with HTTP 
- * basic authentication.
+ * Given an authorised user, attempt to set the control over the system.
+ * Modifies members in the context structure appropriately if successful.
  * @param context The context to work in
- * @param force Whether to force key generation or not.
- * @return true on success, false otherwise (eg someone else already in control)
+ * @param user_name - Name of the user
+ * @param user_type - Type of the user, passed after successful authentication
+ * @return true on success, false otherwise (eg someone else  already in control)
  */
-bool FCGI_LockControl(FCGIContext *context, bool force) {
+bool FCGI_LockControl(FCGIContext *context, const char * user_name, UserType user_type) 
+{
+	// Get current time
 	time_t now = time(NULL);
 	bool expired = now - context->control_timestamp > CONTROL_TIMEOUT;
 
-	if (force || !*(context->control_key) || expired) 
+	// 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 || 
+		(user_type != USER_ADMIN && !expired && *(context->control_key) != '\0'))
+		return false;
+
+	// Release any existing control (if any)
+	FCGI_ReleaseControl(context);
+
+	// Set timestamp
+	context->control_timestamp = now;
+
+	// Generate a SHA1 hash for the user
+	SHA_CTX sha1ctx;
+	unsigned char sha1[20];
+	int i = rand();
+	SHA1_Init(&sha1ctx);
+	SHA1_Update(&sha1ctx, &now, sizeof(now));
+	SHA1_Update(&sha1ctx, &i, sizeof(i));
+	SHA1_Final(sha1, &sha1ctx);
+	for (i = 0; i < sizeof(sha1); i++)
+		sprintf(context->control_key + i * 2, "%02x", sha1[i]);
+
+	// Set the IP 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));
+		return false; // :-(
+	}
+	// Set the user type
+	context->user_type = user_type;
+	// Create directory
+	if (mkdir(user_name, 0777) != 0 && errno != EEXIST)
 	{
-		SHA_CTX sha1ctx;
-		unsigned char sha1[20];
-		int i = rand();
-
-		SHA1_Init(&sha1ctx);
-		SHA1_Update(&sha1ctx, &now, sizeof(now));
-		SHA1_Update(&sha1ctx, &i, sizeof(i));
-		SHA1_Final(sha1, &sha1ctx);
-
-		context->control_timestamp = now;
-		for (i = 0; i < 20; i++)
-			sprintf(context->control_key + i * 2, "%02x", sha1[i]);
-		snprintf(context->control_ip, 16, "%s", getenv("REMOTE_ADDR"));
-		return true;
+		Log(LOGERR, "Couldn't create user directory %s/%s - %s", g_options.root_dir, user_name, strerror(errno));
+		return false; // :-(
 	}
-	return false;
+
+
+	return true; // :-)
 }
 
 /**
@@ -133,6 +165,7 @@ bool FCGI_HasControl(FCGIContext *context, const char *key) {
  */
 void FCGI_ReleaseControl(FCGIContext *context) {
 	*(context->control_key) = 0;
+	// Note: context->user_name should *not* be cleared
 	return;
 }
 
@@ -282,8 +315,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));
@@ -507,7 +540,7 @@ void * FCGI_RequestLoop (void *data)
 		
 		if (module_handler) 
 		{
-			//if (module_handler != Login_Handler && module_handler != IdentifyHandler)
+			//if (module_handler != Login_Handler && module_handler != IdentifyHandler && module_handler)
 			if (false) // Testing
 			{
 				if (!FCGI_HasControl(&context, cookie))