X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcookie_conversion.c;h=dcdc6da1c0af0e1adea0ca51a117864b686d945b;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=24e29ce740872f44a6bda5601b6ddba7862b2bf2;hpb=26a4a07bdacdaa7013bf45cc235df207708acfde;p=citadel.git

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index 24e29ce74..dcdc6da1c 100644
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -1,98 +1,87 @@
 /*
- * $Id$
- */
-/**
- * \defgroup CookieConversion Grep Cookies
- * Utility functions which convert the HTTP cookie format we use to and
- * from user/password/room strings.
+ * 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.
  *
- * \ingroup WebcitHttpServer 
+ * 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"
 
+#include "webcit.h"
 
-#define TRUE  1    /**< for sure? */
-#define FALSE 0    /**< nope. */
-
-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);
 
-/**
- * \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(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);
 	}
-}
-
-/**
- * \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(char *in, size_t len)
-{
-	int val = 0;
-	char c = 0;
-	while (isxdigit((byte) *in) && (len-- > 0))
+	else
 	{
-		c = *in++;
-		val <<= 4;
-		val += isdigit((unsigned char)c)
-	    	? (c - '0')
-		: (tolower((unsigned char)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);
+		}
 	}
-	return val;
 }
 
-/**
- * \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
+/*
+ * 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);
 }
-/*@}*/