/mainbox/query.c - Diff - Tooltron - Robotics Club

Revision cc7646f9

ID	cc7646f9d14d13acbf68e7ae50ec2e645885c4d7
Parent	5e03b78d
Child	4f824e14

Added by Thomas Mullins almost 11 years ago

Major changes to mainbox code.

-Added local cache for RFID -> tool permissions
-Queries new page /crm/roboauth/%08x, which gives bitmask of all tool
permissions instead of just one
-Added pid file at /var/run/tooltron.pid
-Now must be run as "tooltron run" and also has "tooltron refresh" and
"tooltron clear" which send signals to the pid in the pid file
-Other things I'm forgetting

     #include "query.h"
     #include "cache.h"
     #include "event.h"
     #include "util.h"
     #include "log.h"
-...
     /* Outputs the response to /add_card_event to debug.html */
     //#define DEBUG_EVENT_RESPONSE
     const char *server;
     char *tooltron_password;
     /* Size of buffer written to by write_buffer(). We are only reading integers
      * back from the server, so we don't need much of the response and anything
      * else can be ignored */
     #define WRITE_BUFFER_SIZE 30
     static const char *server;
     static char *tooltron_password;
     static char buffer[WRITE_BUFFER_SIZE];
     static int buffer_idx;
     int query_init(const char *server_name) {
       CURLcode error_code;
-...
         free(tooltron_password);
+    }
     static size_t write_bool(void *buffer, size_t size, size_t nmemb, void *userp) {
       int *resultp = userp;
       char *str = buffer;
     static size_t write_buffer(void *buf_in, size_t size, size_t nmemb, void *userp) {
       size_t to_read;
       if (size*nmemb > 0 && str[0] == '1')
         *resultp = 1;
       else
         *resultp = 0;
       to_read = nmemb;
       return nmemb;
       if (buffer_idx + to_read*size > WRITE_BUFFER_SIZE)
         to_read = (WRITE_BUFFER_SIZE - buffer_idx)/size;
       if (to_read > 0) {
         memcpy(buffer+buffer_idx, buf_in, to_read*size);
         buffer_idx += to_read*size;
+      }
       return to_read;
+    }
     static size_t write_ignore(void *buffer, size_t size, size_t nmemb,
-...
+    }
     /*
      * query_user_permission
      * do_q_user_perm
+     *
      * Makes an HTTP request to the CRM server to see if user_id has access to
      * tool_id. Returns 1 if the server replies with '1' or 0 otherwise.
      * Makes an HTTP request to the CRM server to see what tools user_id has access
      * to. Returns a bitmask, and returns 0 if there was a problem.
      */
     int query_user_permission(int tool_id, unsigned int user_id) {
     unsigned int do_q_user_perm(unsigned int user_id) {
       CURL* handle;
       CURLcode error_code;
       char url[1024];
-...
       if (handle == NULL)
         return 0;
       sprintf(url, "http://%s/crm/roboauth/%08x/%d/", server, user_id, tool_id);
       sprintf(url, "http://%s/crm/roboauth/%08x/", server, user_id);
       error_code = curl_easy_setopt(handle, CURLOPT_URL, url);
       if (error_code) goto error;
       error_code = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, write_bool);
       buffer_idx = 0;
       error_code = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, write_buffer);
       if (error_code) goto error;
       error_code = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &result);
       error_code = curl_easy_setopt(handle, CURLOPT_WRITEDATA, NULL);
       if (error_code) goto error;
       error_code = curl_easy_perform(handle);
-...
       else if (response > 200)
         log_print("WARNING: response %ld from %s", response, url);
       result = atoi(buffer);
       cache_update(user_id, result);
       curl_easy_cleanup(handle);
       return result;
     error:
       log_print("ERROR: curl: %s", curl_easy_strerror(error_code));
       log_print("ERROR:       when authenticating user %08x on tool %d",
           user_id, tool_id);
       log_print("ERROR:       when authenticating user %08x", user_id);
       curl_easy_cleanup(handle);
       return 0;
+    }
     void do_refresh(unsigned int key) {
       do_q_user_perm(key);
+    }
     /*
      * query_refresh_cache
+     *
      * Queries the CRM server to update every user permission entry in the cache.
      */
     void query_refresh_cache() {
       cache_foreach(do_refresh);
+    }
     /*
      * query_user_permission
+     *
      * Checks whether user_id has permission for tool_id. First checks the cache,
      * then if that fails, calls do_q_user_perm to make an HTTP request to the CRM
      * server.
      */
     int query_user_permission(int tool_id, unsigned int user_id) {
       unsigned int result;
       if (cache_lookup(user_id, &result))
         log_print("Serving permissions for %08x from cache", user_id);
       else {
         log_print("Requesting permissions for %08x from server", user_id);
         result = do_q_user_perm(user_id);
+      }
       return (result >> tool_id) & 1;
+    }
     /*
      * query_add_event
+     *
-...
       struct tm *timeinfo;
       long response = 0;
       return 0;
     #ifdef DEBUG_EVENT_RESPONSE
       FILE *fdebug;
       fdebug = fopen("debug.html", "w");

Also available in: Unified diff

Project

General

Profile

Tooltron

Revision cc7646f9