* do linebuffered/non-blocking reads from http requests

[citadel.git] / webcit / cookie_conversion.c

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index 3bb3554b9b6d93a726c9397e1eec7d9dba9ad484..e891bccc625f537fb0b21c550318bf4df13d5cbb 100644 (file)
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -1,49 +1,121 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <ctype.h>
-#include <string.h>
+/*
+ * $Id$
+ */
+/**
+ * \defgroup CookieConversion Grep Cookies
+ * Utility functions which convert the HTTP cookie format we use to and
+ * from user/password/room strings.
+ *
+ * \ingroup WebcitHttpServer 
+ */
+/*@{*/
 #include "webcit.h"
-#include "child.h"
 
-/*
- * Pack all session info into one easy-to-digest cookie.  Healthy and delicious!
+
+#define TRUE  1    /**< for sure? */
+#define FALSE 0    /**< nope. */
+
+typedef unsigned char byte;          /**< Byte type */
+
+/**
+ * \brief find cookie
+ * Pack all session info into one easy-to-digest cookie. Healthy and delicious!
+ * \param cookie cookie string to create???
+ * \param session the session we want to convert into a cookie
+ * \param user the user to be associated with the cookie
+ * \param pass his passphrase
+ * \param room the room he wants to enter
  */
-void stuff_to_cookie(char *cookie, int session, char *user, char *pass, char *room)
+void stuff_to_cookie(char *cookie, size_t clen, int session,
+               char *user, char *pass, char *room)
 {
-       char buf[256];
+       char buf[SIZ];
        int i;
+       int len;
 
-       sprintf(buf, "%d|%s|%s|%s", session, user, pass, room);
+       len = snprintf(buf, SIZ, "%d|%s|%s|%s|", session, user, pass, room);
        strcpy(cookie, "");
-
-       for (i = 0; i < strlen(buf); ++i)
-               sprintf(&cookie[strlen(cookie)], "%02X", buf[i]);
-
+       for (i=0; (i < len) && (i * 2 < clen); ++i) {
+               snprintf(&cookie[i*2], clen - i * 2, "%02X", buf[i]);
+       }
 }
 
+/**
+ * \brief      Convert unpacked hex string to an integer
+ * \param      in      Input hex string
+ * \param      len     the length of the string
+ * \return     the corrosponding integer value
+ */
+int xtoi(const char *in, size_t len)
+{
+       int val = 0;
+       char c = 0;
+       while (!IsEmptyStr(in) && isxdigit((byte) *in) && (len-- > 0))
+       {
+               c = *in++;
+               val <<= 4;
+               if (!isdigit((unsigned char)c)) {
+                       c = tolower((unsigned char) c);
+                       if ((c < 'a') || (c > 'f'))
+                               return 0;
+                       val += c  - 'a' + 10 ;
+               }
+               else
+                       val += c - '0';
+       }
+       return val;
+}
 
-/*
- * Extract all that fun stuff out of the cookie.
+/**
+ * \brief Extract all that fun stuff out of the cookie.
+ * \param cookie the cookie string
+ * \param session the corrosponding session to return
+ * \param user the user string
+ * \param user_len the user stringlength
+ * \param pass the passphrase
+ * \param pass_len length of the passphrase string 
+ * \param room the room he is in
+ * \param room_len the length of the room string
  */
-void cookie_to_stuff(char *cookie, int *session, char *user, char *pass, char *room)
+void cookie_to_stuff(StrBuf *cookie, int *session,
+               char *user, size_t user_len,
+               char *pass, size_t pass_len,
+               char *room, size_t room_len)
 {
-       char buf[256];
-       int i;
+       const char *pch;
+       char buf[SIZ];
+       int i, len;
 
-       for (i = 0; i < strlen(cookie); i = i + 2) {
-               sscanf(&cookie[i], "%02x", (unsigned int *) &buf[i / 2]);
-               buf[(i / 2) + 1] = 0;
+       if (strncmp(ChrPtr(cookie), HKEY("webcit=")) == 0)
+               StrBufCutLeft(cookie, 7);
+
+       strcpy(buf, "");
+       len = StrLength(cookie) / 2;
+       pch = ChrPtr(cookie);
+       for (i=0; i<len; ++i) {
+               buf[i] = xtoi(&pch[i*2], 2);
+               buf[i+1] = 0;
        }
 
+/* debug
+       char t[256];
+       extract_token(t, buf, 0, '|', sizeof t);
+       lprintf(9, "SESS: %s\n", t);
+       extract_token(t, buf, 1, '|', sizeof t);
+       lprintf(9, "USER: %s\n", t);
+       extract_token(t, buf, 2, '|', sizeof t);
+       lprintf(9, "PASS: %s\n", t);
+       extract_token(t, buf, 3, '|', sizeof t);
+       lprintf(9, "ROOM: %s\n", t);
+ debug */
+
        if (session != NULL)
                *session = extract_int(buf, 0);
        if (user != NULL)
-               extract(user, buf, 1);
+               extract_token(user, buf, 1, '|', user_len);
        if (pass != NULL)
-               extract(pass, buf, 2);
+               extract_token(pass, buf, 2, '|', pass_len);
        if (room != NULL)
-               extract(room, buf, 3);
+               extract_token(room, buf, 3, '|', room_len);
 }
+/*@}*/