final touches on dkim test harness

[citadel.git] / webcit / cookie_conversion.c

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index 27c4830d214cc2d5b24ac70d3920abd32db3f003..dcdc6da1c0af0e1adea0ca51a117864b686d945b 100644 (file)
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -1,90 +1,87 @@
 /*
- * $Id$
+ * Copyright (c) 1996-2012 by the citadel.org team
  *
- * Utility functions which convert the HTTP cookie format we use to and
- * from user/password/room strings.
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
-#define TRUE  1
-#define FALSE 0
-
-typedef unsigned char byte;          /* Byte type */
+/*
+ * String to unset the cookie.
+ * Any date "in the past" will work, so I chose my birthday, right down to
+ * the exact minute.  :)
+ */
+static char *unset = "; expires=28-May-1971 18:10:00 GMT";
+typedef unsigned char byte;          /* Byte type used by cookie_to_stuff() */
+extern const char *get_selected_language(void);
 
 /*
  * Pack all session info into one easy-to-digest cookie. Healthy and delicious!
  */
-void stuff_to_cookie(char *cookie, int session,
-               char *user, char *pass, char *room)
+void stuff_to_cookie(int unset_cookies)
 {
+       wcsession *WCC = WC;
        char buf[SIZ];
-       int i;
 
-       sprintf(buf, "%d|%s|%s|%s|", session, user, pass, room);
-       strcpy(cookie, "");
-       for (i=0; i<strlen(buf); ++i) {
-               sprintf(&cookie[i*2], "%02X", buf[i]);
+       if (unset_cookies) {
+               hprintf("Set-cookie: webcit=%s; path=/\r\n", unset);
        }
-}
+       else
+       {
+               StrBufAppendPrintf(WCC->HBuf, "Set-cookie: webcit=");
+               snprintf(buf, sizeof(buf), "%d", WCC->wc_session);
+               StrBufHexescAppend(WCC->HBuf, NULL, buf);
+               StrBufHexescAppend(WCC->HBuf, NULL, "|");
+               StrBufHexescAppend(WCC->HBuf, WCC->wc_username, NULL);
+               StrBufHexescAppend(WCC->HBuf, NULL, "|");
+               StrBufHexescAppend(WCC->HBuf, WCC->wc_password, NULL);
+               StrBufHexescAppend(WCC->HBuf, NULL, "|");
+               StrBufHexescAppend(WCC->HBuf, WCC->CurRoom.name, NULL);
+               StrBufHexescAppend(WCC->HBuf, NULL, "|");
+               StrBufHexescAppend(WCC->HBuf, NULL, get_selected_language());
+               StrBufHexescAppend(WCC->HBuf, NULL, "|");
 
-int xtoi(char *in, size_t len)
-{
-    int val = 0;
-    while (isxdigit((byte) *in) && (len-- > 0)) {
-       char c = *in++;
-       val <<= 4;
-       val += isdigit((unsigned char)c)
-           ? (c - '0')
-           : (tolower((unsigned char)c) - 'a' + 10);
-    }
-    return val;
+               if (server_cookie != NULL) {
+                       StrBufAppendPrintf(WCC->HBuf, 
+                                          ";path=/ \r\n%s\r\n", 
+                                          server_cookie);
+               }
+               else {
+                       StrBufAppendBufPlain(WCC->HBuf,
+                                            HKEY("; path=/\r\n"), 0);
+               }
+       }
 }
 
 /*
  * Extract all that fun stuff out of the cookie.
  */
-void cookie_to_stuff(char *cookie, int *session,
-               char *user, size_t user_len,
-               char *pass, size_t pass_len,
-               char *room, size_t room_len)
+void cookie_to_stuff(StrBuf *cookie,
+                       int *session,
+                       StrBuf *user,
+                       StrBuf *pass,
+                       StrBuf *room,
+                       StrBuf *language)
 {
-       char buf[SIZ];
-       int i, len;
-
-       strcpy(buf, "");
-       len = strlen(cookie) * 2 ;
-       for (i=0; i<len; ++i) {
-               buf[i] = xtoi(&cookie[i*2], 2);
-               buf[i+1] = 0;
+       if (session != NULL) {
+               *session = StrBufExtract_int(cookie, 0, '|');
+       }
+       if (user != NULL) {
+               StrBufExtract_token(user, cookie, 1, '|');
+       }
+       if (pass != NULL) {
+               StrBufExtract_token(pass, cookie, 2, '|');
+       }
+       if (room != NULL) {
+               StrBufExtract_token(room, cookie, 3, '|');
+       }
+       if (language != NULL) {
+               StrBufExtract_token(language, cookie, 4, '|');
        }
-
-       if (session != NULL)
-               *session = extract_int(buf, 0);
-       if (user != NULL)
-               extract_token(user, buf, 1, '|', user_len);
-       if (pass != NULL)
-               extract_token(pass, buf, 2, '|', pass_len);
-       if (room != NULL)
-               extract_token(room, buf, 3, '|', room_len);
 }