ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-01 03:23:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tinnus/eyre-https-redirect' into tinnus/eyre-https-redirect

Browse Source
This commit is contained in:
Tinnus Napbus 2022-10-01 22:35:24 +13:00
commit cd6432aa86
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/arvo/sys/vane/eyre.hoon
View File

@ -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
@ -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
@ -2326,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 ~
@ -2577,7 +2578,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)