annotate dpi/cookies.c @ 1607:7dc68ea220cb

cookies: start using struct tm for time calculations Apparently, that's how you're supposed to do things. It's clumsy, but oh well.
author corvid <corvid@lavabit.com>
date Wed, 10 Mar 2010 00:28:04 +0000
parents 9c9b1a1e5bb4
children 5f8f8ce7a913
rev   line source
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
2 * File: cookies.c
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
3 * Cookies server.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
4 *
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
5 * Copyright 2001 Lars Clausen <lrclause@cs.uiuc.edu>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
6 * Jörgen Viksell <jorgen.viksell@telia.com>
35
d9e7b35430de Updated copyright lines
jcid
parents: 0
diff changeset
7 * Copyright 2002-2007 Jorge Arellano Cid <jcid@dillo.org>
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
8 *
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
9 * This program is free software; you can redistribute it and/or modify
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
10 * it under the terms of the GNU General Public License as published by
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
11 * the Free Software Foundation; either version 3 of the License, or
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
12 * (at your option) any later version.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
13 *
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
14 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
15
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
16 /* This is written to follow the HTTP State Working Group's
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
17 * draft-ietf-httpstate-cookie-01.txt.
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
18 *
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
19 * We depart from the draft spec's domain format in that, rather than
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
20 * using a host-only flag, we continue to use the .domain notation
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
21 * internally to indicate cookies that may also be returned to subdomains.
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
22 *
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
23 * Info on cookies in the wild:
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
24 * http://www.ietf.org/mail-archive/web/http-state/current/msg00078.html
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
25 * And dates specifically:
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
26 * http://www.ietf.org/mail-archive/web/http-state/current/msg00128.html
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
27 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
28
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
29 #ifdef DISABLE_COOKIES
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
30
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
31 int main(void)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
32 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
33 return 0; /* never called */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
34 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
35
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
36 #else
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
37
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
38
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
39 #include <sys/types.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
40 #include <sys/socket.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
41 #include <sys/stat.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
42 #include <sys/un.h>
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
43 #include <netinet/in.h>
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
44 #include <fcntl.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
45 #include <unistd.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
46 #include <errno.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
47 #include <stddef.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
48 #include <string.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
49 #include <stdlib.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
50 #include <stdio.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
51 #include <time.h> /* for time() and time_t */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
52 #include <ctype.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
53 #include <netdb.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
54 #include <signal.h>
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
55 #include "dpiutil.h"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
56 #include "../dpip/dpip.h"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
57
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
58
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
59 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
60 * Debugging macros
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
61 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
62 #define _MSG(...)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
63 #define MSG(...) printf("[cookies dpi]: " __VA_ARGS__)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
64
1508
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
65 #define DILLO_TIME_MAX ((time_t) ((1UL << (sizeof(time_t) * 8 - 1)) - 1))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
66
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
67 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
68 * a_List_add()
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
69 *
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
70 * Make sure there's space for 'num_items' items within the list
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
71 * (First, allocate an 'alloc_step' sized chunk, after that, double the
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
72 * list size --to make it faster)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
73 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
74 #define a_List_add(list,num_items,alloc_step) \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
75 if (!list) { \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
76 list = dMalloc(alloc_step * sizeof((*list))); \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
77 } \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
78 if (num_items >= alloc_step){ \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
79 while ( num_items >= alloc_step ) \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
80 alloc_step <<= 1; \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
81 list = dRealloc(list, alloc_step * sizeof((*list))); \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
82 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
83
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
84 /* The maximum length of a line in the cookie file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
85 #define LINE_MAXLEN 4096
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
86
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
87 typedef enum {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
88 COOKIE_ACCEPT,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
89 COOKIE_ACCEPT_SESSION,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
90 COOKIE_DENY
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
91 } CookieControlAction;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
92
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
93 typedef struct {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
94 char *domain;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
95 CookieControlAction action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
96 } CookieControl;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
97
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
98 typedef struct {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
99 char *domain;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
100 Dlist *dlist;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
101 } CookieNode;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
102
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
103 typedef struct {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
104 char *name;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
105 char *value;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
106 char *domain;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
107 char *path;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
108 time_t expires_at;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
109 bool_t secure;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
110 bool_t session_only;
1504
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
111 long last_used;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
112 } CookieData_t;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
113
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
114 typedef struct {
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
115 Dsh *sh;
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
116 int status;
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
117 } ClientInfo;
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
118
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
119 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
120 * Local data
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
121 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
122
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
123 /* List of CookieNode. Each node holds a domain and its list of cookies */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
124 static Dlist *cookies;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
125
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
126 /* Variables for access control */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
127 static CookieControl *ccontrol = NULL;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
128 static int num_ccontrol = 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
129 static int num_ccontrol_max = 1;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
130 static CookieControlAction default_action = COOKIE_DENY;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
131
1504
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
132 static long cookies_use_counter = 0;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
133 static bool_t disabled;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
134 static FILE *file_stream;
1503
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
135 static const char *const cookies_txt_header_str =
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
136 "# HTTP Cookie File\n"
1503
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
137 "# This is a generated file! Do not edit.\n"
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
138 "# [domain TRUE path secure expiry_time name value]\n\n";
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
139
1607
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
140 /* The epoch is Jan 1, 1970. When there is difficulty in representing future
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
141 * dates, use the (by far) most likely last representable time in Jan 19, 2038.
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
142 */
1605
1dd07874017e cookies: use difftime() for time_t comparisons
corvid <corvid@lavabit.com>
parents: 1603
diff changeset
143 static struct tm cookies_epoch_tm = {0, 0, 0, 1, 0, 70, 0, 0, 0, 0, 0};
1607
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
144 static time_t cookies_epoch_time, cookies_future_time;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
145
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
146 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
147 * Forward declarations
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
148 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
149
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
150 static CookieControlAction Cookies_control_check_domain(const char *domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
151 static int Cookie_control_init(void);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
152 static void Cookies_add_cookie(CookieData_t *cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
153 static int Cookies_cmp(const void *a, const void *b);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
154
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
155 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
156 * Compare function for searching a cookie node
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
157 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
158 static int Cookie_node_cmp(const void *v1, const void *v2)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
159 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
160 const CookieNode *n1 = v1, *n2 = v2;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
161
1484
29d892265da0 domain comparison not case-sensitive
corvid <corvid@lavabit.com>
parents: 1483
diff changeset
162 return dStrcasecmp(n1->domain, n2->domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
163 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
164
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
165 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
166 * Compare function for searching a cookie node by domain
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
167 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
168 static int Cookie_node_by_domain_cmp(const void *v1, const void *v2)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
169 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
170 const CookieNode *node = v1;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
171 const char *domain = v2;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
172
1484
29d892265da0 domain comparison not case-sensitive
corvid <corvid@lavabit.com>
parents: 1483
diff changeset
173 return dStrcasecmp(node->domain, domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
174 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
175
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
176 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
177 * Return a file pointer. If the file doesn't exist, try to create it,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
178 * with the optional 'init_str' as its content.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
179 */
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
180 static FILE *Cookies_fopen(const char *filename, const char *mode,
1503
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
181 const char *init_str)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
182 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
183 FILE *F_in;
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
184 int fd, rc;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
185
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
186 if ((F_in = fopen(filename, mode)) == NULL) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
187 /* Create the file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
188 fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
189 if (fd != -1) {
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
190 if (init_str) {
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
191 rc = write(fd, init_str, strlen(init_str));
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
192 if (rc == -1) {
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
193 MSG("Cookies: Could not write initial string to file %s: %s\n",
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
194 filename, dStrerror(errno));
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
195 }
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
196 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
197 close(fd);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
198
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
199 MSG("Created file: %s\n", filename);
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
200 F_in = fopen(filename, mode);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
201 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
202 MSG("Could not create file: %s!\n", filename);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
203 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
204 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
205
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
206 if (F_in) {
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
207 /* set close on exec */
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
208 fcntl(fileno(F_in), F_SETFD, FD_CLOEXEC | fcntl(fileno(F_in), F_GETFD));
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
209 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
210
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
211 return F_in;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
212 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
213
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
214 static void Cookies_free_cookie(CookieData_t *cookie)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
215 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
216 dFree(cookie->name);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
217 dFree(cookie->value);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
218 dFree(cookie->domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
219 dFree(cookie->path);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
220 dFree(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
221 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
222
1607
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
223 static void Cookies_tm_init(struct tm *tm)
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
224 {
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
225 tm->tm_sec = cookies_epoch_tm.tm_sec;
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
226 tm->tm_min = cookies_epoch_tm.tm_min;
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
227 tm->tm_hour = cookies_epoch_tm.tm_hour;
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
228 tm->tm_mday = cookies_epoch_tm.tm_mday;
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
229 tm->tm_mon = cookies_epoch_tm.tm_mon;
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
230 tm->tm_year = cookies_epoch_tm.tm_year;
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
231 tm->tm_isdst = cookies_epoch_tm.tm_isdst;
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
232 }
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
233
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
234 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
235 * Initialize the cookies module
1503
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
236 * (The 'disabled' variable is writeable only within Cookies_init)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
237 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
238 static void Cookies_init()
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
239 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
240 CookieData_t *cookie;
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
241 char *filename, *rc = NULL;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
242 char line[LINE_MAXLEN];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
243 #ifndef HAVE_LOCKF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
244 struct flock lck;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
245 #endif
1607
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
246 struct tm future_tm = {7, 14, 3, 19, 0, 138, 0, 0, 0, 0, 0};
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
247
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
248 /* Default setting */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
249 disabled = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
250
1605
1dd07874017e cookies: use difftime() for time_t comparisons
corvid <corvid@lavabit.com>
parents: 1603
diff changeset
251 cookies_epoch_time = mktime(&cookies_epoch_tm);
1607
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
252 cookies_future_time = mktime(&future_tm);
1605
1dd07874017e cookies: use difftime() for time_t comparisons
corvid <corvid@lavabit.com>
parents: 1603
diff changeset
253
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
254 /* Read and parse the cookie control file (cookiesrc) */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
255 if (Cookie_control_init() != 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
256 MSG("Disabling cookies.\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
257 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
258 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
259
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
260 /* Get a stream for the cookies file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
261 filename = dStrconcat(dGethomedir(), "/.dillo/cookies.txt", NULL);
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
262 file_stream = Cookies_fopen(filename, "r+", cookies_txt_header_str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
263
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
264 dFree(filename);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
265
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
266 if (!file_stream) {
1495
a83b066cbcb3 rm support for ancient ~/.dillo/cookies file
corvid <corvid@lavabit.com>
parents: 1491
diff changeset
267 MSG("ERROR: Can't open ~/.dillo/cookies.txt; disabling cookies\n");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
268 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
269 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
270
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
271 /* Try to get a lock from the file descriptor */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
272 #ifdef HAVE_LOCKF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
273 disabled = (lockf(fileno(file_stream), F_TLOCK, 0) == -1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
274 #else /* POSIX lock */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
275 lck.l_start = 0; /* start at beginning of file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
276 lck.l_len = 0; /* lock entire file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
277 lck.l_type = F_WRLCK;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
278 lck.l_whence = SEEK_SET; /* absolute offset */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
279
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
280 disabled = (fcntl(fileno(file_stream), F_SETLK, &lck) == -1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
281 #endif
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
282 if (disabled) {
1495
a83b066cbcb3 rm support for ancient ~/.dillo/cookies file
corvid <corvid@lavabit.com>
parents: 1491
diff changeset
283 MSG("The cookies file has a file lock; disabling cookies!\n");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
284 fclose(file_stream);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
285 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
286 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
287
1495
a83b066cbcb3 rm support for ancient ~/.dillo/cookies file
corvid <corvid@lavabit.com>
parents: 1491
diff changeset
288 MSG("Enabling cookies as per cookiesrc...\n");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
289
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
290 cookies = dList_new(32);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
291
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
292 /* Get all lines in the file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
293 while (!feof(file_stream)) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
294 line[0] = '\0';
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
295 rc = fgets(line, LINE_MAXLEN, file_stream);
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
296 if (!rc && ferror(file_stream)) {
1503
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
297 MSG("Error while reading from cookies.txt: %s\n", dStrerror(errno));
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
298 break; /* bail out */
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
299 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
300
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
301 /* Remove leading and trailing whitespaces */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
302 dStrstrip(line);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
303
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
304 if ((line[0] != '\0') && (line[0] != '#')) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
305 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
306 * Split the row into pieces using a tab as the delimiter.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
307 * pieces[0] The domain name
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
308 * pieces[1] TRUE/FALSE: is the domain a suffix, or a full domain?
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
309 * pieces[2] The path
1495
a83b066cbcb3 rm support for ancient ~/.dillo/cookies file
corvid <corvid@lavabit.com>
parents: 1491
diff changeset
310 * pieces[3] TRUE/FALSE: is the cookie for secure use only?
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
311 * pieces[4] Timestamp of expire date
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
312 * pieces[5] Name of the cookie
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
313 * pieces[6] Value of the cookie
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
314 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
315 CookieControlAction action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
316 char *piece;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
317 char *line_marker = line;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
318
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
319 cookie = dNew0(CookieData_t, 1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
320
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
321 cookie->session_only = FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
322 cookie->domain = dStrdup(dStrsep(&line_marker, "\t"));
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
323 dStrsep(&line_marker, "\t"); /* we use domain always as sufix */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
324 cookie->path = dStrdup(dStrsep(&line_marker, "\t"));
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
325 piece = dStrsep(&line_marker, "\t");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
326 if (piece != NULL && piece[0] == 'T')
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
327 cookie->secure = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
328 piece = dStrsep(&line_marker, "\t");
1607
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
329 if (piece != NULL) {
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
330 struct tm tm;
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
331 Cookies_tm_init(&tm);
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
332 tm.tm_sec += strtol(piece, NULL, 10);
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
333 cookie->expires_at = mktime(&tm);
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
334 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
335 cookie->name = dStrdup(dStrsep(&line_marker, "\t"));
1518
deccee022a42 handle nameless/valueless cookies in cookies.txt
corvid <corvid@lavabit.com>
parents: 1517
diff changeset
336 cookie->value = dStrdup(line_marker ? line_marker : "");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
337
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
338 if (!cookie->domain || cookie->domain[0] == '\0' ||
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
339 !cookie->path || cookie->path[0] != '/' ||
1518
deccee022a42 handle nameless/valueless cookies in cookies.txt
corvid <corvid@lavabit.com>
parents: 1517
diff changeset
340 !cookie->name || !cookie->value) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
341 MSG("Malformed line in cookies.txt file!\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
342 Cookies_free_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
343 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
344 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
345
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
346 action = Cookies_control_check_domain(cookie->domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
347 if (action == COOKIE_DENY) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
348 Cookies_free_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
349 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
350 } else if (action == COOKIE_ACCEPT_SESSION) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
351 cookie->session_only = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
352 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
353
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
354 /* Save cookie in memory */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
355 Cookies_add_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
356 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
357 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
358 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
359
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
360 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
361 * Flush cookies to disk and free all the memory allocated.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
362 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
363 static void Cookies_save_and_free()
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
364 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
365 int i, fd;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
366 CookieNode *node;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
367 CookieData_t *cookie;
1512
bd36920f32d4 don't bother to save expired cookies
corvid <corvid@lavabit.com>
parents: 1510
diff changeset
368 time_t now;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
369
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
370 #ifndef HAVE_LOCKF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
371 struct flock lck;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
372 #endif
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
373
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
374 if (disabled)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
375 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
376
1512
bd36920f32d4 don't bother to save expired cookies
corvid <corvid@lavabit.com>
parents: 1510
diff changeset
377 now = time(NULL);
bd36920f32d4 don't bother to save expired cookies
corvid <corvid@lavabit.com>
parents: 1510
diff changeset
378
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
379 rewind(file_stream);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
380 fd = fileno(file_stream);
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
381 if (ftruncate(fd, 0) == -1)
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
382 MSG("Cookies: Truncate file stream failed: %s\n", dStrerror(errno));
454
c0d3c2ec7140 - Fixed a printf bug in cookies dpi.
jcid
parents: 445
diff changeset
383 fprintf(file_stream, "%s", cookies_txt_header_str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
384
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
385 /* Iterate cookies per domain, saving and freeing */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
386 while ((node = dList_nth_data(cookies, 0))) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
387 for (i = 0; (cookie = dList_nth_data(node->dlist, i)); ++i) {
1605
1dd07874017e cookies: use difftime() for time_t comparisons
corvid <corvid@lavabit.com>
parents: 1603
diff changeset
388 if (!cookie->session_only && difftime(cookie->expires_at, now) > 0) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
389 fprintf(file_stream, "%s\tTRUE\t%s\t%s\t%ld\t%s\t%s\n",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
390 cookie->domain,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
391 cookie->path,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
392 cookie->secure ? "TRUE" : "FALSE",
1606
9c9b1a1e5bb4 another difftime
corvid <corvid@lavabit.com>
parents: 1605
diff changeset
393 (long)difftime(cookie->expires_at, cookies_epoch_time),
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
394 cookie->name,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
395 cookie->value);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
396 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
397
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
398 Cookies_free_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
399 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
400 dList_remove(cookies, node);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
401 dFree(node->domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
402 dList_free(node->dlist);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
403 dFree(node);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
404 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
405
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
406 #ifdef HAVE_LOCKF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
407 lockf(fd, F_ULOCK, 0);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
408 #else /* POSIX file lock */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
409 lck.l_start = 0; /* start at beginning of file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
410 lck.l_len = 0; /* lock entire file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
411 lck.l_type = F_UNLCK;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
412 lck.l_whence = SEEK_SET; /* absolute offset */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
413
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
414 fcntl(fileno(file_stream), F_SETLKW, &lck);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
415 #endif
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
416 fclose(file_stream);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
417 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
418
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
419 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
420 * Take a months name and return a number between 1-12.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
421 * E.g. 'April' -> 4
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
422 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
423 static int Cookies_get_month(const char *month_name)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
424 {
1500
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
425 static const char *const months[] =
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
426 { "",
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
427 "Jan", "Feb", "Mar",
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
428 "Apr", "May", "Jun",
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
429 "Jul", "Aug", "Sep",
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
430 "Oct", "Nov", "Dec"
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
431 };
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
432 int i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
433
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
434 for (i = 1; i <= 12; i++) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
435 if (!dStrncasecmp(months[i], month_name, 3))
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
436 return i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
437 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
438 return 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
439 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
440
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
441 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
442 * Return a local timestamp from a GMT date string
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
443 * Accept: RFC-1123 | RFC-850 | ANSI asctime | Old Netscape format.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
444 *
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
445 * Wdy, DD-Mon-YY HH:MM:SS GMT
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
446 * Wdy, DD-Mon-YYYY HH:MM:SS GMT
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
447 * Weekday, DD-Mon-YY HH:MM:SS GMT
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
448 * Weekday, DD-Mon-YYYY HH:MM:SS GMT
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
449 * Tue May 21 13:46:22 1991\n
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
450 * Tue May 21 13:46:22 1991
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
451 *
1500
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
452 * Let's add:
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
453 * Mon Jan 11 08:00:00 2010 GMT
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
454 *
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
455 * (return 0 on malformed date string syntax)
1500
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
456 *
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
457 * NOTE that the draft spec wants user agents to be more flexible in what
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
458 * they accept. For now, let's hack in special cases when they're encountered.
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
459 * Why? Because this function is currently understandable, and I don't want to
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
460 * abandon that (or at best decrease that -- see section 5.1.1) until there
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
461 * is known to be good reason.
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
462 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
463 static time_t Cookies_create_timestamp(const char *expires)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
464 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
465 time_t ret;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
466 int day, month, year, hour, minutes, seconds;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
467 char *cp;
1500
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
468 const char *const E_msg =
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
469 "Expire date is malformed!\n"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
470 " (should be RFC-1123 | RFC-850 | ANSI asctime)\n"
1500
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
471 " Discarding cookie: ";
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
472
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
473 cp = strchr(expires, ',');
1500
335f1b3692c9 timestamps a little less strict
corvid <corvid@lavabit.com>
parents: 1499
diff changeset
474 if (!cp && strlen(expires)>20 && expires[13] == ':' && expires[16] == ':') {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
475 /* Looks like ANSI asctime format... */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
476 cp = (char *)expires;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
477 day = strtol(cp + 8, NULL, 10); /* day */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
478 month = Cookies_get_month(cp + 4); /* month */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
479 year = strtol(cp + 20, NULL, 10); /* year */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
480 hour = strtol(cp + 11, NULL, 10); /* hour */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
481 minutes = strtol(cp + 14, NULL, 10); /* minutes */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
482 seconds = strtol(cp + 17, NULL, 10); /* seconds */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
483
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
484 } else if (cp && (cp - expires == 3 || cp - expires > 5) &&
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
485 (strlen(cp) == 24 || strlen(cp) == 26)) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
486 /* RFC-1123 | RFC-850 format | Old Netscape format */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
487 day = strtol(cp + 2, NULL, 10);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
488 month = Cookies_get_month(cp + 5);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
489 year = strtol(cp + 9, &cp, 10);
368
2242da885677 - s/todo:/TODO:/g
jcid
parents: 235
diff changeset
490 /* TODO: tricky, because two digits for year IS ambiguous! */
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
491 year += (year < 70) ? 2000 : ((year < 100) ? 1900 : 0);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
492 hour = strtol(cp + 1, NULL, 10);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
493 minutes = strtol(cp + 4, NULL, 10);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
494 seconds = strtol(cp + 7, NULL, 10);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
495
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
496 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
497 MSG("%s%s\n", E_msg, expires);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
498 return (time_t) 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
499 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
500
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
501 /* Error checks --this may be overkill */
1127
65c7e33e4466 allow year 1970 in cookies
corvid <corvid@lavabit.com>
parents: 454
diff changeset
502 if (!(day > 0 && day < 32 && month > 0 && month < 13 && year >= 1970 &&
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
503 hour >= 0 && hour < 24 && minutes >= 0 && minutes < 60 &&
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
504 seconds >= 0 && seconds < 60)) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
505 MSG("%s%s\n", E_msg, expires);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
506 return (time_t) 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
507 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
508
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
509 /* Calculate local timestamp.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
510 * [stolen from Lynx... (http://lynx.browser.org)] */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
511 month -= 3;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
512 if (month < 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
513 month += 12;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
514 year--;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
515 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
516
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
517 day += (year - 1968) * 1461 / 4;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
518 day += ((((month * 153) + 2) / 5) - 672);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
519 ret = (time_t)((day * 60 * 60 * 24) +
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
520 (hour * 60 * 60) +
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
521 (minutes * 60) +
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
522 seconds);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
523
1508
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
524 /* handle overflow */
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
525 if (year >= 1970 && ret < 0)
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
526 ret = DILLO_TIME_MAX;
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
527
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
528 return ret;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
529 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
530
1504
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
531 /*
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
532 * Remove the least recently used cookie in the list.
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
533 */
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
534 static void Cookies_remove_LRU(Dlist *cookies)
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
535 {
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
536 int n = dList_length(cookies);
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
537
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
538 if (n > 0) {
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
539 int i;
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
540 CookieData_t *lru = dList_nth_data(cookies, 0);
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
541
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
542 for (i = 1; i < n; i++) {
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
543 CookieData_t *curr = dList_nth_data(cookies, i);
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
544
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
545 if (curr->last_used < lru->last_used)
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
546 lru = curr;
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
547 }
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
548 dList_remove(cookies, lru);
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
549 MSG("removed LRU cookie \'%s=%s\'\n", lru->name, lru->value);
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
550 Cookies_free_cookie(lru);
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
551 }
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
552 }
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
553
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
554 static void Cookies_add_cookie(CookieData_t *cookie)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
555 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
556 Dlist *domain_cookies;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
557 CookieData_t *c;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
558 CookieNode *node;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
559
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
560 node = dList_find_sorted(cookies, cookie->domain,Cookie_node_by_domain_cmp);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
561 domain_cookies = (node) ? node->dlist : NULL;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
562
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
563 if (domain_cookies) {
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
564 /* Remove any cookies with the same name and path */
1519
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
565 while ((c = dList_find_custom(domain_cookies, cookie, Cookies_cmp))) {
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
566 dList_remove(domain_cookies, c);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
567 Cookies_free_cookie(c);
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
568 }
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
569
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
570 /* Respect the limit of 20 cookies per domain */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
571 if (dList_length(domain_cookies) >= 20) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
572 MSG("There are too many cookies for this domain (%s)\n",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
573 cookie->domain);
1504
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
574 Cookies_remove_LRU(domain_cookies);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
575 }
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
576 }
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
577
1503
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
578 /* Don't add an expired cookie. Whether expiring now == expired, exactly,
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
579 * is arguable, but we definitely do not want to add a Max-Age=0 cookie.
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
580 */
1605
1dd07874017e cookies: use difftime() for time_t comparisons
corvid <corvid@lavabit.com>
parents: 1603
diff changeset
581 if (difftime(cookie->expires_at, time(NULL)) <= 0) {
1546
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
582 _MSG("Goodbye, expired cookie %s=%s d:%s p:%s\n", cookie->name,
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
583 cookie->value, cookie->domain, cookie->path);
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
584 Cookies_free_cookie(cookie);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
585 } else {
1519
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
586 cookie->last_used = cookies_use_counter++;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
587
1519
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
588 /* add cookie to domain list */
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
589 if (!domain_cookies) {
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
590 domain_cookies = dList_new(5);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
591 dList_append(domain_cookies, cookie);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
592 node = dNew(CookieNode, 1);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
593 node->domain = dStrdup(cookie->domain);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
594 node->dlist = domain_cookies;
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
595 dList_insert_sorted(cookies, node, Cookie_node_cmp);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
596 } else {
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
597 dList_append(domain_cookies, cookie);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
598 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
599 }
1519
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
600 if (domain_cookies && (dList_length(domain_cookies) == 0)) {
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
601 dList_remove(cookies, node);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
602 dFree(node->domain);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
603 dList_free(domain_cookies);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
604 dFree(node);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
605 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
606 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
607
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
608 /*
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
609 * Return the attribute that is present at *cookie_str.
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
610 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
611 static char *Cookies_parse_attr(char **cookie_str)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
612 {
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
613 char *str;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
614 uint_t len;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
615
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
616 while (dIsspace(**cookie_str))
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
617 (*cookie_str)++;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
618
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
619 str = *cookie_str;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
620 /* find '=' at end of attr, ';' after attr/val pair, '\0' end of string */
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
621 len = strcspn(str, "=;");
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
622 *cookie_str += len;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
623
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
624 while (len && (str[len - 1] == ' ' || str[len - 1] == '\t'))
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
625 len--;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
626 return dStrndup(str, len);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
627 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
628
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
629 /*
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
630 * Get the value in *cookie_str.
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
631 */
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
632 static char *Cookies_parse_value(char **cookie_str)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
633 {
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
634 uint_t len;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
635 char *str;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
636
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
637 if (**cookie_str == '=') {
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
638 (*cookie_str)++;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
639 while (dIsspace(**cookie_str))
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
640 (*cookie_str)++;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
641
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
642 str = *cookie_str;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
643 /* finds ';' after attr/val pair or '\0' at end of string */
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
644 len = strcspn(str, ";");
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
645 *cookie_str += len;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
646
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
647 while (len && (str[len - 1] == ' ' || str[len - 1] == '\t'))
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
648 len--;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
649 } else {
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
650 str = *cookie_str;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
651 len = 0;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
652 }
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
653 return dStrndup(str, len);
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
654 }
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
655
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
656 /*
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
657 * Advance past any value
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
658 */
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
659 static void Cookies_eat_value(char **cookie_str)
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
660 {
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
661 if (**cookie_str == '=')
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
662 *cookie_str += strcspn(*cookie_str, ";");
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
663 }
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
664
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
665 /*
1522
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
666 * Handle Expires attribute.
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
667 * Note that this CAN MODIFY the value string.
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
668 */
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
669 static time_t Cookies_expires_attr(char *value, const char *server_date)
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
670 {
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
671 time_t exptime;
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
672
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
673 if (*value == '"' && value[strlen(value) - 1] == '"') {
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
674 /* In this one case, pay attention to quotes */
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
675 value[strlen(value) - 1] = '\0';
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
676 value++;
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
677 }
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
678 exptime = Cookies_create_timestamp(value);
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
679 if (exptime && server_date) {
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
680 time_t server_time = Cookies_create_timestamp(server_date);
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
681
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
682 if (server_time) {
1527
03752405e0a9 cookies improve clock skew handling
corvid <corvid@lavabit.com>
parents: 1522
diff changeset
683 time_t local_shift = time(NULL) - server_time;
1522
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
684
1527
03752405e0a9 cookies improve clock skew handling
corvid <corvid@lavabit.com>
parents: 1522
diff changeset
685 if ((exptime > 0 && local_shift > 0 && (exptime + local_shift < 0)) ||
03752405e0a9 cookies improve clock skew handling
corvid <corvid@lavabit.com>
parents: 1522
diff changeset
686 (exptime < 0 && local_shift < 0 && (exptime + local_shift > 0))) {
1522
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
687 /* Don't want to wrap around at the extremes of representable
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
688 * values thanks to clock skew.
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
689 */
1546
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
690 _MSG("Time %ld was trying to turn into %ld\n", (long)exptime,
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
691 (long)(exptime + local_shift));
1527
03752405e0a9 cookies improve clock skew handling
corvid <corvid@lavabit.com>
parents: 1522
diff changeset
692 } else {
03752405e0a9 cookies improve clock skew handling
corvid <corvid@lavabit.com>
parents: 1522
diff changeset
693 exptime += local_shift;
1522
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
694 }
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
695 }
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
696 }
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
697 return exptime;
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
698 }
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
699
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
700 /*
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
701 * Parse cookie. A cookie might look something like:
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
702 * "Name=Val; Domain=example.com; Max-Age=3600; HttpOnly"
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
703 */
1501
6fd1c55d8022 cookies use server date to interpret Expires attr
corvid <corvid@lavabit.com>
parents: 1500
diff changeset
704 static CookieData_t *Cookies_parse(char *cookie_str, const char *server_date)
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
705 {
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
706 CookieData_t *cookie = NULL;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
707 char *str = cookie_str;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
708 bool_t first_attr = TRUE;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
709 bool_t max_age = FALSE;
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
710 bool_t expires = FALSE;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
711
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
712 /* Iterate until there is nothing left of the string */
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
713 while (*str) {
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
714 char *attr;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
715 char *value;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
716
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
717 /* Get attribute */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
718 attr = Cookies_parse_attr(&str);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
719
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
720 /* Get the value for the attribute and store it */
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
721 if (first_attr) {
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
722 if (!*str && !*attr) {
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
723 dFree(attr);
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
724 return NULL;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
725 }
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
726 cookie = dNew0(CookieData_t, 1);
1607
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
727
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
728 /* let's arbitrarily choose a year for now */
1607
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
729 time_t now = time(NULL);
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
730 struct tm *tm = gmtime(&now);
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
731 ++tm->tm_year;
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
732 cookie->expires_at = mktime(tm);
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
733 if (cookie->expires_at == (time_t) -1)
7dc68ea220cb cookies: start using struct tm for time calculations
corvid <corvid@lavabit.com>
parents: 1606
diff changeset
734 cookie->expires_at = cookies_future_time;
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
735
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
736 if (*str != '=') {
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
737 /* NOTE it seems possible that the Working Group will decide
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
738 * against allowing nameless cookies.
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
739 */
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
740 cookie->name = dStrdup("");
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
741 cookie->value = attr;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
742 } else {
1603
a31eecbe5938 fix cookie attr leak
corvid <corvid@lavabit.com>
parents: 1599
diff changeset
743 cookie->name = attr;
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
744 cookie->value = Cookies_parse_value(&str);
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
745 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
746 } else if (dStrcasecmp(attr, "Path") == 0) {
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
747 value = Cookies_parse_value(&str);
1491
a10148c0bcab cookies don't leak extra domain/path attrs
corvid <corvid@lavabit.com>
parents: 1490
diff changeset
748 dFree(cookie->path);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
749 cookie->path = value;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
750 } else if (dStrcasecmp(attr, "Domain") == 0) {
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
751 value = Cookies_parse_value(&str);
1491
a10148c0bcab cookies don't leak extra domain/path attrs
corvid <corvid@lavabit.com>
parents: 1490
diff changeset
752 dFree(cookie->domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
753 cookie->domain = value;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
754 } else if (dStrcasecmp(attr, "Max-Age") == 0) {
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
755 value = Cookies_parse_value(&str);
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
756 if (isdigit(*value) || *value == '-') {
1508
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
757 time_t now = time(NULL);
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
758 long age = strtol(value, NULL, 10);
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
759
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
760 cookie->expires_at = now + age;
1605
1dd07874017e cookies: use difftime() for time_t comparisons
corvid <corvid@lavabit.com>
parents: 1603
diff changeset
761 if (age > 0 &&
1dd07874017e cookies: use difftime() for time_t comparisons
corvid <corvid@lavabit.com>
parents: 1603
diff changeset
762 difftime(cookie->expires_at, cookies_epoch_time) < 0) {
1508
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
763 /* handle overflow */
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
764 cookie->expires_at = DILLO_TIME_MAX;
3a82485edd3f cookie handle time overflow
corvid <corvid@lavabit.com>
parents: 1506
diff changeset
765 }
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
766 expires = max_age = TRUE;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
767 }
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
768 dFree(value);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
769 } else if (dStrcasecmp(attr, "Expires") == 0) {
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
770 if (!max_age) {
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
771 value = Cookies_parse_value(&str);
1522
85062b64ae9d cookies allow Expires attr's value to be quoted.
corvid <corvid@lavabit.com>
parents: 1519
diff changeset
772 cookie->expires_at = Cookies_expires_attr(value, server_date);
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
773 expires = TRUE;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
774 dFree(value);
1546
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
775 _MSG("Expires in %ld seconds, at %s",
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
776 (long)cookie->expires_at - time(NULL),
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
777 ctime(&cookie->expires_at));
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
778
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
779 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
780 } else if (dStrcasecmp(attr, "Secure") == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
781 cookie->secure = TRUE;
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
782 Cookies_eat_value(&str);
418
b7265ec32e33 - Allow login to wikipedia by ignoring the HttpOnly attribute (cookies)
jcid
parents: 379
diff changeset
783 } else if (dStrcasecmp(attr, "HttpOnly") == 0) {
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
784 Cookies_eat_value(&str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
785 } else {
379
52f65d7a0e7c - minor cookie MSG improvement.
jcid
parents: 368
diff changeset
786 MSG("Cookie contains unknown attribute: '%s'\n", attr);
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
787 Cookies_eat_value(&str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
788 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
789
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
790 if (first_attr)
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
791 first_attr = FALSE;
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
792 else
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
793 dFree(attr);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
794
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
795 if (*str == ';')
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
796 str++;
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
797 }
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
798 cookie->session_only = expires == FALSE;
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
799 return cookie;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
800 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
801
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
802 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
803 * Compare cookies by name and path (return 0 if equal)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
804 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
805 static int Cookies_cmp(const void *a, const void *b)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
806 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
807 const CookieData_t *ca = a, *cb = b;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
808 int ret;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
809
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
810 if (!(ret = strcmp(ca->name, cb->name)))
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
811 ret = strcmp(ca->path, cb->path);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
812 return ret;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
813 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
814
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
815 /*
1517
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
816 * Is the domain an IP address?
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
817 */
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
818 static bool_t Cookies_domain_is_ip(const char *domain)
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
819 {
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
820 uint_t len;
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
821
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
822 if (!domain)
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
823 return FALSE;
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
824
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
825 len = strlen(domain);
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
826
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
827 if (len == strspn(domain, "0123456789.")) {
1546
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
828 _MSG("an IPv4 address\n");
1517
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
829 return TRUE;
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
830 }
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
831 if (*domain == '[' &&
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
832 (len == strspn(domain, "0123456789abcdefABCDEF:.[]"))) {
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
833 /* The precise format is shown in section 3.2.2 of rfc 3986 */
1546
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
834 _MSG("an IPv6 address\n");
1517
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
835 return TRUE;
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
836 }
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
837 return FALSE;
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
838 }
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
839
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
840 /*
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
841 * Check whether url_path path-matches cookie_path
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
842 *
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
843 * Note different user agents apparently vary in path-matching behaviour,
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
844 * but this is the recommended method at the moment.
1486
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
845 */
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
846 static bool_t Cookies_path_matches(const char *url_path,
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
847 const char *cookie_path)
1486
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
848 {
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
849 bool_t ret = TRUE;
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
850
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
851 if (!url_path || !cookie_path) {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
852 ret = FALSE;
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
853 } else {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
854 uint_t c_len = strlen(cookie_path);
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
855 uint_t u_len = strlen(url_path);
1486
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
856
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
857 ret = (!strncmp(cookie_path, url_path, c_len) &&
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
858 ((c_len == u_len) ||
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
859 (c_len > 0 && cookie_path[c_len - 1] == '/') ||
1505
4f98690a951a unnecessary test
corvid <corvid@lavabit.com>
parents: 1504
diff changeset
860 (url_path[c_len] == '/')));
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
861 }
1486
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
862 return ret;
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
863 }
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
864
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
865 /*
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
866 * If cookie path is not properly set, remedy that.
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
867 */
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
868 static void Cookies_validate_path(CookieData_t *cookie, const char *url_path)
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
869 {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
870 if (!cookie->path || cookie->path[0] != '/') {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
871 dFree(cookie->path);
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
872
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
873 if (url_path) {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
874 uint_t len = strlen(url_path);
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
875
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
876 while (len && url_path[len] != '/')
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
877 len--;
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
878 cookie->path = dStrndup(url_path, len ? len : 1);
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
879 } else {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
880 cookie->path = dStrdup("/");
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
881 }
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
882 }
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
883 }
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
884
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
885 /*
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
886 * Check whether host name A domain-matches host name B.
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
887 */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
888 static bool_t Cookies_domain_matches(char *A, char *B)
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
889 {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
890 int diff;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
891
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
892 if (!A || !*A || !B || !*B)
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
893 return FALSE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
894
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
895 if (*B == '.')
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
896 B++;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
897
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
898 /* Should we concern ourselves with trailing dots in matching (here or
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
899 * elsewhere)? The HTTP State people have found that most user agents
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
900 * don't, so: No.
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
901 */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
902
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
903 if (!dStrcasecmp(A, B))
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
904 return TRUE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
905
1517
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
906 if (Cookies_domain_is_ip(B))
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
907 return FALSE;
773b44547931 cookies: be more robust in rejecting IP addr partial matches
corvid <corvid@lavabit.com>
parents: 1516
diff changeset
908
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
909 diff = strlen(A) - strlen(B);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
910
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
911 if (diff > 0) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
912 /* B is the tail of A, and the match is preceded by a '.' */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
913 return (dStrcasecmp(A + diff, B) == 0 && A[diff - 1] == '.');
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
914 } else {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
915 return FALSE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
916 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
917 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
918
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
919 /*
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
920 * Based on the host, how many internal dots do we need in a cookie domain
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
921 * to make it valid? e.g., "org" is not on the list, so dillo.org is a safe
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
922 * cookie domain, but "uk" is on the list, so ac.uk is not safe.
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
923 *
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
924 * This is imperfect, but it's something. Specifically, checking for these
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
925 * TLDs is the solution that Konqueror used once upon a time, according to
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
926 * reports.
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
927 */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
928 static uint_t Cookies_internal_dots_required(const char *host)
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
929 {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
930 uint_t ret = 1;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
931
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
932 if (host) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
933 int start, after, tld_len;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
934
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
935 /* We may be able to trust the format of the host string more than
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
936 * I am here. Trailing dots and no dots are real possibilities, though.
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
937 */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
938 after = strlen(host);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
939 if (after > 0 && host[after - 1] == '.')
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
940 after--;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
941 start = after;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
942 while (start > 0 && host[start - 1] != '.')
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
943 start--;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
944 tld_len = after - start;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
945
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
946 if (tld_len > 0) {
1510
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
947 /* These TLDs were chosen by examining the current publicsuffix list
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
948 * in January 2010 and picking out those where it was simplest for
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
949 * them to describe the situation by beginning with a "*.[tld]" rule.
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
950 */
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
951 const char *const tlds[] = {"ar","au","bd","bn","bt","ck","cy","do",
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
952 "eg","er","et","fj","fk","gt","gu","id",
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
953 "il","jm","ke","kh","kw","ml","mm","mt",
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
954 "mz","ni","np","nz","om","pg","py","qa",
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
955 "sv","tr","uk","uy","ve","ye","yu","za",
f08bcca10105 cookies update TLDs
corvid <corvid@lavabit.com>
parents: 1508
diff changeset
956 "zm","zw"};
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
957 uint_t i, tld_num = sizeof(tlds) / sizeof(tlds[0]);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
958
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
959 for (i = 0; i < tld_num; i++) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
960 if (strlen(tlds[i]) == (uint_t) tld_len &&
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
961 !dStrncasecmp(tlds[i], host + start, tld_len)) {
1546
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
962 _MSG("TLD code matched %s\n", tlds[i]);
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
963 ret++;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
964 break;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
965 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
966 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
967 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
968 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
969 return ret;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
970 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
971
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
972 /*
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
973 * Validate cookies domain against some security checks.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
974 */
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
975 static bool_t Cookies_validate_domain(CookieData_t *cookie, char *host)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
976 {
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
977 uint_t i, internal_dots;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
978
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
979 if (!cookie->domain) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
980 cookie->domain = dStrdup(host);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
981 return TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
982 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
983
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
984 if (cookie->domain[0] != '.' && !Cookies_domain_is_ip(cookie->domain)) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
985 char *d = dStrconcat(".", cookie->domain, NULL);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
986 dFree(cookie->domain);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
987 cookie->domain = d;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
988 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
989
1488
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
990 if (!Cookies_domain_matches(host, cookie->domain))
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
991 return FALSE;
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
992
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
993 internal_dots = 0;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
994 for (i = 1; i < strlen(cookie->domain) - 1; i++) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
995 if (cookie->domain[i] == '.')
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
996 internal_dots++;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
997 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
998
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
999 /* All of this dots business is a weak hack.
1488
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
1000 * TODO: accept the publicsuffix.org list as an optional external file.
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
1001 */
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1002 if (internal_dots < Cookies_internal_dots_required(host)) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1003 MSG("not enough dots in %s\n", cookie->domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1004 return FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1005 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1006
1546
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
1007 _MSG("host %s and domain %s is all right\n", host, cookie->domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1008 return TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1009 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1010
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1011 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1012 * Set the value corresponding to the cookie string
1531
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1013 * Return value: 0 set OK, -1 disabled, -2 denied, -3 rejected.
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1014 */
1531
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1015 static int Cookies_set(char *cookie_string, char *url_host,
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1016 char *url_path, char *server_date)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1017 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1018 CookieControlAction action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1019 CookieData_t *cookie;
1531
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1020 int ret = -1;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1021
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1022 if (disabled)
1531
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1023 return ret;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1024
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1025 action = Cookies_control_check_domain(url_host);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1026 if (action == COOKIE_DENY) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1027 MSG("denied SET for %s\n", url_host);
1531
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1028 ret = -2;
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1029
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1030 } else {
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1031 MSG("%s SETTING: %s\n", url_host, cookie_string);
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1032 ret = -3;
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1033 if ((cookie = Cookies_parse(cookie_string, server_date))) {
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1034 if (Cookies_validate_domain(cookie, url_host)) {
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1035 Cookies_validate_path(cookie, url_path);
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1036 if (action == COOKIE_ACCEPT_SESSION)
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1037 cookie->session_only = TRUE;
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1038 Cookies_add_cookie(cookie);
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1039 ret = 0;
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1040 } else {
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1041 MSG("Rejecting cookie for domain %s from host %s path %s\n",
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1042 cookie->domain, url_host, url_path);
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1043 Cookies_free_cookie(cookie);
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1044 }
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1045 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1046 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1047
1531
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1048 return ret;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1049 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1050
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1051 /*
1503
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
1052 * Compare the cookie with the supplied data to see whether it matches
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1053 */
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
1054 static bool_t Cookies_match(CookieData_t *cookie, const char *url_path,
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1055 bool_t is_ssl)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1056 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1057 /* Insecure cookies matches both secure and insecure urls, secure
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1058 cookies matches only secure urls */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1059 if (cookie->secure && !is_ssl)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1060 return FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1061
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
1062 if (!Cookies_path_matches(url_path, cookie->path))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1063 return FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1064
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1065 /* It's a match */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1066 return TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1067 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1068
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1069 static void Cookies_add_matching_cookies(const char *domain,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1070 const char *url_path,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1071 Dlist *matching_cookies,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1072 bool_t is_ssl)
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1073 {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1074 CookieNode *node = dList_find_sorted(cookies, domain,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1075 Cookie_node_by_domain_cmp);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1076 if (node) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1077 int i;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1078 CookieData_t *cookie;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1079 Dlist *domain_cookies = node->dlist;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1080
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1081 for (i = 0; (cookie = dList_nth_data(domain_cookies, i)); ++i) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1082 /* Remove expired cookie. */
1605
1dd07874017e cookies: use difftime() for time_t comparisons
corvid <corvid@lavabit.com>
parents: 1603
diff changeset
1083 if (difftime(cookie->expires_at, time(NULL)) < 0) {
1546
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
1084 _MSG("Goodbye, expired cookie %s=%s d:%s p:%s\n", cookie->name,
afe20c3687f2 decrease cookies chattiness
corvid <corvid@lavabit.com>
parents: 1531
diff changeset
1085 cookie->value, cookie->domain, cookie->path);
1519
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
1086 dList_remove(domain_cookies, cookie);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
1087 Cookies_free_cookie(cookie);
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1088 --i; continue;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1089 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1090 /* Check if the cookie matches the requesting URL */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1091 if (Cookies_match(cookie, url_path, is_ssl)) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1092 int j;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1093 CookieData_t *curr;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1094 uint_t path_length = strlen(cookie->path);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1095
1504
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
1096 cookie->last_used = cookies_use_counter;
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
1097
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1098 /* Longest cookies go first */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1099 for (j = 0;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1100 (curr = dList_nth_data(matching_cookies, j)) &&
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1101 strlen(curr->path) >= path_length;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1102 j++) ;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1103 dList_insert_pos(matching_cookies, cookie, j);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1104 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1105 }
1519
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
1106
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
1107 if (dList_length(domain_cookies) == 0) {
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
1108 dList_remove(cookies, node);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
1109 dFree(node->domain);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
1110 dList_free(domain_cookies);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
1111 dFree(node);
6fcb13a8b680 Be careful not to delete domain_cookies while still using it.
corvid <corvid@lavabit.com>
parents: 1518
diff changeset
1112 }
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1113 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1114 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1115
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1116 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1117 * Return a string that contains all relevant cookies as headers.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1118 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
1119 static char *Cookies_get(char *url_host, char *url_path,
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1120 char *url_scheme)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1121 {
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1122 char *domain_str, *str;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1123 CookieData_t *cookie;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1124 Dlist *matching_cookies;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1125 bool_t is_ssl;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1126 Dstr *cookie_dstring;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1127 int i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1128
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1129 if (disabled)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1130 return dStrdup("");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1131
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1132 matching_cookies = dList_new(8);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1133
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1134 /* Check if the protocol is secure or not */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1135 is_ssl = (!dStrcasecmp(url_scheme, "https"));
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1136
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1137 for (domain_str = (char *) url_host;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1138 domain_str != NULL && *domain_str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1139 domain_str = strchr(domain_str+1, '.')) {
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1140 Cookies_add_matching_cookies(domain_str, url_path, matching_cookies,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1141 is_ssl);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1142 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1143 if (!Cookies_domain_is_ip(url_host)) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1144 domain_str = dStrconcat(".", url_host, NULL);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1145 Cookies_add_matching_cookies(domain_str, url_path, matching_cookies,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1146 is_ssl);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1147 dFree(domain_str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1148 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1149
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1150 /* Found the cookies, now make the string */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1151 cookie_dstring = dStr_new("");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1152 if (dList_length(matching_cookies) > 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1153
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1154 dStr_sprintfa(cookie_dstring, "Cookie: ");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1155
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1156 for (i = 0; (cookie = dList_nth_data(matching_cookies, i)); ++i) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1157 dStr_sprintfa(cookie_dstring,
1499
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
1158 "%s%s%s",
1803fe44871e cookies follow draft spec's simple parsing
corvid <corvid@lavabit.com>
parents: 1498
diff changeset
1159 cookie->name, *cookie->name ? "=" : "", cookie->value);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1160 dStr_append(cookie_dstring,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1161 dList_length(matching_cookies) > i + 1 ? "; " : "\r\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1162 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1163 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1164
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1165 dList_free(matching_cookies);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1166 str = cookie_dstring->str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1167 dStr_free(cookie_dstring, FALSE);
1504
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
1168
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
1169 if (*str)
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
1170 cookies_use_counter++;
d10adebe95fb when too many cookies for domain, rm least recently used
corvid <corvid@lavabit.com>
parents: 1503
diff changeset
1171
1506
408f86fed820 make cookies very chatty for now
corvid <corvid@lavabit.com>
parents: 1505
diff changeset
1172 MSG("%s GETTING: %s\n", url_host, str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1173 return str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1174 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1175
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1176 /* -------------------------------------------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1177 * Access control routines
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1178 * ------------------------------------------------------------- */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1179
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1180
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1181 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1182 * Get the cookie control rules (from cookiesrc).
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1183 * Return value:
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1184 * 0 = Parsed OK, with cookies enabled
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1185 * 1 = Parsed OK, with cookies disabled
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1186 * 2 = Can't open the control file
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1187 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1188 static int Cookie_control_init(void)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1189 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1190 CookieControl cc;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1191 FILE *stream;
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1192 char *filename, *rc;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1193 char line[LINE_MAXLEN];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1194 char domain[LINE_MAXLEN];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1195 char rule[LINE_MAXLEN];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1196 int i, j;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1197 bool_t enabled = FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1198
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1199 /* Get a file pointer */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1200 filename = dStrconcat(dGethomedir(), "/.dillo/cookiesrc", NULL);
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
1201 stream = Cookies_fopen(filename, "r", "DEFAULT DENY\n");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1202 dFree(filename);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1203
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1204 if (!stream)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1205 return 2;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1206
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1207 /* Get all lines in the file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1208 while (!feof(stream)) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1209 line[0] = '\0';
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1210 rc = fgets(line, LINE_MAXLEN, stream);
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1211 if (!rc && ferror(stream)) {
1503
f02eb59edc7d cookies: a little cleaning
corvid <corvid@lavabit.com>
parents: 1501
diff changeset
1212 MSG("Error while reading rule from cookiesrc: %s\n",
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1213 dStrerror(errno));
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1214 break; /* bail out */
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1215 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1216
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1217 /* Remove leading and trailing whitespaces */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1218 dStrstrip(line);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1219
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1220 if (line[0] != '\0' && line[0] != '#') {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1221 i = 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1222 j = 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1223
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1224 /* Get the domain */
1221
f34b803b8639 Handle signed chars. Aadded dIsspace() and dIsalnum() to dlib
Jorge Arellano Cid <jcid@dillo.org>
parents: 1201
diff changeset
1225 while (line[i] != '\0' && !dIsspace(line[i]))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1226 domain[j++] = line[i++];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1227 domain[j] = '\0';
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1228
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1229 /* Skip past whitespaces */
1221
f34b803b8639 Handle signed chars. Aadded dIsspace() and dIsalnum() to dlib
Jorge Arellano Cid <jcid@dillo.org>
parents: 1201
diff changeset
1230 while (dIsspace(line[i]))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1231 i++;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1232
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1233 /* Get the rule */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1234 j = 0;
1221
f34b803b8639 Handle signed chars. Aadded dIsspace() and dIsalnum() to dlib
Jorge Arellano Cid <jcid@dillo.org>
parents: 1201
diff changeset
1235 while (line[i] != '\0' && !dIsspace(line[i]))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1236 rule[j++] = line[i++];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1237 rule[j] = '\0';
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1238
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1239 if (dStrcasecmp(rule, "ACCEPT") == 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1240 cc.action = COOKIE_ACCEPT;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1241 else if (dStrcasecmp(rule, "ACCEPT_SESSION") == 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1242 cc.action = COOKIE_ACCEPT_SESSION;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1243 else if (dStrcasecmp(rule, "DENY") == 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1244 cc.action = COOKIE_DENY;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1245 else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1246 MSG("Cookies: rule '%s' for domain '%s' is not recognised.\n",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1247 rule, domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1248 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1249 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1250
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1251 cc.domain = dStrdup(domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1252 if (dStrcasecmp(cc.domain, "DEFAULT") == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1253 /* Set the default action */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1254 default_action = cc.action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1255 dFree(cc.domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1256 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1257 a_List_add(ccontrol, num_ccontrol, num_ccontrol_max);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1258 ccontrol[num_ccontrol++] = cc;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1259 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1260
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1261 if (cc.action != COOKIE_DENY)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1262 enabled = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1263 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1264 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1265
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1266 fclose(stream);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1267
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1268 return (enabled ? 0 : 1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1269 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1270
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1271 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1272 * Check the rules for an appropriate action for this domain
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1273 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1274 static CookieControlAction Cookies_control_check_domain(const char *domain)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1275 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1276 int i, diff;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1277
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1278 for (i = 0; i < num_ccontrol; i++) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1279 if (ccontrol[i].domain[0] == '.') {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1280 diff = strlen(domain) - strlen(ccontrol[i].domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1281 if (diff >= 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1282 if (dStrcasecmp(domain + diff, ccontrol[i].domain) != 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1283 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1284 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1285 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1286 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1287 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1288 if (dStrcasecmp(domain, ccontrol[i].domain) != 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1289 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1290 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1291
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1292 /* If we got here we have a match */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1293 return( ccontrol[i].action );
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1294 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1295
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1296 return default_action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1297 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1298
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1299 /* -- Dpi parser ----------------------------------------------------------- */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1300
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1301 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1302 * Parse a data stream (dpi protocol)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1303 * Note: Buf is a zero terminated string
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1304 * Return code: { 0:OK, 1:Abort, 2:Close }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1305 */
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1306 static int srv_parse_tok(Dsh *sh, ClientInfo *client, char *Buf)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1307 {
1599
2b3aee52932a fix dpip cmd leak
corvid <corvid@lavabit.com>
parents: 1546
diff changeset
1308 char *cmd, *cookie, *host, *path;
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1309 int ret = 1;
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1310 size_t BufSize = strlen(Buf);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1311
1236
b912173aecd1 Added a_Dpip_get_attr_l() to DPIP's API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1221
diff changeset
1312 cmd = a_Dpip_get_attr_l(Buf, BufSize, "cmd");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1313
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1314 if (!cmd) {
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1315 /* abort */
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1316 } else if (client->status == 0) {
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1317 /* authenticate */
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1318 if (a_Dpip_check_auth(Buf) == 1) {
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1319 client->status = 1;
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1320 ret = 0;
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1321 }
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1322 } else if (strcmp(cmd, "DpiBye") == 0) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1323 dFree(cmd);
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1324 MSG("(pid %d): Got DpiBye.\n", (int)getpid());
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1325 exit(0);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1326
1599
2b3aee52932a fix dpip cmd leak
corvid <corvid@lavabit.com>
parents: 1546
diff changeset
1327 } else if (strcmp(cmd, "set_cookie") == 0) {
1531
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1328 int st;
1501
6fd1c55d8022 cookies use server date to interpret Expires attr
corvid <corvid@lavabit.com>
parents: 1500
diff changeset
1329 char *date;
6fd1c55d8022 cookies use server date to interpret Expires attr
corvid <corvid@lavabit.com>
parents: 1500
diff changeset
1330
1236
b912173aecd1 Added a_Dpip_get_attr_l() to DPIP's API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1221
diff changeset
1331 cookie = a_Dpip_get_attr_l(Buf, BufSize, "cookie");
b912173aecd1 Added a_Dpip_get_attr_l() to DPIP's API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1221
diff changeset
1332 host = a_Dpip_get_attr_l(Buf, BufSize, "host");
b912173aecd1 Added a_Dpip_get_attr_l() to DPIP's API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1221
diff changeset
1333 path = a_Dpip_get_attr_l(Buf, BufSize, "path");
1501
6fd1c55d8022 cookies use server date to interpret Expires attr
corvid <corvid@lavabit.com>
parents: 1500
diff changeset
1334 date = a_Dpip_get_attr_l(Buf, BufSize, "date");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1335
1531
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1336 st = Cookies_set(cookie, host, path, date);
1599
2b3aee52932a fix dpip cmd leak
corvid <corvid@lavabit.com>
parents: 1546
diff changeset
1337
2b3aee52932a fix dpip cmd leak
corvid <corvid@lavabit.com>
parents: 1546
diff changeset
1338 dFree(cmd);
1531
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1339 cmd = a_Dpip_build_cmd("cmd=%s msg=%s", "set_cookie_answer",
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1340 st == 0 ? "ok" : "not set");
4810e433ed3f dpi send response when setting cookies
Jorge Arellano Cid <jcid@dillo.org>
parents: 1527
diff changeset
1341 a_Dpip_dsh_write_str(sh, 1, cmd);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1342
1501
6fd1c55d8022 cookies use server date to interpret Expires attr
corvid <corvid@lavabit.com>
parents: 1500
diff changeset
1343 dFree(date);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1344 dFree(path);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1345 dFree(host);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1346 dFree(cookie);
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1347 ret = 2;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1348
1599
2b3aee52932a fix dpip cmd leak
corvid <corvid@lavabit.com>
parents: 1546
diff changeset
1349 } else if (strcmp(cmd, "get_cookie") == 0) {
2b3aee52932a fix dpip cmd leak
corvid <corvid@lavabit.com>
parents: 1546
diff changeset
1350 char *scheme = a_Dpip_get_attr_l(Buf, BufSize, "scheme");
2b3aee52932a fix dpip cmd leak
corvid <corvid@lavabit.com>
parents: 1546
diff changeset
1351
1236
b912173aecd1 Added a_Dpip_get_attr_l() to DPIP's API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1221
diff changeset
1352 host = a_Dpip_get_attr_l(Buf, BufSize, "host");
b912173aecd1 Added a_Dpip_get_attr_l() to DPIP's API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1221
diff changeset
1353 path = a_Dpip_get_attr_l(Buf, BufSize, "path");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1354
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1355 cookie = Cookies_get(host, path, scheme);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1356 dFree(scheme);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1357 dFree(path);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1358 dFree(host);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1359
1599
2b3aee52932a fix dpip cmd leak
corvid <corvid@lavabit.com>
parents: 1546
diff changeset
1360 dFree(cmd);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1361 cmd = a_Dpip_build_cmd("cmd=%s cookie=%s", "get_cookie_answer", cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1362
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1363 if (a_Dpip_dsh_write_str(sh, 1, cmd)) {
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1364 ret = 1;
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1365 } else {
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1366 _MSG("a_Dpip_dsh_write_str: SUCCESS cmd={%s}\n", cmd);
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1367 ret = 2;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1368 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1369 dFree(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1370 }
1599
2b3aee52932a fix dpip cmd leak
corvid <corvid@lavabit.com>
parents: 1546
diff changeset
1371 dFree(cmd);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1372
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1373 return ret;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1374 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1375
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1376 /* -- Termination handlers ----------------------------------------------- */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1377 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1378 * (was to delete the local namespace socket),
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1379 * but this is handled by 'dpid' now.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1380 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1381 static void cleanup(void)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1382 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1383 Cookies_save_and_free();
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1384 MSG("cleanup\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1385 /* no more cleanup required */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1386 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1387
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1388 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1389 * Perform any necessary cleanups upon abnormal termination
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1390 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1391 static void termination_handler(int signum)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1392 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1393 exit(signum);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1394 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1395
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1396
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1397 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1398 * -- MAIN -------------------------------------------------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1399 */
1385
eb98997886ec Introduced the new tokenizing dsh API to DPIP
Jorge Arellano Cid <jcid@dillo.org>
parents: 1236
diff changeset
1400 int main(void) {
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1401 struct sockaddr_in sin;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1402 socklen_t address_size;
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1403 ClientInfo *client;
1439
79fcf67eeea0 Fixed bookmarks "cancel" link (Add/Mod URL, Add Sec). Also s/tmp_fd/sock_fd.
Jorge Arellano Cid <jcid@dillo.org>
parents: 1388
diff changeset
1404 int sock_fd, code;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1405 char *buf;
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1406 Dsh *sh;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1407
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1408 /* Arrange the cleanup function for terminations via exit() */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1409 atexit(cleanup);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1410
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1411 /* Arrange the cleanup function for abnormal terminations */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1412 if (signal (SIGINT, termination_handler) == SIG_IGN)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1413 signal (SIGINT, SIG_IGN);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1414 if (signal (SIGHUP, termination_handler) == SIG_IGN)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1415 signal (SIGHUP, SIG_IGN);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1416 if (signal (SIGTERM, termination_handler) == SIG_IGN)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1417 signal (SIGTERM, SIG_IGN);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1418
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1419 Cookies_init();
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1420 MSG("(v.1) accepting connections...\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1421
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1422 if (disabled)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1423 exit(1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1424
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1425 /* some OSes may need this... */
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1426 address_size = sizeof(struct sockaddr_in);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1427
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1428 while (1) {
1439
79fcf67eeea0 Fixed bookmarks "cancel" link (Add/Mod URL, Add Sec). Also s/tmp_fd/sock_fd.
Jorge Arellano Cid <jcid@dillo.org>
parents: 1388
diff changeset
1429 sock_fd = accept(STDIN_FILENO, (struct sockaddr *)&sin, &address_size);
79fcf67eeea0 Fixed bookmarks "cancel" link (Add/Mod URL, Add Sec). Also s/tmp_fd/sock_fd.
Jorge Arellano Cid <jcid@dillo.org>
parents: 1388
diff changeset
1430 if (sock_fd == -1) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1431 perror("[accept]");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1432 exit(1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1433 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1434
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1435 /* create the Dsh structure */
1439
79fcf67eeea0 Fixed bookmarks "cancel" link (Add/Mod URL, Add Sec). Also s/tmp_fd/sock_fd.
Jorge Arellano Cid <jcid@dillo.org>
parents: 1388
diff changeset
1436 sh = a_Dpip_dsh_new(sock_fd, sock_fd, 8*1024);
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1437 client = dNew(ClientInfo,1);
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1438 client->sh = sh;
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1439 client->status = 0;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1440
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1441 while (1) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1442 code = 1;
1388
eb35203124e4 Implemented the file dpi based on select() (removed its pthreads dependency)
Jorge Arellano Cid <jcid@dillo.org>
parents: 1387
diff changeset
1443 if ((buf = a_Dpip_dsh_read_token(sh, 1)) != NULL) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1444 /* Let's see what we fished... */
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1445 _MSG(" buf = {%s}\n", buf);
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1446 code = srv_parse_tok(sh, client, buf);
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1447 dFree(buf);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1448 }
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1449
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1450 _MSG(" code = %d %s\n", code, code == 1 ? "EXIT" : "BREAK");
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1451 if (code == 1) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1452 exit(1);
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1453 } else if (code == 2) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1454 break;
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1455 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1456 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1457
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1458 _MSG("Closing Dsh\n");
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1459 a_Dpip_dsh_close(sh);
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1460 a_Dpip_dsh_free(sh);
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1461 dFree(client);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1462
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1463 }/*while*/
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1464
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1465 return 0;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1466 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1467
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1468 #endif /* !DISABLE_COOKIES */