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 58a5742f93903d759537f37e2a5083271f760035..dcdc6da1c0af0e1adea0ca51a117864b686d945b 100644 (file)
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -1,56 +1,62 @@
 /*
- * $Id$
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * 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 "webcit.h"
 
+/*
+ * 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, size_t clen, int session,
-               StrBuf *user, StrBuf *pass, StrBuf *room, char *language)
+void stuff_to_cookie(int unset_cookies)
 {
+       wcsession *WCC = WC;
        char buf[SIZ];
-       int i;
-       int len;
-
-       len = snprintf(buf, SIZ, "%d|%s|%s|%s|%s|", 
-               session, 
-               ChrPtr(user), 
-               ChrPtr(pass), 
-               ChrPtr(room),
-               language
-       );
 
-       strcpy(cookie, "");
-       for (i=0; (i < len) && (i * 2 < clen); ++i) {
-               snprintf(&cookie[i*2], clen - i * 2, "%02X", buf[i]);
+       if (unset_cookies) {
+               hprintf("Set-cookie: webcit=%s; path=/\r\n", unset);
        }
-}
-
-/*
- * Convert unpacked hex string to an integer
- */
-int xtoi(const char *in, size_t len)
-{
-       int val = 0;
-       char c = 0;
-       while (!IsEmptyStr(in) && isxdigit((byte) *in) && (len-- > 0))
+       else
        {
-               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 ;
+               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, "|");
+
+               if (server_cookie != NULL) {
+                       StrBufAppendPrintf(WCC->HBuf, 
+                                          ";path=/ \r\n%s\r\n", 
+                                          server_cookie);
+               }
+               else {
+                       StrBufAppendBufPlain(WCC->HBuf,
+                                            HKEY("; path=/\r\n"), 0);
                }
-               else
-                       val += c - '0';
        }
-       return val;
 }
 
 /*