X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcookie_conversion.c;h=dcdc6da1c0af0e1adea0ca51a117864b686d945b;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=83ae6ad8dbc25960099ad004daf972c07d231b71;hpb=4802f475fa45ea1145a9f85bee789f637efa2866;p=citadel.git diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c index 83ae6ad8d..dcdc6da1c 100644 --- a/webcit/cookie_conversion.c +++ b/webcit/cookie_conversion.c @@ -1,184 +1,87 @@ +/* + * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "webcit.h" -#define TRUE 1 -#define FALSE 0 - -typedef unsigned char byte; /* Byte type */ -static byte dtable[SIZ]; /* base64 encode / decode table */ - /* - * decode_base64() and encode_base64() are adaptations of code by - * John Walker, found in full in the file "base64.c" included with the Citadel - * server. The difference between those functions and these is that - * these are intended to encode/decode small string buffers, and those are - * intended to encode/decode entire MIME parts. + * 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); -void encode_base64(char *dest, char *source) +/* + * Pack all session info into one easy-to-digest cookie. Healthy and delicious! + */ +void stuff_to_cookie(int unset_cookies) { - int i, hiteof = FALSE; - int spos = 0; - int dpos = 0; - - /* Fill dtable with character encodings. */ - - for (i = 0; i < 26; i++) { - dtable[i] = 'A' + i; - dtable[26 + i] = 'a' + i; - } - for (i = 0; i < 10; i++) { - dtable[52 + i] = '0' + i; - } - dtable[62] = '+'; - dtable[63] = '/'; - - while (!hiteof) { - byte igroup[3], ogroup[4]; - int c, n; + wcsession *WCC = WC; + char buf[SIZ]; - igroup[0] = igroup[1] = igroup[2] = 0; - for (n = 0; n < 3; n++) { - c = source[spos++]; - if (c == 0) { - hiteof = TRUE; - break; - } - igroup[n] = (byte) c; + if (unset_cookies) { + hprintf("Set-cookie: webcit=%s; path=/\r\n", unset); } - if (n > 0) { - ogroup[0] = dtable[igroup[0] >> 2]; - ogroup[1] = dtable[((igroup[0] & 3) << 4) | (igroup[1] >> 4)]; - ogroup[2] = dtable[((igroup[1] & 0xF) << 2) | (igroup[2] >> 6)]; - ogroup[3] = dtable[igroup[2] & 0x3F]; - - /* Replace characters in output stream with "=" pad - characters if fewer than three characters were - read from the end of the input stream. */ - - if (n < 3) { - ogroup[3] = '='; - if (n < 2) { - ogroup[2] = '='; + 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, "|"); + + if (server_cookie != NULL) { + StrBufAppendPrintf(WCC->HBuf, + ";path=/ \r\n%s\r\n", + server_cookie); } - } - for (i = 0; i < 4; i++) { - dest[dpos++] = ogroup[i]; - dest[dpos] = 0; - } - } - } -} - - - -int decode_base64(char *dest, char *source) -{ - int i; - int dpos = 0; - int spos = 0; - - for (i = 0; i < 255; i++) { - dtable[i] = 0x80; - } - for (i = 'A'; i <= 'Z'; i++) { - dtable[i] = 0 + (i - 'A'); - } - for (i = 'a'; i <= 'z'; i++) { - dtable[i] = 26 + (i - 'a'); - } - for (i = '0'; i <= '9'; i++) { - dtable[i] = 52 + (i - '0'); - } - dtable['+'] = 62; - dtable['/'] = 63; - dtable['='] = 0; - - /*CONSTANTCONDITION*/ - while (TRUE) { - byte a[4], b[4], o[3]; - - for (i = 0; i < 4; i++) { - int c = source[spos++]; - - if (c == 0) { - if (i > 0) { - return(dpos); + else { + StrBufAppendBufPlain(WCC->HBuf, + HKEY("; path=/\r\n"), 0); } - return(dpos); - } - if (dtable[c] & 0x80) { - /* Ignoring errors: discard invalid character. */ - i--; - continue; - } - a[i] = (byte) c; - b[i] = (byte) dtable[c]; } - o[0] = (b[0] << 2) | (b[1] >> 4); - o[1] = (b[1] << 4) | (b[2] >> 2); - o[2] = (b[2] << 6) | b[3]; - i = a[2] == '=' ? 1 : (a[3] == '=' ? 2 : 3); - if (i>=1) dest[dpos++] = o[0]; - if (i>=2) dest[dpos++] = o[1]; - if (i>=3) dest[dpos++] = o[2]; - dest[dpos] = 0; - if (i < 3) { - return(dpos); - } - } } - - - - -/* - * 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) -{ - char buf[SIZ]; - - sprintf(buf, "%d|%s|%s|%s", session, user, pass, room); - encode_base64(cookie, buf); -} - - /* * Extract all that fun stuff out of the cookie. */ -void cookie_to_stuff(char *cookie, int *session, char *user, char *pass, char *room) +void cookie_to_stuff(StrBuf *cookie, + int *session, + StrBuf *user, + StrBuf *pass, + StrBuf *room, + StrBuf *language) { - char buf[SIZ]; - - decode_base64(buf, cookie); - - if (session != NULL) - *session = extract_int(buf, 0); - if (user != NULL) - extract(user, buf, 1); - if (pass != NULL) - extract(pass, buf, 2); - if (room != NULL) - extract(room, buf, 3); + 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, '|'); + } }