annotate dpi/cookies.c @ 1624:d7761a69d274

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