annotate dpi/cookies.c @ 1498:c04b0de69b00

cookies follow draft spec for domains
author corvid <corvid@lavabit.com>
date Sat, 09 Jan 2010 20:05:22 +0000
parents 4ecebf934b44
children 1803fe44871e
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 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
67 * a_List_add()
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
68 *
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
69 * Make sure there's space for 'num_items' items within the list
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
70 * (First, allocate an 'alloc_step' sized chunk, after that, double the
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
71 * list size --to make it faster)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
72 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
73 #define a_List_add(list,num_items,alloc_step) \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
74 if (!list) { \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
75 list = dMalloc(alloc_step * sizeof((*list))); \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
76 } \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
77 if (num_items >= alloc_step){ \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
78 while ( num_items >= alloc_step ) \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
79 alloc_step <<= 1; \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
80 list = dRealloc(list, alloc_step * sizeof((*list))); \
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
81 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
82
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
83 /* The maximum length of a line in the cookie file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
84 #define LINE_MAXLEN 4096
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
85
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
86 typedef enum {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
87 COOKIE_ACCEPT,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
88 COOKIE_ACCEPT_SESSION,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
89 COOKIE_DENY
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
90 } CookieControlAction;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
91
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
92 typedef struct {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
93 char *domain;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
94 CookieControlAction action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
95 } CookieControl;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
96
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
97 typedef struct {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
98 char *domain;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
99 Dlist *dlist;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
100 } CookieNode;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
101
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
102 typedef struct {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
103 char *name;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
104 char *value;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
105 char *domain;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
106 char *path;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
107 time_t expires_at;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
108 bool_t secure;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
109 bool_t session_only;
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
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
121 /* List of CookieNode. Each node holds a domain and its list of cookies */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
122 static Dlist *cookies;
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
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
130 static bool_t disabled;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
131 static FILE *file_stream;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
132 static char *cookies_txt_header_str =
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
133 "# HTTP Cookie File\n"
235
480d368c4b2f - Updated some old URLs.
jcid
parents: 219
diff changeset
134 "# http://wp.netscape.com/newsref/std/cookie_spec.html\n"
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
135 "# This is a generated file! Do not edit.\n\n";
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
136
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
137
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
138 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
139 * Forward declarations
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
140 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
141
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
142 static CookieControlAction Cookies_control_check_domain(const char *domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
143 static int Cookie_control_init(void);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
144 static void Cookies_add_cookie(CookieData_t *cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
145 static void Cookies_remove_cookie(CookieData_t *cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
146 static int Cookies_cmp(const void *a, const void *b);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
147
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
148 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
149 * Compare function for searching a cookie node
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
150 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
151 static int Cookie_node_cmp(const void *v1, const void *v2)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
152 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
153 const CookieNode *n1 = v1, *n2 = v2;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
154
1484
29d892265da0 domain comparison not case-sensitive
corvid <corvid@lavabit.com>
parents: 1483
diff changeset
155 return dStrcasecmp(n1->domain, n2->domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
156 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
157
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
158 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
159 * Compare function for searching a cookie node by domain
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
160 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
161 static int Cookie_node_by_domain_cmp(const void *v1, const void *v2)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
162 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
163 const CookieNode *node = v1;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
164 const char *domain = v2;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
165
1484
29d892265da0 domain comparison not case-sensitive
corvid <corvid@lavabit.com>
parents: 1483
diff changeset
166 return dStrcasecmp(node->domain, domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
167 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
168
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
169 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
170 * Return a file pointer. If the file doesn't exist, try to create it,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
171 * with the optional 'init_str' as its content.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
172 */
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
173 static FILE *Cookies_fopen(const char *filename, const char *mode,
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
174 char *init_str)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
175 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
176 FILE *F_in;
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
177 int fd, rc;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
178
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
179 if ((F_in = fopen(filename, mode)) == NULL) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
180 /* Create the file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
181 fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
182 if (fd != -1) {
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
183 if (init_str) {
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
184 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
185 if (rc == -1) {
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
186 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
187 filename, dStrerror(errno));
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
188 }
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
189 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
190 close(fd);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
191
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
192 MSG("Created file: %s\n", filename);
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
193 F_in = fopen(filename, mode);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
194 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
195 MSG("Could not create file: %s!\n", filename);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
196 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
197 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
198
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
199 if (F_in) {
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
200 /* set close on exec */
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
201 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
202 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
203
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
204 return F_in;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
205 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
206
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
207 static void Cookies_free_cookie(CookieData_t *cookie)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
208 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
209 dFree(cookie->name);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
210 dFree(cookie->value);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
211 dFree(cookie->domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
212 dFree(cookie->path);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
213 dFree(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
214 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
215
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
216 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
217 * Initialize the cookies module
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
218 * (The 'disabled' variable is writable only within Cookies_init)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
219 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
220 static void Cookies_init()
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
221 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
222 CookieData_t *cookie;
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
223 char *filename, *rc = NULL;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
224 char line[LINE_MAXLEN];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
225 #ifndef HAVE_LOCKF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
226 struct flock lck;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
227 #endif
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
228
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
229 /* Default setting */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
230 disabled = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
231
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
232 /* Read and parse the cookie control file (cookiesrc) */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
233 if (Cookie_control_init() != 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
234 MSG("Disabling cookies.\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
235 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
236 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
237
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
238 /* Get a stream for the cookies file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
239 filename = dStrconcat(dGethomedir(), "/.dillo/cookies.txt", NULL);
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
240 file_stream = Cookies_fopen(filename, "r+", cookies_txt_header_str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
241
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
242 dFree(filename);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
243
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
244 if (!file_stream) {
1495
a83b066cbcb3 rm support for ancient ~/.dillo/cookies file
corvid <corvid@lavabit.com>
parents: 1491
diff changeset
245 MSG("ERROR: Can't open ~/.dillo/cookies.txt; disabling cookies\n");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
246 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
247 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
248
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
249 /* Try to get a lock from the file descriptor */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
250 #ifdef HAVE_LOCKF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
251 disabled = (lockf(fileno(file_stream), F_TLOCK, 0) == -1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
252 #else /* POSIX lock */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
253 lck.l_start = 0; /* start at beginning of file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
254 lck.l_len = 0; /* lock entire file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
255 lck.l_type = F_WRLCK;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
256 lck.l_whence = SEEK_SET; /* absolute offset */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
257
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
258 disabled = (fcntl(fileno(file_stream), F_SETLK, &lck) == -1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
259 #endif
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
260 if (disabled) {
1495
a83b066cbcb3 rm support for ancient ~/.dillo/cookies file
corvid <corvid@lavabit.com>
parents: 1491
diff changeset
261 MSG("The cookies file has a file lock; disabling cookies!\n");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
262 fclose(file_stream);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
263 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
264 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
265
1495
a83b066cbcb3 rm support for ancient ~/.dillo/cookies file
corvid <corvid@lavabit.com>
parents: 1491
diff changeset
266 MSG("Enabling cookies as per cookiesrc...\n");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
267
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
268 cookies = dList_new(32);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
269
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
270 /* Get all lines in the file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
271 while (!feof(file_stream)) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
272 line[0] = '\0';
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
273 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
274 if (!rc && ferror(file_stream)) {
1201
cabde55d0e05 fix cookies dpi MSGs
corvid <corvid@lavabit.com>
parents: 1200
diff changeset
275 MSG("Cookies1: Error while reading from cookies.txt: %s\n",
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
276 dStrerror(errno));
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
277 break; /* bail out */
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
278 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
279
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
280 /* Remove leading and trailing whitespaces */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
281 dStrstrip(line);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
282
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
283 if ((line[0] != '\0') && (line[0] != '#')) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
284 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
285 * Split the row into pieces using a tab as the delimiter.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
286 * pieces[0] The domain name
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
287 * pieces[1] TRUE/FALSE: is the domain a suffix, or a full domain?
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
288 * pieces[2] The path
1495
a83b066cbcb3 rm support for ancient ~/.dillo/cookies file
corvid <corvid@lavabit.com>
parents: 1491
diff changeset
289 * pieces[3] TRUE/FALSE: is the cookie for secure use only?
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
290 * pieces[4] Timestamp of expire date
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
291 * pieces[5] Name of the cookie
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
292 * pieces[6] Value of the cookie
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
293 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
294 CookieControlAction action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
295 char *piece;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
296 char *line_marker = line;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
297
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
298 cookie = dNew0(CookieData_t, 1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
299
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
300 cookie->session_only = FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
301 cookie->domain = dStrdup(dStrsep(&line_marker, "\t"));
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
302 dStrsep(&line_marker, "\t"); /* we use domain always as sufix */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
303 cookie->path = dStrdup(dStrsep(&line_marker, "\t"));
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
304 piece = dStrsep(&line_marker, "\t");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
305 if (piece != NULL && piece[0] == 'T')
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
306 cookie->secure = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
307 piece = dStrsep(&line_marker, "\t");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
308 if (piece != NULL)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
309 cookie->expires_at = (time_t) strtol(piece, NULL, 10);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
310 cookie->name = dStrdup(dStrsep(&line_marker, "\t"));
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
311 cookie->value = dStrdup(dStrsep(&line_marker, "\t"));
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
312
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
313 if (!cookie->domain || cookie->domain[0] == '\0' ||
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
314 !cookie->path || cookie->path[0] != '/' ||
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
315 !cookie->name || cookie->name[0] == '\0' ||
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
316 !cookie->value) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
317 MSG("Malformed line in cookies.txt file!\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
318 Cookies_free_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
319 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
320 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
321
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
322 action = Cookies_control_check_domain(cookie->domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
323 if (action == COOKIE_DENY) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
324 Cookies_free_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
325 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
326 } else if (action == COOKIE_ACCEPT_SESSION) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
327 cookie->session_only = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
328 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
329
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
330 /* Save cookie in memory */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
331 Cookies_add_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
332 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
333 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
334 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
335
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
336 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
337 * Flush cookies to disk and free all the memory allocated.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
338 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
339 static void Cookies_save_and_free()
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
340 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
341 int i, fd;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
342 CookieNode *node;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
343 CookieData_t *cookie;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
344
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
345 #ifndef HAVE_LOCKF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
346 struct flock lck;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
347 #endif
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
348
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
349 if (disabled)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
350 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
351
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
352 rewind(file_stream);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
353 fd = fileno(file_stream);
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
354 if (ftruncate(fd, 0) == -1)
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
355 MSG("Cookies: Truncate file stream failed: %s\n", dStrerror(errno));
454
c0d3c2ec7140 - Fixed a printf bug in cookies dpi.
jcid
parents: 445
diff changeset
356 fprintf(file_stream, "%s", cookies_txt_header_str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
357
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
358 /* Iterate cookies per domain, saving and freeing */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
359 while ((node = dList_nth_data(cookies, 0))) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
360 for (i = 0; (cookie = dList_nth_data(node->dlist, i)); ++i) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
361 if (!cookie->session_only) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
362 fprintf(file_stream, "%s\tTRUE\t%s\t%s\t%ld\t%s\t%s\n",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
363 cookie->domain,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
364 cookie->path,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
365 cookie->secure ? "TRUE" : "FALSE",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
366 (long)cookie->expires_at,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
367 cookie->name,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
368 cookie->value);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
369 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
370
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
371 Cookies_free_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
372 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
373 dList_remove(cookies, node);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
374 dFree(node->domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
375 dList_free(node->dlist);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
376 dFree(node);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
377 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
378
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
379 #ifdef HAVE_LOCKF
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
380 lockf(fd, F_ULOCK, 0);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
381 #else /* POSIX file lock */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
382 lck.l_start = 0; /* start at beginning of file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
383 lck.l_len = 0; /* lock entire file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
384 lck.l_type = F_UNLCK;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
385 lck.l_whence = SEEK_SET; /* absolute offset */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
386
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
387 fcntl(fileno(file_stream), F_SETLKW, &lck);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
388 #endif
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
389 fclose(file_stream);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
390 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
391
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
392 static char *months[] =
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
393 { "",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
394 "Jan", "Feb", "Mar",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
395 "Apr", "May", "Jun",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
396 "Jul", "Aug", "Sep",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
397 "Oct", "Nov", "Dec"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
398 };
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
399
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
400 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
401 * Take a months name and return a number between 1-12.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
402 * E.g. 'April' -> 4
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
403 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
404 static int Cookies_get_month(const char *month_name)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
405 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
406 int i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
407
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
408 for (i = 1; i <= 12; i++) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
409 if (!dStrncasecmp(months[i], month_name, 3))
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
410 return i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
411 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
412 return 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
413 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
414
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
415 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
416 * Return a local timestamp from a GMT date string
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
417 * Accept: RFC-1123 | RFC-850 | ANSI asctime | Old Netscape format.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
418 *
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
419 * Wdy, DD-Mon-YY HH:MM:SS GMT
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
420 * Wdy, DD-Mon-YYYY HH:MM:SS GMT
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
421 * Weekday, DD-Mon-YY HH:MM:SS GMT
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
422 * Weekday, DD-Mon-YYYY HH:MM:SS GMT
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
423 * Tue May 21 13:46:22 1991\n
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
424 * Tue May 21 13:46:22 1991
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
425 *
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
426 * (return 0 on malformed date string syntax)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
427 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
428 static time_t Cookies_create_timestamp(const char *expires)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
429 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
430 time_t ret;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
431 int day, month, year, hour, minutes, seconds;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
432 char *cp;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
433 char *E_msg =
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
434 "Expire date is malformed!\n"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
435 " (should be RFC-1123 | RFC-850 | ANSI asctime)\n"
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
436 " Ignoring cookie: ";
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
437
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
438 cp = strchr(expires, ',');
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
439 if (!cp && (strlen(expires) == 24 || strlen(expires) == 25)) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
440 /* Looks like ANSI asctime format... */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
441 cp = (char *)expires;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
442 day = strtol(cp + 8, NULL, 10); /* day */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
443 month = Cookies_get_month(cp + 4); /* month */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
444 year = strtol(cp + 20, NULL, 10); /* year */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
445 hour = strtol(cp + 11, NULL, 10); /* hour */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
446 minutes = strtol(cp + 14, NULL, 10); /* minutes */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
447 seconds = strtol(cp + 17, NULL, 10); /* seconds */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
448
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
449 } else if (cp && (cp - expires == 3 || cp - expires > 5) &&
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
450 (strlen(cp) == 24 || strlen(cp) == 26)) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
451 /* RFC-1123 | RFC-850 format | Old Netscape format */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
452 day = strtol(cp + 2, NULL, 10);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
453 month = Cookies_get_month(cp + 5);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
454 year = strtol(cp + 9, &cp, 10);
368
2242da885677 - s/todo:/TODO:/g
jcid
parents: 235
diff changeset
455 /* TODO: tricky, because two digits for year IS ambiguous! */
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
456 year += (year < 70) ? 2000 : ((year < 100) ? 1900 : 0);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
457 hour = strtol(cp + 1, NULL, 10);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
458 minutes = strtol(cp + 4, NULL, 10);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
459 seconds = strtol(cp + 7, NULL, 10);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
460
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
461 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
462 MSG("%s%s\n", E_msg, expires);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
463 return (time_t) 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
464 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
465
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
466 /* Error checks --this may be overkill */
1127
65c7e33e4466 allow year 1970 in cookies
corvid <corvid@lavabit.com>
parents: 454
diff changeset
467 if (!(day > 0 && day < 32 && month > 0 && month < 13 && year >= 1970 &&
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
468 hour >= 0 && hour < 24 && minutes >= 0 && minutes < 60 &&
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
469 seconds >= 0 && seconds < 60)) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
470 MSG("%s%s\n", E_msg, expires);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
471 return (time_t) 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
472 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
473
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
474 /* Calculate local timestamp.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
475 * [stolen from Lynx... (http://lynx.browser.org)] */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
476 month -= 3;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
477 if (month < 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
478 month += 12;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
479 year--;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
480 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
481
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
482 day += (year - 1968) * 1461 / 4;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
483 day += ((((month * 153) + 2) / 5) - 672);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
484 ret = (time_t)((day * 60 * 60 * 24) +
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
485 (hour * 60 * 60) +
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
486 (minutes * 60) +
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
487 seconds);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
488
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
489 MSG("Expires in %ld seconds, at %s",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
490 (long)ret - time(NULL), ctime(&ret));
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
491
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
492 return ret;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
493 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
494
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
495 static void Cookies_add_cookie(CookieData_t *cookie)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
496 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
497 Dlist *domain_cookies;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
498 CookieData_t *c;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
499 CookieNode *node;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
500
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
501 node = dList_find_sorted(cookies, cookie->domain,Cookie_node_by_domain_cmp);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
502 domain_cookies = (node) ? node->dlist : NULL;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
503
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
504 if (domain_cookies) {
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
505 /* Remove any cookies with the same name and path */
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
506 while ((c = dList_find_custom(domain_cookies, cookie, Cookies_cmp))){
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
507 Cookies_remove_cookie(c);
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
508 }
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
509
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
510 /* Respect the limit of 20 cookies per domain */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
511 if (dList_length(domain_cookies) >= 20) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
512 MSG("There are too many cookies for this domain (%s)\n",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
513 cookie->domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
514 Cookies_free_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
515 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
516 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
517
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
518 }
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
519
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
520 /* Don't add an expired cookie. Strictly speaking, max-age cookies should
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
521 * only be discarded when "the age is _greater_ than delta-seconds seconds"
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
522 * (my emphasis), but "A value of zero means the cookie SHOULD be discarded
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
523 * immediately", and there's no compelling reason to distinguish between
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
524 * these cases. */
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
525 if (cookie->expires_at <= time(NULL)) {
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
526 Cookies_free_cookie(cookie);
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
527 return;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
528 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
529
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
530 /* add the cookie into the respective domain list */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
531 node = dList_find_sorted(cookies, cookie->domain,Cookie_node_by_domain_cmp);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
532 domain_cookies = (node) ? node->dlist : NULL;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
533 if (!domain_cookies) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
534 domain_cookies = dList_new(5);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
535 dList_append(domain_cookies, cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
536 node = dNew(CookieNode, 1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
537 node->domain = dStrdup(cookie->domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
538 node->dlist = domain_cookies;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
539 dList_insert_sorted(cookies, node, Cookie_node_cmp);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
540 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
541 dList_append(domain_cookies, cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
542 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
543 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
544
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
545 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
546 * Remove the cookie from the domain list.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
547 * If the domain list is empty, remove the node too.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
548 * Free the cookie.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
549 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
550 static void Cookies_remove_cookie(CookieData_t *cookie)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
551 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
552 CookieNode *node;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
553
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
554 node = dList_find_sorted(cookies, cookie->domain,Cookie_node_by_domain_cmp);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
555 if (node) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
556 dList_remove(node->dlist, cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
557 if (dList_length(node->dlist) == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
558 dList_remove(cookies, node);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
559 dFree(node->domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
560 dList_free(node->dlist);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
561 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
562 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
563 MSG("Attempting to remove a cookie that doesn't exist!\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
564 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
565
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
566 Cookies_free_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
567 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
568
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
569 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
570 * Return the attribute that is present at *cookie_str. This function
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
571 * will also attempt to advance cookie_str past any equal-sign.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
572 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
573 static char *Cookies_parse_attr(char **cookie_str)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
574 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
575 char *str = *cookie_str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
576 uint_t i, end = 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
577 bool_t got_attr = FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
578
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
579 for (i = 0; ; i++) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
580 switch (str[i]) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
581 case ' ':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
582 case '\t':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
583 case '=':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
584 case ';':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
585 got_attr = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
586 if (end == 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
587 end = i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
588 break;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
589 case ',':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
590 *cookie_str = str + i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
591 return dStrndup(str, i);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
592 break;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
593 case '\0':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
594 if (!got_attr) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
595 end = i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
596 got_attr = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
597 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
598 /* fall through! */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
599 default:
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
600 if (got_attr) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
601 *cookie_str = str + i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
602 return dStrndup(str, end);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
603 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
604 break;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
605 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
606 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
607
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
608 return NULL;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
609 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
610
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
611 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
612 * Get the value starting at *cookie_str.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
613 * broken_syntax: watch out for stupid syntax (comma in unquoted string...)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
614 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
615 static char *Cookies_parse_value(char **cookie_str,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
616 bool_t broken_syntax,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
617 bool_t keep_quotes)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
618 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
619 uint_t i, end;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
620 char *str = *cookie_str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
621
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
622 for (i = end = 0; !end; ++i) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
623 switch (str[i]) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
624 case ' ':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
625 case '\t':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
626 if (!broken_syntax && str[0] != '\'' && str[0] != '"') {
1481
4a6917683a2d handle whitespace following cookie attribute value
corvid <corvid@lavabit.com>
parents: 1439
diff changeset
627 end = 1;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
628 *cookie_str = str + i + 1;
1481
4a6917683a2d handle whitespace following cookie attribute value
corvid <corvid@lavabit.com>
parents: 1439
diff changeset
629 while (**cookie_str == ' ' || **cookie_str == '\t')
4a6917683a2d handle whitespace following cookie attribute value
corvid <corvid@lavabit.com>
parents: 1439
diff changeset
630 *cookie_str += 1;
4a6917683a2d handle whitespace following cookie attribute value
corvid <corvid@lavabit.com>
parents: 1439
diff changeset
631 if (**cookie_str == ';')
4a6917683a2d handle whitespace following cookie attribute value
corvid <corvid@lavabit.com>
parents: 1439
diff changeset
632 *cookie_str += 1;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
633 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
634 break;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
635 case '\'':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
636 case '"':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
637 if (i != 0 && str[i] == str[0]) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
638 char *tmp = str + i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
639
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
640 while (*tmp != '\0' && *tmp != ';' && *tmp != ',')
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
641 tmp++;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
642
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
643 *cookie_str = (*tmp == ';') ? tmp + 1 : tmp;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
644
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
645 if (keep_quotes)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
646 i++;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
647 end = 1;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
648 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
649 break;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
650 case '\0':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
651 *cookie_str = str + i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
652 end = 1;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
653 break;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
654 case ',':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
655 if (str[0] != '\'' && str[0] != '"' && !broken_syntax) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
656 /* A new cookie starts here! */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
657 *cookie_str = str + i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
658 end = 1;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
659 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
660 break;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
661 case ';':
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
662 if (str[0] != '\'' && str[0] != '"') {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
663 *cookie_str = str + i + 1;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
664 end = 1;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
665 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
666 break;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
667 default:
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
668 break;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
669 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
670 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
671 /* keep i as an index to the last char */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
672 --i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
673
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
674 if ((str[0] == '\'' || str[0] == '"') && !keep_quotes) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
675 return i > 1 ? dStrndup(str + 1, i - 1) : NULL;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
676 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
677 return dStrndup(str, i);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
678 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
679 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
680
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
681 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
682 * Parse one cookie...
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
683 */
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
684 static CookieData_t *Cookies_parse_one(char **cookie_str)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
685 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
686 CookieData_t *cookie;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
687 char *str = *cookie_str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
688 char *attr;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
689 char *value;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
690 int num_attr = 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
691 bool_t max_age = FALSE;
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
692 bool_t expires = FALSE;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
693 bool_t discard = FALSE;
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
694 bool_t error = FALSE;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
695
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
696 cookie = dNew0(CookieData_t, 1);
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
697
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
698 /* let's arbitrarily choose a year for now */
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
699 cookie->expires_at = time(NULL) + 60 * 60 * 24 * 365;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
700
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
701 /* Iterate until there is nothing left of the string OR we come
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
702 * across a comma representing the start of another cookie */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
703 while (*str != '\0' && *str != ',') {
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
704 if (error) {
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
705 str++;
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
706 continue;
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
707 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
708 /* Skip whitespace */
1221
f34b803b8639 Handle signed chars. Aadded dIsspace() and dIsalnum() to dlib
Jorge Arellano Cid <jcid@dillo.org>
parents: 1201
diff changeset
709 while (dIsspace(*str))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
710 str++;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
711
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
712 /* Get attribute */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
713 attr = Cookies_parse_attr(&str);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
714 if (!attr) {
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
715 MSG("Cannot parse cookie attribute!\n");
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
716 error = TRUE;
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
717 continue;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
718 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
719
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
720 /* Get the value for the attribute and store it */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
721 if (num_attr == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
722 /* The first attr, which always is the user supplied attr, may
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
723 * have the same name as an ordinary attr. Hence this workaround. */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
724 cookie->name = dStrdup(attr);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
725 cookie->value = Cookies_parse_value(&str, FALSE, TRUE);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
726 } else if (dStrcasecmp(attr, "Path") == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
727 value = Cookies_parse_value(&str, FALSE, FALSE);
1491
a10148c0bcab cookies don't leak extra domain/path attrs
corvid <corvid@lavabit.com>
parents: 1490
diff changeset
728 dFree(cookie->path);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
729 cookie->path = value;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
730 } else if (dStrcasecmp(attr, "Domain") == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
731 value = Cookies_parse_value(&str, FALSE, FALSE);
1491
a10148c0bcab cookies don't leak extra domain/path attrs
corvid <corvid@lavabit.com>
parents: 1490
diff changeset
732 dFree(cookie->domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
733 cookie->domain = value;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
734 } else if (dStrcasecmp(attr, "Discard") == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
735 discard = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
736 } else if (dStrcasecmp(attr, "Max-Age") == 0) {
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
737 value = Cookies_parse_value(&str, FALSE, FALSE);
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
738 if (value) {
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
739 cookie->expires_at = time(NULL) + strtol(value, NULL, 10);
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
740 expires = max_age = TRUE;
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
741 dFree(value);
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
742 } else {
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
743 MSG("Cannot parse cookie Max-Age value!\n");
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
744 dFree(attr);
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
745 error = TRUE;
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
746 continue;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
747 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
748 } else if (dStrcasecmp(attr, "Expires") == 0) {
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
749 if (!max_age) {
1489
56dcaa255396 silence a MSG
corvid <corvid@lavabit.com>
parents: 1488
diff changeset
750 _MSG("Old Netscape-style cookie...\n");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
751 value = Cookies_parse_value(&str, TRUE, FALSE);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
752 if (value) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
753 cookie->expires_at = Cookies_create_timestamp(value);
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
754 expires = TRUE;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
755 dFree(value);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
756 } else {
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
757 MSG("Cannot parse cookie Expires value!\n");
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
758 dFree(attr);
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
759 error = TRUE;
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
760 continue;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
761 }
1483
d6776d51675d handle max-age + expires error case
corvid <corvid@lavabit.com>
parents: 1482
diff changeset
762 } else {
d6776d51675d handle max-age + expires error case
corvid <corvid@lavabit.com>
parents: 1482
diff changeset
763 MSG("Cookie cannot contain Max-Age and Expires.\n");
d6776d51675d handle max-age + expires error case
corvid <corvid@lavabit.com>
parents: 1482
diff changeset
764 dFree(attr);
d6776d51675d handle max-age + expires error case
corvid <corvid@lavabit.com>
parents: 1482
diff changeset
765 error = TRUE;
d6776d51675d handle max-age + expires error case
corvid <corvid@lavabit.com>
parents: 1482
diff changeset
766 continue;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
767 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
768 } else if (dStrcasecmp(attr, "Secure") == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
769 cookie->secure = TRUE;
418
b7265ec32e33 - Allow login to wikipedia by ignoring the HttpOnly attribute (cookies)
jcid
parents: 379
diff changeset
770 } else if (dStrcasecmp(attr, "HttpOnly") == 0) {
419
jcid
parents: 418
diff changeset
771 // this case is intentionally left blank, because we do not
jcid
parents: 418
diff changeset
772 // do client-side scripting (yet).
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
773 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
774 /* Oops! this can't be good... */
379
52f65d7a0e7c - minor cookie MSG improvement.
jcid
parents: 368
diff changeset
775 MSG("Cookie contains unknown attribute: '%s'\n", attr);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
776 dFree(attr);
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
777 error = TRUE;
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
778 continue;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
779 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
780
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
781 dFree(attr);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
782 num_attr++;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
783 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
784
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
785 /*
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
786 * Netscape cookie spec: "expires is an optional attribute. If not
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
787 * specified, the cookie will expire when the user's session ends."
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
788 * rfc 2965: (in the absence of) "Max-Age The default behavior is to
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
789 * discard the cookie when the user agent exits."
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
790 * "The Discard attribute instructs the user agent to discard the
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
791 * cookie unconditionally when the user agent terminates."
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
792 */
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
793 cookie->session_only = discard == TRUE || expires == FALSE;
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
794
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
795 *cookie_str = (*str == ',') ? str + 1 : str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
796
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
797 if (!error && (!cookie->name || !cookie->value)) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
798 MSG("Cookie missing name and/or value!\n");
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
799 error = TRUE;
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
800 }
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
801 if (error) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
802 Cookies_free_cookie(cookie);
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
803 cookie = NULL;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
804 }
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
805 return cookie;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
806 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
807
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
808 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
809 * Iterate the cookie string until we catch all cookies.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
810 * Return Value: a list with all the cookies! (or NULL upon error)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
811 */
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
812 static Dlist *Cookies_parse_string(char *cookie_string)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
813 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
814 CookieData_t *cookie;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
815 Dlist *ret = NULL;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
816 char *str = cookie_string;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
817
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
818 /* The string may contain several cookies separated by comma.
159
70da40b41e3a - Fixed a bug in Cookies_parse_one. Set it to a single return potint too!
jcid
parents: 154
diff changeset
819 * We'll iterate until we've caught them all */
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
820 while (*str) {
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
821 cookie = Cookies_parse_one(&str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
822
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
823 if (cookie) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
824 if (!ret)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
825 ret = dList_new(4);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
826 dList_append(ret, cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
827 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
828 MSG("Malformed cookie field, ignoring cookie: %s\n", cookie_string);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
829 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
830 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
831
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
832 return ret;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
833 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
834
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
835 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
836 * Compare cookies by name and path (return 0 if equal)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
837 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
838 static int Cookies_cmp(const void *a, const void *b)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
839 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
840 const CookieData_t *ca = a, *cb = b;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
841 int ret;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
842
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
843 if (!(ret = strcmp(ca->name, cb->name)))
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
844 ret = strcmp(ca->path, cb->path);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
845 return ret;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
846 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
847
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
848 /*
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
849 * Check whether url_path path-matches cookie_path
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
850 *
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
851 * 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
852 * but this is the recommended method at the moment.
1486
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
853 */
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
854 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
855 const char *cookie_path)
1486
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
856 {
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
857 bool_t ret = TRUE;
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
858
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
859 if (!url_path || !cookie_path) {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
860 ret = FALSE;
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
861 } else {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
862 uint_t c_len = strlen(cookie_path);
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
863 uint_t u_len = strlen(url_path);
1486
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 ret = (!strncmp(cookie_path, url_path, c_len) &&
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
866 ((c_len == u_len) ||
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
867 (c_len > 0 && cookie_path[c_len - 1] == '/') ||
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
868 (u_len > c_len && url_path[c_len] == '/')));
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
869 }
1486
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
870 return ret;
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
871 }
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
872
4fbeadf3191b cookie paths
corvid <corvid@lavabit.com>
parents: 1485
diff changeset
873 /*
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
874 * If cookie path is not properly set, remedy that.
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
875 */
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
876 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
877 {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
878 if (!cookie->path || cookie->path[0] != '/') {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
879 dFree(cookie->path);
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 if (url_path) {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
882 uint_t len = strlen(url_path);
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 while (len && url_path[len] != '/')
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
885 len--;
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
886 cookie->path = dStrndup(url_path, len ? len : 1);
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
887 } else {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
888 cookie->path = dStrdup("/");
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
889 }
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
890 }
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
891 }
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
892
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
893 /*
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
894 * 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
895 */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
896 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
897 {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
898 int diff;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
899
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
900 if (!A || !*A || !B || !*B)
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
901 return FALSE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
902
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
903 if (*B == '.')
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
904 B++;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
905
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
906 /* 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
907 * 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
908 * don't, so: No.
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
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
911 if (!dStrcasecmp(A, B))
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
912 return TRUE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
913
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
914 diff = strlen(A) - strlen(B);
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 if (diff > 0) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
917 /* 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
918 return (dStrcasecmp(A + diff, B) == 0 && A[diff - 1] == '.');
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
919 } else {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
920 return FALSE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
921 }
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
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
924 /*
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
925 * 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
926 * 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
927 * 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
928 *
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
929 * 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
930 * 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
931 * reports.
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
932 */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
933 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
934 {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
935 uint_t ret = 1;
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 if (host) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
938 int start, after, tld_len;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
939
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
940 /* 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
941 * 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
942 */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
943 after = strlen(host);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
944 if (after > 0 && host[after - 1] == '.')
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
945 after--;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
946 start = after;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
947 while (start > 0 && host[start - 1] != '.')
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
948 start--;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
949 tld_len = after - start;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
950
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
951 if (tld_len > 0) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
952 const char *const tlds[] = {"ai","au","bd","bh","ck","eg","et","fk",
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
953 "il","in","kh","kr","mk","mt","na","np",
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
954 "nz","pg","pk","qa","sa","sb","sg","sv",
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
955 "ua","ug","uk","uy","vn","za","zw","name"};
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)) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
961 MSG("TLD code matched %s\n", tlds[i]);
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 /*
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
972 * Is the domain an IP address?
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
973 */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
974 static bool_t Cookies_domain_is_ip(const char *domain)
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
975 {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
976 bool_t ipv4 = TRUE, ipv6 = TRUE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
977
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
978 if (!domain)
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
979 return FALSE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
980
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
981 while (*domain) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
982 if (*domain != '.' && !isdigit(*domain))
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
983 ipv4 = FALSE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
984 if (*domain != ':' && !isxdigit(*domain))
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
985 ipv6 = FALSE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
986 if (!(ipv4 || ipv6))
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
987 return FALSE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
988 domain++;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
989 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
990 MSG("an IP address\n");
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
991 return TRUE;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
992 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
993
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
994 /*
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
995 * Validate cookies domain against some security checks.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
996 */
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
997 static bool_t Cookies_validate_domain(CookieData_t *cookie, char *host)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
998 {
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
999 uint_t i, internal_dots;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1000
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1001 if (!cookie->domain) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1002 cookie->domain = dStrdup(host);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1003 return TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1004 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1005
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1006 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
1007 char *d = dStrconcat(".", cookie->domain, NULL);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1008 dFree(cookie->domain);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1009 cookie->domain = d;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1010 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1011
1488
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
1012 if (!Cookies_domain_matches(host, cookie->domain))
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
1013 return FALSE;
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
1014
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1015 internal_dots = 0;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1016 for (i = 1; i < strlen(cookie->domain) - 1; i++) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1017 if (cookie->domain[i] == '.')
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1018 internal_dots++;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1019 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1020
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1021 /* All of this dots business is a weak hack.
1488
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
1022 * TODO: accept the publicsuffix.org list as an optional external file.
afe771c1d19f cookie domains
corvid <corvid@lavabit.com>
parents: 1487
diff changeset
1023 */
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1024 if (internal_dots < Cookies_internal_dots_required(host)) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1025 MSG("not enough dots in %s\n", cookie->domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1026 return FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1027 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1028
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1029 MSG("host %s and domain %s is all right\n", host, cookie->domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1030 return TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1031 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1032
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1033 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1034 * Set the value corresponding to the cookie string
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1035 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
1036 static void Cookies_set(char *cookie_string, char *url_host,
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1037 char *url_path)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1038 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1039 CookieControlAction action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1040 CookieData_t *cookie;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1041 Dlist *list;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1042 int i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1043
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1044 if (disabled)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1045 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1046
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1047 action = Cookies_control_check_domain(url_host);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1048 if (action == COOKIE_DENY) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1049 MSG("denied SET for %s\n", url_host);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1050 return;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1051 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1052
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
1053 _MSG("%s setting: %s\n", url_host, cookie_string);
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
1054
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1055 if ((list = Cookies_parse_string(cookie_string))) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1056 for (i = 0; (cookie = dList_nth_data(list, i)); ++i) {
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
1057 if (Cookies_validate_domain(cookie, url_host)) {
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
1058 Cookies_validate_path(cookie, url_path);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1059 if (action == COOKIE_ACCEPT_SESSION)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1060 cookie->session_only = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1061 Cookies_add_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1062 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1063 MSG("Rejecting cookie for %s from host %s path %s\n",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1064 cookie->domain, url_host, url_path);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1065 Cookies_free_cookie(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1066 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1067 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1068 dList_free(list);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1069 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1070 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1071
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1072 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1073 * Compare the cookie with the supplied data to see if it matches
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1074 */
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
1075 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
1076 bool_t is_ssl)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1077 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1078 /* Insecure cookies matches both secure and insecure urls, secure
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1079 cookies matches only secure urls */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1080 if (cookie->secure && !is_ssl)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1081 return FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1082
1497
4ecebf934b44 cookies follow draft spec for paths
corvid <corvid@lavabit.com>
parents: 1496
diff changeset
1083 if (!Cookies_path_matches(url_path, cookie->path))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1084 return FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1085
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1086 /* It's a match */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1087 return TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1088 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1089
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1090 static void Cookies_add_matching_cookies(const char *domain,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1091 const char *url_path,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1092 Dlist *matching_cookies,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1093 bool_t is_ssl)
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1094 {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1095 CookieNode *node = dList_find_sorted(cookies, domain,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1096 Cookie_node_by_domain_cmp);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1097 if (node) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1098 int i;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1099 CookieData_t *cookie;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1100 Dlist *domain_cookies = node->dlist;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1101
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1102 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
1103 /* Remove expired cookie. */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1104 if (cookie->expires_at < time(NULL)) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1105 MSG("goodbye, expired cookie %s=%s d:%s p:%s\n", cookie->name,
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1106 cookie->value, cookie->domain, cookie->path);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1107 Cookies_remove_cookie(cookie);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1108 --i; continue;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1109 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1110 /* Check if the cookie matches the requesting URL */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1111 if (Cookies_match(cookie, url_path, is_ssl)) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1112 int j;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1113 CookieData_t *curr;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1114 uint_t path_length = strlen(cookie->path);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1115
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1116 /* Longest cookies go first */
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1117 for (j = 0;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1118 (curr = dList_nth_data(matching_cookies, j)) &&
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1119 strlen(curr->path) >= path_length;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1120 j++) ;
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1121 dList_insert_pos(matching_cookies, cookie, j);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1122 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1123 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1124 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1125 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1126
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1127 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1128 * Return a string that contains all relevant cookies as headers.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1129 */
51
6ff7b6758e0c Added the "static" qualifier where missing.
jcid
parents: 35
diff changeset
1130 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
1131 char *url_scheme)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1132 {
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1133 char *domain_str, *str;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1134 CookieData_t *cookie;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1135 Dlist *matching_cookies;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1136 bool_t is_ssl;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1137 Dstr *cookie_dstring;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1138 int i;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1139
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1140 if (disabled)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1141 return dStrdup("");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1142
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1143 matching_cookies = dList_new(8);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1144
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1145 /* Check if the protocol is secure or not */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1146 is_ssl = (!dStrcasecmp(url_scheme, "https"));
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1147
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1148 for (domain_str = (char *) url_host;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1149 domain_str != NULL && *domain_str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1150 domain_str = strchr(domain_str+1, '.')) {
1498
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1151 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
1152 is_ssl);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1153 }
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1154 if (!Cookies_domain_is_ip(url_host)) {
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1155 domain_str = dStrconcat(".", url_host, NULL);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1156 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
1157 is_ssl);
c04b0de69b00 cookies follow draft spec for domains
corvid <corvid@lavabit.com>
parents: 1497
diff changeset
1158 dFree(domain_str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1159 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1160
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1161 /* Found the cookies, now make the string */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1162 cookie_dstring = dStr_new("");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1163 if (dList_length(matching_cookies) > 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1164
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1165 dStr_sprintfa(cookie_dstring, "Cookie: ");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1166
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1167 for (i = 0; (cookie = dList_nth_data(matching_cookies, i)); ++i) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1168 dStr_sprintfa(cookie_dstring,
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1169 "%s=%s; $Path=%s; $Domain=%s",
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1170 cookie->name, cookie->value,
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1171 cookie->path, cookie->domain);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1172 dStr_append(cookie_dstring,
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1173 dList_length(matching_cookies) > i + 1 ? "; " : "\r\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1174 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1175 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1176
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1177 dList_free(matching_cookies);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1178 str = cookie_dstring->str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1179 dStr_free(cookie_dstring, FALSE);
1482
a749c1b10fbe clean up cookie expiration/replacement and sessions
corvid <corvid@lavabit.com>
parents: 1481
diff changeset
1180 _MSG("%s gets %s\n", url_host, str);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1181 return str;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1182 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1183
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1184 /* -------------------------------------------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1185 * Access control routines
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1186 * ------------------------------------------------------------- */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1187
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1188
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1189 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1190 * Get the cookie control rules (from cookiesrc).
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1191 * Return value:
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1192 * 0 = Parsed OK, with cookies enabled
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1193 * 1 = Parsed OK, with cookies disabled
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1194 * 2 = Can't open the control file
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1195 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1196 static int Cookie_control_init(void)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1197 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1198 CookieControl cc;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1199 FILE *stream;
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1200 char *filename, *rc;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1201 char line[LINE_MAXLEN];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1202 char domain[LINE_MAXLEN];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1203 char rule[LINE_MAXLEN];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1204 int i, j;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1205 bool_t enabled = FALSE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1206
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1207 /* Get a file pointer */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1208 filename = dStrconcat(dGethomedir(), "/.dillo/cookiesrc", NULL);
219
201d89d1d002 - Allowed readonly permissions for cookiesrc.
jcid
parents: 174
diff changeset
1209 stream = Cookies_fopen(filename, "r", "DEFAULT DENY\n");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1210 dFree(filename);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1211
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1212 if (!stream)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1213 return 2;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1214
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1215 /* Get all lines in the file */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1216 while (!feof(stream)) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1217 line[0] = '\0';
1200
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1218 rc = fgets(line, LINE_MAXLEN, stream);
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1219 if (!rc && ferror(stream)) {
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1220 MSG("Cookies3: Error while reading rule from cookiesrc: %s\n",
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1221 dStrerror(errno));
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1222 break; /* bail out */
6bdf6ea2637a Removed compiler warnings for unused return values
Michal Nowak newman.x@gmail.com
parents: 1127
diff changeset
1223 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1224
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1225 /* Remove leading and trailing whitespaces */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1226 dStrstrip(line);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1227
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1228 if (line[0] != '\0' && line[0] != '#') {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1229 i = 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1230 j = 0;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1231
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1232 /* Get the domain */
1221
f34b803b8639 Handle signed chars. Aadded dIsspace() and dIsalnum() to dlib
Jorge Arellano Cid <jcid@dillo.org>
parents: 1201
diff changeset
1233 while (line[i] != '\0' && !dIsspace(line[i]))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1234 domain[j++] = line[i++];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1235 domain[j] = '\0';
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1236
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1237 /* Skip past whitespaces */
1221
f34b803b8639 Handle signed chars. Aadded dIsspace() and dIsalnum() to dlib
Jorge Arellano Cid <jcid@dillo.org>
parents: 1201
diff changeset
1238 while (dIsspace(line[i]))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1239 i++;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1240
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1241 /* Get the rule */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1242 j = 0;
1221
f34b803b8639 Handle signed chars. Aadded dIsspace() and dIsalnum() to dlib
Jorge Arellano Cid <jcid@dillo.org>
parents: 1201
diff changeset
1243 while (line[i] != '\0' && !dIsspace(line[i]))
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1244 rule[j++] = line[i++];
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1245 rule[j] = '\0';
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1246
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1247 if (dStrcasecmp(rule, "ACCEPT") == 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1248 cc.action = COOKIE_ACCEPT;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1249 else if (dStrcasecmp(rule, "ACCEPT_SESSION") == 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1250 cc.action = COOKIE_ACCEPT_SESSION;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1251 else if (dStrcasecmp(rule, "DENY") == 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1252 cc.action = COOKIE_DENY;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1253 else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1254 MSG("Cookies: rule '%s' for domain '%s' is not recognised.\n",
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1255 rule, domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1256 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1257 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1258
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1259 cc.domain = dStrdup(domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1260 if (dStrcasecmp(cc.domain, "DEFAULT") == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1261 /* Set the default action */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1262 default_action = cc.action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1263 dFree(cc.domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1264 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1265 a_List_add(ccontrol, num_ccontrol, num_ccontrol_max);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1266 ccontrol[num_ccontrol++] = cc;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1267 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1268
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1269 if (cc.action != COOKIE_DENY)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1270 enabled = TRUE;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1271 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1272 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1273
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1274 fclose(stream);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1275
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1276 return (enabled ? 0 : 1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1277 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1278
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1279 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1280 * Check the rules for an appropriate action for this domain
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1281 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1282 static CookieControlAction Cookies_control_check_domain(const char *domain)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1283 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1284 int i, diff;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1285
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1286 for (i = 0; i < num_ccontrol; i++) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1287 if (ccontrol[i].domain[0] == '.') {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1288 diff = strlen(domain) - strlen(ccontrol[i].domain);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1289 if (diff >= 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1290 if (dStrcasecmp(domain + diff, ccontrol[i].domain) != 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1291 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1292 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1293 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1294 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1295 } else {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1296 if (dStrcasecmp(domain, ccontrol[i].domain) != 0)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1297 continue;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1298 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1299
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1300 /* If we got here we have a match */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1301 return( ccontrol[i].action );
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1302 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1303
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1304 return default_action;
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1305 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1306
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1307 /* -- Dpi parser ----------------------------------------------------------- */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1308
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1309 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1310 * Parse a data stream (dpi protocol)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1311 * Note: Buf is a zero terminated string
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1312 * Return code: { 0:OK, 1:Abort, 2:Close }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1313 */
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1314 static int srv_parse_tok(Dsh *sh, ClientInfo *client, char *Buf)
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1315 {
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1316 char *cmd, *cookie, *host, *path, *scheme;
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1317 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
1318 size_t BufSize = strlen(Buf);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1319
1236
b912173aecd1 Added a_Dpip_get_attr_l() to DPIP's API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1221
diff changeset
1320 cmd = a_Dpip_get_attr_l(Buf, BufSize, "cmd");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1321
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1322 if (!cmd) {
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1323 /* abort */
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1324 } 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
1325 /* authenticate */
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1326 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
1327 client->status = 1;
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1328 ret = 0;
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1329 }
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1330 } else if (strcmp(cmd, "DpiBye") == 0) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1331 dFree(cmd);
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1332 MSG("(pid %d): Got DpiBye.\n", (int)getpid());
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1333 exit(0);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1334
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1335 } else if (cmd && strcmp(cmd, "set_cookie") == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1336 dFree(cmd);
1236
b912173aecd1 Added a_Dpip_get_attr_l() to DPIP's API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1221
diff changeset
1337 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
1338 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
1339 path = a_Dpip_get_attr_l(Buf, BufSize, "path");
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1340
1496
5bec8ce33a42 cookies: rm version, comment, comment url, port, Cookie2
corvid <corvid@lavabit.com>
parents: 1495
diff changeset
1341 Cookies_set(cookie, host, path);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1342
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
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1348 } else if (cmd && strcmp(cmd, "get_cookie") == 0) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1349 dFree(cmd);
1236
b912173aecd1 Added a_Dpip_get_attr_l() to DPIP's API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1221
diff changeset
1350 scheme = a_Dpip_get_attr_l(Buf, BufSize, "scheme");
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
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1359 cmd = a_Dpip_build_cmd("cmd=%s cookie=%s", "get_cookie_answer", cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1360
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1361 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
1362 ret = 1;
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1363 } else {
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1364 _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
1365 ret = 2;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1366 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1367 dFree(cookie);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1368 dFree(cmd);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1369 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1370
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1371 return ret;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1372 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1373
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1374 /* -- Termination handlers ----------------------------------------------- */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1375 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1376 * (was to delete the local namespace socket),
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1377 * but this is handled by 'dpid' now.
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1378 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1379 static void cleanup(void)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1380 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1381 Cookies_save_and_free();
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1382 MSG("cleanup\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1383 /* no more cleanup required */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1384 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1385
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1386 /*
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1387 * Perform any necessary cleanups upon abnormal termination
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1388 */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1389 static void termination_handler(int signum)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1390 {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1391 exit(signum);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1392 }
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 * -- MAIN -------------------------------------------------------------------
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1397 */
1385
eb98997886ec Introduced the new tokenizing dsh API to DPIP
Jorge Arellano Cid <jcid@dillo.org>
parents: 1236
diff changeset
1398 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
1399 struct sockaddr_in sin;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1400 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
1401 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
1402 int sock_fd, code;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1403 char *buf;
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1404 Dsh *sh;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1405
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1406 /* Arrange the cleanup function for terminations via exit() */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1407 atexit(cleanup);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1408
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1409 /* Arrange the cleanup function for abnormal terminations */
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1410 if (signal (SIGINT, termination_handler) == SIG_IGN)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1411 signal (SIGINT, SIG_IGN);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1412 if (signal (SIGHUP, termination_handler) == SIG_IGN)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1413 signal (SIGHUP, SIG_IGN);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1414 if (signal (SIGTERM, termination_handler) == SIG_IGN)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1415 signal (SIGTERM, SIG_IGN);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1416
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1417 Cookies_init();
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1418 MSG("(v.1) accepting connections...\n");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1419
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1420 if (disabled)
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1421 exit(1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1422
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1423 /* 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
1424 address_size = sizeof(struct sockaddr_in);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1425
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1426 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
1427 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
1428 if (sock_fd == -1) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1429 perror("[accept]");
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1430 exit(1);
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1431 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1432
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1433 /* 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
1434 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
1435 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
1436 client->sh = sh;
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1437 client->status = 0;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1438
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1439 while (1) {
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1440 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
1441 if ((buf = a_Dpip_dsh_read_token(sh, 1)) != NULL) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1442 /* Let's see what we fished... */
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1443 _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
1444 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
1445 dFree(buf);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1446 }
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1447
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1448 _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
1449 if (code == 1) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1450 exit(1);
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1451 } else if (code == 2) {
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1452 break;
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1453 }
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1454 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1455
1387
16cf380cd04c Convert dpid, file dpi and cookies dpi to dsh API
Jorge Arellano Cid <jcid@dillo.org>
parents: 1385
diff changeset
1456 _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
1457 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
1458 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
1459 dFree(client);
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1460
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1461 }/*while*/
174
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1462
67e98a1211f0 - Fixed a cookies-related dillo freeze bug happening at:
jcid
parents: 159
diff changeset
1463 return 0;
0
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1464 }
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1465
6ee11bf9e3ea Initial revision
jcid
parents:
diff changeset
1466 #endif /* !DISABLE_COOKIES */