Skip to content

Commit d1df10f

Browse files
committed
fix previous commit
1 parent d5c274e commit d1df10f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/extensions/accesscontrol.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ let rec parse_condition = function
5454
badconfig "Bad ip/netmask [%s] in <ip> condition" s
5555
in
5656
(fun ri ->
57-
let r = Ipaddr.mem prefix (Lazy.force ri.ri_remote_ip_parsed)
57+
let r = Ipaddr.Prefix.mem (Lazy.force ri.ri_remote_ip_parsed) prefix
5858
in
5959
if r then
6060
Ocsigen_messages.debug2 (sprintf "--Access control (ip): %s matches %s" ri.ri_remote_ip s)
@@ -312,7 +312,7 @@ let parse_config parse_fun = function
312312
request
313313
| original_ip::proxies ->
314314
let last_proxy = List.last proxies in
315-
let proxy_ip = fst (Ip_address.parse last_proxy) in
315+
let proxy_ip = Ipaddr.of_string_exn last_proxy in
316316
let equal_ip = proxy_ip = Lazy.force request.request_info.ri_remote_ip_parsed in
317317
let need_equal_ip =
318318
match param with
@@ -328,7 +328,7 @@ let parse_config parse_fun = function
328328
{ request with request_info =
329329
{ request.request_info with
330330
ri_remote_ip = original_ip;
331-
ri_remote_ip_parsed = lazy (fst (Ip_address.parse original_ip));
331+
ri_remote_ip_parsed = lazy (Ipaddr.of_string_exn original_ip);
332332
ri_forward_ip = proxies; } }
333333
else (* the announced ip of the proxy is not its real ip *)
334334
( Ocsigen_messages.warning (Printf.sprintf "--Access control: X-Forwarded-For: host ip ( %s ) does not match the header ( %s )" request.request_info.ri_remote_ip header );

0 commit comments

Comments
 (0)