From c0e29746789ce55949c51ae6495f53372bf81399 Mon Sep 17 00:00:00 2001 From: tinnus-napbus <77721746+tinnus-napbus@users.noreply.github.com> Date: Thu, 29 Sep 2022 13:31:47 +1300 Subject: [PATCH 1/4] Update pkg/arvo/sys/vane/eyre.hoon Co-authored-by: fang --- pkg/arvo/sys/vane/eyre.hoon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon index 64e91aaa5..cb3bfa43e 100644 --- a/pkg/arvo/sys/vane/eyre.hoon +++ b/pkg/arvo/sys/vane/eyre.hoon @@ -614,8 +614,8 @@ [action [authenticated secure address request] ~ 0] =. connections.state (~(put by connections.state) duct connection) - :: redirect to https if insecure, redirects enabled - :: and secure port live + :: redirect to https if insecure, redirects enabled + :: and secure port live :: ?: ?& !secure redirect.http-config.state From 387b48bed6d723ebb486e717849f464fe98746a1 Mon Sep 17 00:00:00 2001 From: tinnus-napbus <77721746+tinnus-napbus@users.noreply.github.com> Date: Thu, 29 Sep 2022 13:32:07 +1300 Subject: [PATCH 2/4] Update pkg/arvo/sys/vane/eyre.hoon Co-authored-by: fang --- pkg/arvo/sys/vane/eyre.hoon | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon index cb3bfa43e..580bf0c32 100644 --- a/pkg/arvo/sys/vane/eyre.hoon +++ b/pkg/arvo/sys/vane/eyre.hoon @@ -749,7 +749,6 @@ %^ return-static-data-on-duct 404 'text/html' (error-page 404 authenticated url.request ~) == -:: :: +handle-scry: respond with scry result, 404 or 500 :: ++ handle-scry From 66f543289dde678d21b4aacdc0b1b58c1ecf9741 Mon Sep 17 00:00:00 2001 From: tinnus-napbus <77721746+tinnus-napbus@users.noreply.github.com> Date: Thu, 29 Sep 2022 13:32:18 +1300 Subject: [PATCH 3/4] Update pkg/arvo/sys/vane/eyre.hoon Co-authored-by: fang --- pkg/arvo/sys/vane/eyre.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon index 580bf0c32..59dce87d5 100644 --- a/pkg/arvo/sys/vane/eyre.hoon +++ b/pkg/arvo/sys/vane/eyre.hoon @@ -2576,7 +2576,7 @@ ++ load |= old=axle ^+ ..^$ - :: enable https redirects if certificate configured + :: enable https redirects if certificate configured :: =. redirect.http-config.server-state.old ?& ?=(^ secure.ports.server-state.old) From e481aded3c7344a382b35bf58c0a3a84deb0a42a Mon Sep 17 00:00:00 2001 From: tinnus-napbus <77721746+tinnus-napbus@users.noreply.github.com> Date: Thu, 29 Sep 2022 13:32:32 +1300 Subject: [PATCH 4/4] Update pkg/arvo/sys/vane/eyre.hoon Co-authored-by: fang --- pkg/arvo/sys/vane/eyre.hoon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/arvo/sys/vane/eyre.hoon b/pkg/arvo/sys/vane/eyre.hoon index 59dce87d5..f5e0a01d5 100644 --- a/pkg/arvo/sys/vane/eyre.hoon +++ b/pkg/arvo/sys/vane/eyre.hoon @@ -2325,7 +2325,9 @@ [~ http-server-gate] =. secure.config cert.http-rule.task =. redirect.config - &(?=(^ secure.ports.server-state.ax) ?=(^ cert.http-rule.task)) + ?& ?=(^ secure.ports.server-state.ax) + ?=(^ cert.http-rule.task) + == :_ http-server-gate =* out-duct outgoing-duct.server-state.ax ?~ out-duct ~