/*
* $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 "webcit.h"
-#define TRUE 1 /**< for sure? */
-#define FALSE 0 /**< nope. */
-
-typedef unsigned char byte; /**< Byte type */
+typedef unsigned char byte; /* Byte type used by cookie_to_stuff() */
-/**
- * \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,
+ StrBuf *user, StrBuf *pass, StrBuf *room, const char *language)
{
char buf[SIZ];
int i;
+ int len;
+
+ len = snprintf(buf, SIZ, "%d|%s|%s|%s|%s|",
+ session,
+ ChrPtr(user),
+ ChrPtr(pass),
+ ChrPtr(room),
+ language
+ );
- 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]);
+ 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
+/*
+ * Convert unpacked hex string to an integer
*/
-int xtoi(char *in, size_t len)
+int xtoi(const char *in, size_t len)
{
int val = 0;
char c = 0;
- while (isxdigit((byte) *in) && (len-- > 0))
+ while (!IsEmptyStr(in) && isxdigit((byte) *in) && (len-- > 0))
{
c = *in++;
val <<= 4;
- val += isdigit((unsigned char)c)
- ? (c - '0')
- : (tolower((unsigned char)c) - 'a' + 10);
+ 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;
}
-/**
- * \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, '|');
}
-
-/* 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_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);
}
-/*@}*/