X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Ffastcgi.h;h=09884d1a729aca863937c3be224eac3ece208a20;hb=HEAD;hp=1efdef780a897655f1d7ff842ed8b56ae649c61e;hpb=faee7575b94067ae80c8e2cba98e9bfe9ec2c5ae;p=matches%2FMCTX3420.git

diff --git a/server/fastcgi.h b/server/fastcgi.h
index 1efdef7..09884d1 100644
--- a/server/fastcgi.h
+++ b/server/fastcgi.h
@@ -1,33 +1,121 @@
 /**
  * @file fastcgi.h
- * @purpose Headers for the fastcgi web interface
+ * @brief Headers for the fastcgi web interface
  */
  
 #ifndef _FASTCGI_H
 #define _FASTCGI_H
  
-/**Status codes that fcgi module handlers can return**/
+/**
+ * Status codes that fcgi module handlers can return
+ * Success status codes have values > 0
+ * Failure status codes have values <(=) 0 
+ * Note: 0 is counted as an error code to minimise confusion
+ * with in-browser JSON parsing error codes
+ */
 typedef enum StatusCodes {
-	STATUS_OK = 0,
+	STATUS_OK = 1,
 	STATUS_ERROR = -1,
-	STATUS_UNAUTHORIZED = -2
+	STATUS_UNAUTHORIZED = -2,
+	STATUS_NOTRUNNING = -3,
+	STATUS_ALREADYEXISTS = -4
 } StatusCodes;
 
-typedef struct FCGIContext FCGIContext;
-typedef void (*ModuleHandler) (FCGIContext *data, char *params);
+#define FCGI_PARAM_REQUIRED (1 << 0)
+#define FCGI_PARAM_RECEIVED (1 << 1)
+#define FCGI_BOOL_T (1 << 2)
+#define FCGI_INT_T	(1 << 3)
+#define FCGI_LONG_T (1 << 4)
+#define FCGI_DOUBLE_T (1 << 5)
+#define FCGI_STRING_T (1 << 6)
+#define FCGI_REQUIRED(x) ((x) | FCGI_PARAM_REQUIRED)
+#define FCGI_IS_REQUIRED(x) ((x) & FCGI_PARAM_REQUIRED)
+#define FCGI_RECEIVED(x) ((x) & FCGI_PARAM_RECEIVED)
+#define FCGI_TYPE(x) ((x) & ~(FCGI_PARAM_REQUIRED | FCGI_PARAM_RECEIVED))
+
+#define CONTROL_KEY_BUFSIZ 41
+
+/**
+ * An entry that describes an expected user parameter for parsing.
+ * To be used in conjunction with @see FCGI_ParseRequest.
+ */
+typedef struct FCGIValue {
+	/** The name of the key (from key/value pair) [in] **/
+	const char *key;
+	/** A pointer to a variable that will hold the parsed value [out] **/
+	void *value;
+	/** Bit flags that determine things like if the field is required and if it was received [in/out] **/
+	unsigned flags;
+} FCGIValue;
+
+/** The type of a user (unauthorised, normal, admin). **/
+typedef enum {USER_UNAUTH, USER_NORMAL, USER_ADMIN} UserType;
+
+/**Contextual information related to FCGI requests*/
+typedef struct  
+{
+	/**The time of last valid user access possessing the control key**/
+	time_t control_timestamp;
+	/**A SHA-1 hash that is the control key, determining who is logged in**/
+	char control_key[CONTROL_KEY_BUFSIZ]; 
+	/**The received control key for the current request**/
+	char received_key[CONTROL_KEY_BUFSIZ];
+	/**The IPv4 address of the logged-in user**/
+	char control_ip[16];
+	/**Determines if the user is an admin or not**/
+	UserType user_type;
+	/**Name of the logged in user**/
+	char user_name[31];
+	/**User directory for the logged in user**/
+	char user_dir[BUFSIZ];
+	/**The name of the current module**/
+	const char *current_module;
+	/**For debugging purposes?**/
+	int response_number;
+} FCGIContext;
 
-extern bool FCGI_Authorized(FCGIContext *context, const char *key);
+/** The type definition of a module handler. **/
+typedef void (*ModuleHandler) (FCGIContext *context, char *params);
+
+extern bool FCGI_LockControl(FCGIContext *context, const char * user_name, UserType user_type);
+extern void FCGI_ReleaseControl(FCGIContext *context);
+extern bool FCGI_HasControl(FCGIContext *context);
+extern void FCGI_GetControlCookie(char buffer[CONTROL_KEY_BUFSIZ]);
+extern void FCGI_SendControlCookie(FCGIContext *context, bool set);
 extern char *FCGI_KeyPair(char *in, const char **key, const char **value);
+extern bool FCGI_ParseRequest(FCGIContext *context, char *params, FCGIValue values[], size_t count);
 extern void FCGI_BeginJSON(FCGIContext *context, StatusCodes status_code);
+extern void FCGI_AcceptJSON(FCGIContext *context, const char *description);
 extern void FCGI_JSONPair(const char *key, const char *value);
 extern void FCGI_JSONLong(const char *key, long value);
 extern void FCGI_JSONDouble(const char *key, double value);
 extern void FCGI_JSONBool(const char *key, bool value);
 extern void FCGI_JSONKey(const char *key);
-extern void FCGI_JSONValue(const char *format, ...);
+extern void FCGI_PrintRaw(const char *format, ...);
 extern void FCGI_EndJSON();
-extern void FCGI_RejectJSON(FCGIContext *context);
-extern void * FCGI_RequestLoop (void *data);
+extern void FCGI_RejectJSONEx(FCGIContext *context, StatusCodes status, const char *description);
+extern char *FCGI_URLDecode(char *buf);
+extern char *FCGI_EscapeText(char *buf);
+extern void *FCGI_RequestLoop (void *data);
+
+extern void FCGI_WriteBinary(void * data, size_t size, size_t num_elem);
+
+/**
+ * Shortcut to calling FCGI_RejectJSONEx. Sets the error code
+ * to STATUS_ERROR.
+ * @param context The context to work in
+ * @param description A short description of why the request was rejected.
+ * @see FCGI_RejectJSONEx
+ */
+#define FCGI_RejectJSON(context, description) FCGI_RejectJSONEx(context, STATUS_ERROR, description)
+
+/**
+ * Custom formatting function for the JSON value. To be used in 
+ * conjunction with FCGI_JSONKey. Care should be taken to ensure
+ * that valid JSON is produced.
+ * @see FCGI_PrintRaw for calling syntax
+ */
+#define FCGI_JSONValue FCGI_PrintRaw
 
 #endif