diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon index 50bb07ed5..1e7792e9c 100644 --- a/sys/vane/ames.hoon +++ b/sys/vane/ames.hoon @@ -1619,6 +1619,7 @@ [hen [%slip %e %init p.bon]] [hen [%slip %g %init p.bon]] [hen [%slip %d %init p.bon]] :: must be after gall + [hen [%slip %l %init p.bon]] ~ == :: diff --git a/sys/vane/light.hoon b/sys/vane/light.hoon index 52c4401af..69d064af2 100644 --- a/sys/vane/light.hoon +++ b/sys/vane/light.hoon @@ -199,6 +199,7 @@ ++ request |= [secure=? =address =http-request] ^- [(list move) server-state] + ~& [%request secure address http-request] :: =+ host=(get-header 'Host' header-list.http-request) =+ action=(get-action-for-binding host url.http-request) @@ -592,7 +593,6 @@ =/ task=task:able ?. ?=(%soft -.wrapped-task) wrapped-task - ~| [%call p.wrapped-task] ((hard task:able) p.wrapped-task) :: ?- -.task @@ -627,6 +627,10 @@ :: %inbound-request: handles an inbound http request :: %inbound-request + :: + :: TODO: This is uncommit + :: + ~| [%ship ship.ax] =/ event-args [[(need ship.ax) eny duct now scry-gate] server-state.ax] =/ request request:(per-server-event event-args) =^ moves server-state.ax @@ -636,6 +640,7 @@ :: %connect / %serve :: ?(%connect %serve) + ~| [%task task] =/ event-args [[(need ship.ax) eny duct now scry-gate] server-state.ax] =/ add-binding add-binding:(per-server-event event-args) =^ moves server-state.ax diff --git a/sys/zuse.hoon b/sys/zuse.hoon index 5d0d27c74..59c98ff10 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -2291,14 +2291,14 @@ :: +http-method: exhaustive list of http verbs :: +$ http-method - $? _'CONNECT' - _'DELETE' - _'GET' - _'HEAD' - _'OPTIONS' - _'POST' - _'PUT' - _'TRACE' + $? %'CONNECT' + %'DELETE' + %'GET' + %'HEAD' + %'OPTIONS' + %'POST' + %'PUT' + %'TRACE' == :: +http-request: a single http-request :: diff --git a/tests/sys/vane/light.hoon b/tests/sys/vane/light.hoon index 69d53000b..249420d90 100644 --- a/tests/sys/vane/light.hoon +++ b/tests/sys/vane/light.hoon @@ -176,7 +176,7 @@ %inbound-request %.n [%ipv4 .192.168.1.1] - ['GET' '/' ~ ~] + [%'GET' '/' ~ ~] == ^= expectec-moves ^- (list move:light-gate) @@ -228,7 +228,7 @@ %inbound-request %.n [%ipv4 .192.168.1.1] - ['GET' '/' ~ ~] + [%'GET' '/' ~ ~] == ^= comparator |= moves=(list move:light-gate) @@ -249,7 +249,7 @@ :+ /run-app/app1 [~nul ~nul] ^- cush:gall :* %app1 %poke %handle-http-request - !>([%.n %.n [%ipv4 .192.168.1.1] ['GET' '/' ~ ~]]) + !>([%.n %.n [%ipv4 .192.168.1.1] [%'GET' '/' ~ ~]]) == card == @@ -311,7 +311,7 @@ %inbound-request %.n [%ipv4 .192.168.1.1] - ['GET' '/' ~ ~] + [%'GET' '/' ~ ~] == ^= comparator |= moves=(list move:light-gate) @@ -332,7 +332,7 @@ :+ /run-app/app1 [~nul ~nul] ^- cush:gall :* %app1 %poke %handle-http-request - !>([%.n %.n [%ipv4 .192.168.1.1] ['GET' '/' ~ ~]]) + !>([%.n %.n [%ipv4 .192.168.1.1] [%'GET' '/' ~ ~]]) == card == @@ -415,7 +415,7 @@ %inbound-request %.n [%ipv4 .192.168.1.1] - ['GET' '/~landscape/inner-path' ~ ~] + [%'GET' '/~landscape/inner-path' ~ ~] == ^= comparator |= moves=(list move:light-gate) @@ -436,7 +436,7 @@ :+ /run-app/app1 [~nul ~nul] ^- cush:gall :* %app1 %poke %handle-http-request - !>([%.n %.n [%ipv4 .192.168.1.1] ['GET' '/~landscape/inner-path' ~ ~]]) + !>([%.n %.n [%ipv4 .192.168.1.1] [%'GET' '/~landscape/inner-path' ~ ~]]) == card == @@ -470,7 +470,7 @@ %inbound-request %.n [%ipv4 .192.168.1.1] - ['GET' '/~/login?redirect=/~landscape/inner-path' ~ ~] + [%'GET' '/~/login?redirect=/~landscape/inner-path' ~ ~] == ^= expected-moves ^- (list move:light-gate) @@ -496,7 +496,7 @@ %inbound-request %.n [%ipv4 .192.168.1.1] - 'POST' + %'POST' '/~/login' ~ :- ~ @@ -531,7 +531,7 @@ %inbound-request %.n [%ipv4 .192.168.1.1] - 'GET' + %'GET' '/~landscape/inner-path' ['Cookie' 'urbauth=0v3.q0p7t.mlkkq.cqtto.p0nvi.2ieea']~ ~