this repo has no description
more
+51
-507
+1
stack/requests/lib/dune
+1
stack/requests/lib/dune
-1
stack/requests/lib/requests.ml
-1
stack/requests/lib/requests.ml
+1
-4
stack/requests/lib/requests.mli
+1
-4
stack/requests/lib/requests.mli
···
135
135
(** Stateful HTTP sessions with cookies and configuration persistence *)
136
136
module Session = Session
137
137
138
-
(** Cookie storage and management *)
139
-
module Cookie_jar = Cookie_jar
140
-
141
138
(** Retry policies and backoff strategies *)
142
139
module Retry = Retry
143
140
···
183
180
module Mime = Mime
184
181
185
182
(** Timeout configuration for requests *)
186
-
module Timeout = Timeout
183
+
module Timeout = Timeout
+47
-14
stack/requests/lib/session.ml
+47
-14
stack/requests/lib/session.ml
···
33
33
sw : Eio.Switch.t;
34
34
client : ('clock, 'net) Client.t;
35
35
clock : 'clock;
36
-
cookie_jar : Cookie_jar.t;
36
+
cookie_jar : Cookeio.jar;
37
37
mutable default_headers : Headers.t;
38
38
mutable auth : Auth.t option;
39
39
mutable timeout : Timeout.t;
···
91
91
| Some jar, _, _ -> jar
92
92
| None, true, Some xdg_ctx ->
93
93
Log.debug (fun m -> m "Loading persistent cookie jar from XDG data dir");
94
-
Cookie_jar.load ~xdg:xdg_ctx ()
94
+
let data_dir = Xdge.data_dir xdg_ctx in
95
+
let cookie_file = Eio.Path.(data_dir / "cookies.txt") in
96
+
Cookeio.load cookie_file
95
97
| None, _, _ ->
96
-
Cookie_jar.create ()
98
+
Cookeio.create ()
97
99
in
98
100
99
101
let session = {
···
120
122
Log.info (fun m -> m "Closing session after %d requests" session.requests_made);
121
123
if persist_cookies && Option.is_some xdg then begin
122
124
Log.info (fun m -> m "Saving cookies on session close");
123
-
Cookie_jar.save ?xdg session.cookie_jar
125
+
let data_dir = Xdge.data_dir (Option.get xdg) in
126
+
let cookie_file = Eio.Path.(data_dir / "cookies.txt") in
127
+
Cookeio.save cookie_file session.cookie_jar
124
128
end
125
129
);
126
130
···
128
132
129
133
let save_cookies : ('a, 'b) t -> unit = fun t ->
130
134
if t.persist_cookies && Option.is_some t.xdg then
131
-
Cookie_jar.save ?xdg:t.xdg t.cookie_jar
135
+
let data_dir = Xdge.data_dir (Option.get t.xdg) in
136
+
let cookie_file = Eio.Path.(data_dir / "cookies.txt") in
137
+
Cookeio.save cookie_file t.cookie_jar
132
138
133
139
let load_cookies : ('a, 'b) t -> unit = fun t ->
134
140
if t.persist_cookies && Option.is_some t.xdg then
135
-
let loaded = Cookie_jar.load ?xdg:t.xdg () in
141
+
let data_dir = Xdge.data_dir (Option.get t.xdg) in
142
+
let cookie_file = Eio.Path.(data_dir / "cookies.txt") in
143
+
let loaded = Cookeio.load cookie_file in
136
144
(* Copy loaded cookies into our jar *)
137
-
Cookie_jar.clear t.cookie_jar;
138
-
let cookies_from_loaded = Cookie_jar.to_mozilla_format loaded in
139
-
let _reloaded = Cookie_jar.from_mozilla_format cookies_from_loaded in
145
+
Cookeio.clear t.cookie_jar;
146
+
let cookies_from_loaded = Cookeio.to_mozilla_format loaded in
147
+
let _reloaded = Cookeio.from_mozilla_format cookies_from_loaded in
140
148
(* This is a bit convoluted but maintains the same jar reference *)
141
149
()
142
150
···
172
180
let cookies t = t.cookie_jar
173
181
174
182
let clear_cookies t =
175
-
Cookie_jar.clear t.cookie_jar
183
+
Cookeio.clear t.cookie_jar
176
184
177
185
(** {1 Internal Request Function} *)
178
186
···
183
191
let headers =
184
192
t.default_headers
185
193
|> Headers.merge (Option.value headers ~default:Headers.empty)
186
-
|> Cookie_jar.add_to_headers t.cookie_jar ~url
194
+
|> (fun headers ->
195
+
let uri = Uri.of_string url in
196
+
let domain = Uri.host_with_default ~default:"localhost" uri in
197
+
let path = Uri.path uri in
198
+
let is_secure = Uri.scheme uri = Some "https" in
199
+
let cookies = Cookeio.get_cookies t.cookie_jar ~domain ~path ~is_secure in
200
+
if cookies = [] then headers
201
+
else
202
+
let cookie_header = Cookeio.make_cookie_header cookies in
203
+
Headers.add "cookie" cookie_header headers)
187
204
in
188
205
189
206
(* Use provided auth or session default *)
···
224
241
in
225
242
226
243
(* Extract cookies from response *)
227
-
Cookie_jar.extract_from_headers t.cookie_jar ~url (Response.headers response);
244
+
let uri = Uri.of_string url in
245
+
let domain = Uri.host_with_default ~default:"localhost" uri in
246
+
let path =
247
+
let p = Uri.path uri in
248
+
if p = "" then "/"
249
+
else
250
+
let last_slash = String.rindex_opt p '/' in
251
+
match last_slash with
252
+
| None -> "/"
253
+
| Some i -> String.sub p 0 (i + 1)
254
+
in
255
+
let set_cookie_values = Headers.get_multi "set-cookie" (Response.headers response) in
256
+
List.iter (fun value ->
257
+
match Cookeio.parse_set_cookie ~domain ~path value with
258
+
| Some cookie -> Cookeio.add_cookie t.cookie_jar cookie
259
+
| None -> Log.warn (fun m -> m "Failed to parse Set-Cookie header: %s" value)
260
+
) set_cookie_values;
228
261
229
262
(* Update statistics *)
230
263
Mutex.lock t.mutex;
···
293
326
let pp ppf t =
294
327
Mutex.lock t.mutex;
295
328
let stats = t.requests_made, t.total_time,
296
-
Cookie_jar.count t.cookie_jar in
329
+
Cookeio.count t.cookie_jar in
297
330
Mutex.unlock t.mutex;
298
331
let requests, time, cookies = stats in
299
332
Format.fprintf ppf "@[<v>Session:@,\
···
321
354
let result = Stats.{
322
355
requests_made = t.requests_made;
323
356
total_time = t.total_time;
324
-
cookies_count = Cookie_jar.count t.cookie_jar;
357
+
cookies_count = Cookeio.count t.cookie_jar;
325
358
retries_count = t.retries_count;
326
359
} in
327
360
Mutex.unlock t.mutex;
+2
-2
stack/requests/lib/session.mli
+2
-2
stack/requests/lib/session.mli
···
60
60
val create :
61
61
sw:Eio.Switch.t ->
62
62
?client:('clock Eio.Time.clock,'net Eio.Net.t) Client.t ->
63
-
?cookie_jar:Cookie_jar.t ->
63
+
?cookie_jar:Cookeio.jar ->
64
64
?default_headers:Headers.t ->
65
65
?auth:Auth.t ->
66
66
?timeout:Timeout.t ->
···
113
113
114
114
(** {1 Cookie Management} *)
115
115
116
-
val cookies : ('clock, 'net) t -> Cookie_jar.t
116
+
val cookies : ('clock, 'net) t -> Cookeio.jar
117
117
(** Get the session's cookie jar for direct manipulation *)
118
118
119
119
val clear_cookies : ('clock, 'net) t -> unit