mirror of
https://github.com/urbit/shrub.git
synced 2024-09-11 12:25:43 +03:00
neo: fix printfs, add authentication
This commit is contained in:
parent
c08a0a2ec6
commit
b8b046b8e1
@ -75,7 +75,7 @@
|
|||||||
=| state-0
|
=| state-0
|
||||||
=* state -
|
=* state -
|
||||||
=<
|
=<
|
||||||
%- mute
|
!.
|
||||||
%+ libverb |
|
%+ libverb |
|
||||||
%- agent:dbug
|
%- agent:dbug
|
||||||
^- agent:gall
|
^- agent:gall
|
||||||
@ -132,6 +132,7 @@
|
|||||||
++ on-peek on-peek:run
|
++ on-peek on-peek:run
|
||||||
--
|
--
|
||||||
:: %- mute
|
:: %- mute
|
||||||
|
!.
|
||||||
|_ [=bowl:gall cards=(list card)]
|
|_ [=bowl:gall cards=(list card)]
|
||||||
:: |aux: auxilliary helpers
|
:: |aux: auxilliary helpers
|
||||||
+| %aux
|
+| %aux
|
||||||
@ -197,7 +198,7 @@
|
|||||||
++ do-ack
|
++ do-ack
|
||||||
|= =ack:neo
|
|= =ack:neo
|
||||||
^- (list card)
|
^- (list card)
|
||||||
%- (slog leaf/"do from: {<p.p.ack>} to: {<q.p.ack>}" ~)
|
:: %- (slog leaf/"do from: {<p.p.ack>} to: {<q.p.ack>}" ~)
|
||||||
?: =(p.ack sys-pith)
|
?: =(p.ack sys-pith)
|
||||||
%. *(list card)
|
%. *(list card)
|
||||||
?~ q.ack
|
?~ q.ack
|
||||||
@ -229,7 +230,6 @@
|
|||||||
=/ =name:neo (de-pith:name:neo pith)
|
=/ =name:neo (de-pith:name:neo pith)
|
||||||
=/ nonce (scot %uv run-nonce:(~(got by mate) ship.name))
|
=/ nonce (scot %uv run-nonce:(~(got by mate) ship.name))
|
||||||
=/ =spar:ames [ship.name [nonce (pout pith)]]
|
=/ =spar:ames [ship.name [nonce (pout pith)]]
|
||||||
~& fetching/spar
|
|
||||||
!! :: (pass wire %keen spar)
|
!! :: (pass wire %keen spar)
|
||||||
++ do-gall-grow
|
++ do-gall-grow
|
||||||
|= [=pith:neo sag=(unit saga:neo)]
|
|= [=pith:neo sag=(unit saga:neo)]
|
||||||
@ -292,7 +292,7 @@
|
|||||||
%gone (slog leaf/"Missing dep: {<term.u.q.ack>}" ~)
|
%gone (slog leaf/"Missing dep: {<term.u.q.ack>}" ~)
|
||||||
%goof (slog leaf/"nacked on flow {<p.ack>}" tang.u.q.ack)
|
%goof (slog leaf/"nacked on flow {<p.ack>}" tang.u.q.ack)
|
||||||
==
|
==
|
||||||
%- (slog leaf/"on-ack from: {<p.p.ack>} to: {<q.p.ack>}" ~)
|
:: %- (slog leaf/"on-ack from: {<p.p.ack>} to: {<q.p.ack>}" ~)
|
||||||
(on-move q.p.ack p.p.ack %poke ack/!>(q.ack))
|
(on-move q.p.ack p.p.ack %poke ack/!>(q.ack))
|
||||||
::
|
::
|
||||||
++ on-dirt-card
|
++ on-dirt-card
|
||||||
@ -525,7 +525,6 @@
|
|||||||
++ take-fetch
|
++ take-fetch
|
||||||
|= syn=sign-arvo
|
|= syn=sign-arvo
|
||||||
^+ sale
|
^+ sale
|
||||||
~& got-fetch/pith
|
|
||||||
?> ?=([%ames %tune *] syn)
|
?> ?=([%ames %tune *] syn)
|
||||||
?~ roar.syn
|
?~ roar.syn
|
||||||
~& missing-roar/pith
|
~& missing-roar/pith
|
||||||
@ -551,9 +550,7 @@
|
|||||||
~| mall/mall
|
~| mall/mall
|
||||||
~| pith/pith
|
~| pith/pith
|
||||||
(need find-deli)
|
(need find-deli)
|
||||||
~& del/del
|
|
||||||
=/ kid (dif:pith:neo pith del)
|
=/ kid (dif:pith:neo pith del)
|
||||||
~& kid/kid
|
|
||||||
abet:(fetched:~(meat sale del) (dif:pith:neo pith del) res)
|
abet:(fetched:~(meat sale del) (dif:pith:neo pith del) res)
|
||||||
:: XX: possibly check that
|
:: XX: possibly check that
|
||||||
++ find-deli
|
++ find-deli
|
||||||
@ -592,17 +589,14 @@
|
|||||||
?: =(p.exe.p.p.u.rot p.exe.p.aeon)
|
?: =(p.exe.p.p.u.rot p.exe.p.aeon)
|
||||||
~
|
~
|
||||||
`[pith aeon]
|
`[pith aeon]
|
||||||
~& new-yuga/yuga
|
|
||||||
meat
|
meat
|
||||||
++ fetched
|
++ fetched
|
||||||
|= [kid=pith:neo =saga:neo]
|
|= [kid=pith:neo =saga:neo]
|
||||||
=. yuga.deli (~(del of:neo yuga.deli) kid)
|
=. yuga.deli (~(del of:neo yuga.deli) kid)
|
||||||
=. epic.deli (~(put of:neo epic.deli) kid saga)
|
=. epic.deli (~(put of:neo epic.deli) kid saga)
|
||||||
~& fetched/deli
|
|
||||||
?. =(~ ~(tap of:neo yuga.deli))
|
?. =(~ ~(tap of:neo yuga.deli))
|
||||||
meat
|
meat
|
||||||
=/ =epic:neo epic.deli
|
=/ =epic:neo epic.deli
|
||||||
~& finalizing/[pith epic]
|
|
||||||
=. epic.deli *epic:neo
|
=. epic.deli *epic:neo
|
||||||
=. run (tell pith (~(rep of:neo *epic:neo) pith epic))
|
=. run (tell pith (~(rep of:neo *epic:neo) pith epic))
|
||||||
meat
|
meat
|
||||||
@ -627,7 +621,6 @@
|
|||||||
::
|
::
|
||||||
++ on-sync-sign
|
++ on-sync-sign
|
||||||
|= =sign:agent:gall
|
|= =sign:agent:gall
|
||||||
~& town/town
|
|
||||||
^+ sale
|
^+ sale
|
||||||
?+ -.sign ~|(bad-sign/-.sign !!)
|
?+ -.sign ~|(bad-sign/-.sign !!)
|
||||||
%watch-ack
|
%watch-ack
|
||||||
@ -638,7 +631,6 @@
|
|||||||
::
|
::
|
||||||
%fact
|
%fact
|
||||||
?. =(%neo-yuga p.cage.sign)
|
?. =(%neo-yuga p.cage.sign)
|
||||||
~& weird-mall-fact/p.cage.sign
|
|
||||||
sale
|
sale
|
||||||
(on-yuga !<(yuga:neo q.cage.sign))
|
(on-yuga !<(yuga:neo q.cage.sign))
|
||||||
::
|
::
|
||||||
@ -677,7 +669,6 @@
|
|||||||
=/ lis ~(tap of:neo yuga)
|
=/ lis ~(tap of:neo yuga)
|
||||||
|-
|
|-
|
||||||
?~ lis
|
?~ lis
|
||||||
~& done-yuga-town/town
|
|
||||||
abet:(new:meat yuga)
|
abet:(new:meat yuga)
|
||||||
=/ [kid=pith:neo =aeon:neo] i.lis
|
=/ [kid=pith:neo =aeon:neo] i.lis
|
||||||
=/ pit (welp pith kid)
|
=/ pit (welp pith kid)
|
||||||
@ -688,12 +679,9 @@
|
|||||||
~& nothing/pit
|
~& nothing/pit
|
||||||
$(lis t.lis)
|
$(lis t.lis)
|
||||||
?~ u.res
|
?~ u.res
|
||||||
~& dead/pit
|
|
||||||
:: XX: what means??
|
:: XX: what means??
|
||||||
$(lis t.lis)
|
$(lis t.lis)
|
||||||
~& alive/pit
|
|
||||||
?: =(p.u.u.res aeon)
|
?: =(p.u.u.res aeon)
|
||||||
~& clone/pit
|
|
||||||
$(lis t.lis, yuga (~(del of:neo yuga) kid))
|
$(lis t.lis, yuga (~(del of:neo yuga) kid))
|
||||||
~& fresh/pit
|
~& fresh/pit
|
||||||
=. run abet:(~(fresh sale pit) aeon)
|
=. run abet:(~(fresh sale pit) aeon)
|
||||||
@ -858,9 +846,7 @@
|
|||||||
=/ =name:neo (de-pith:name:neo change)
|
=/ =name:neo (de-pith:name:neo change)
|
||||||
=? run =(our.bowl ship.name)
|
=? run =(our.bowl ship.name)
|
||||||
(cure pith.name)
|
(cure pith.name)
|
||||||
~& reaping/change
|
|
||||||
=/ =rave:neo (~(gut of:neo riot) change *rave:neo)
|
=/ =rave:neo (~(gut of:neo riot) change *rave:neo)
|
||||||
~& rave/rave
|
|
||||||
=. run (heal:rage:(heal:rage:(heal x/change exe.rave) y/change why.rave) z/change zed.rave)
|
=. run (heal:rage:(heal:rage:(heal x/change exe.rave) y/change why.rave) z/change zed.rave)
|
||||||
run(riot (~(del of:neo riot) change))
|
run(riot (~(del of:neo riot) change))
|
||||||
::
|
::
|
||||||
@ -930,7 +916,6 @@
|
|||||||
++ free
|
++ free
|
||||||
|= =hunt:neo
|
|= =hunt:neo
|
||||||
^+ run
|
^+ run
|
||||||
~& resolved/hunt
|
|
||||||
:: XX: weird shadowing, be careful
|
:: XX: weird shadowing, be careful
|
||||||
=/ =rave:neo (~(gut of:neo riot) pith.hunt *rave:neo)
|
=/ =rave:neo (~(gut of:neo riot) pith.hunt *rave:neo)
|
||||||
=. rave
|
=. rave
|
||||||
@ -962,8 +947,8 @@
|
|||||||
=/ res (need (look-x:till case.loot pith))
|
=/ res (need (look-x:till case.loot pith))
|
||||||
?: &(?=(^ res) =(%vase p.q.u.res))
|
?: &(?=(^ res) =(%vase p.q.u.res))
|
||||||
$(git t.git)
|
$(git t.git)
|
||||||
=. run
|
:: =. run
|
||||||
(emit (do-gall-grow pith (need (look-x:till case.loot pith))))
|
:: (emit (do-gall-grow pith (need (look-x:till case.loot pith))))
|
||||||
$(git t.git)
|
$(git t.git)
|
||||||
|
|
||||||
++ take-dirt-card
|
++ take-dirt-card
|
||||||
@ -1017,7 +1002,6 @@
|
|||||||
run
|
run
|
||||||
++ resolved
|
++ resolved
|
||||||
|= =hunt:neo
|
|= =hunt:neo
|
||||||
~& resolved/hunt
|
|
||||||
=/ fow=(unit flow:neo) (~(get by by-hunt.halt) hunt)
|
=/ fow=(unit flow:neo) (~(get by by-hunt.halt) hunt)
|
||||||
?~ fow
|
?~ fow
|
||||||
run
|
run
|
||||||
@ -1688,7 +1672,7 @@
|
|||||||
::
|
::
|
||||||
:: +arvo: local callstack
|
:: +arvo: local callstack
|
||||||
++ arvo
|
++ arvo
|
||||||
=+ verb=&
|
=+ verb=|
|
||||||
=/ old state
|
=/ old state
|
||||||
:: data for blocking semantics
|
:: data for blocking semantics
|
||||||
=| =block:neo
|
=| =block:neo
|
||||||
|
@ -248,7 +248,7 @@
|
|||||||
%add
|
%add
|
||||||
%dif
|
%dif
|
||||||
?: &(=(%dif mode) =(q.q:(need old) q.poem))
|
?: &(=(%dif mode) =(q.q:(need old) q.poem))
|
||||||
~& %dupe-skipping
|
:: ~& %dupe-skipping
|
||||||
`loam
|
`loam
|
||||||
~| overwrite-soil/p.p.poem
|
~| overwrite-soil/p.p.poem
|
||||||
?> !(has:on:soil:neo u.fil.loam p.p.poem)
|
?> !(has:on:soil:neo u.fil.loam p.p.poem)
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
++ build
|
++ build
|
||||||
|= [=bowl:neo conf=accel-conf]
|
|= [=bowl:neo conf=accel-conf]
|
||||||
^- (quip card pail:neo)
|
^- (quip card pail:neo)
|
||||||
~& build/conf
|
|
||||||
:_ accel-conf/!>(conf)
|
:_ accel-conf/!>(conf)
|
||||||
=/ =term
|
=/ =term
|
||||||
`@tas`(cat 3 'accel-' (scot %t (spat (pout (snip here.bowl)))))
|
`@tas`(cat 3 'accel-' (scot %t (spat (pout (snip here.bowl)))))
|
||||||
@ -48,7 +47,6 @@
|
|||||||
|= =bowl:neo
|
|= =bowl:neo
|
||||||
^- pail:neo
|
^- pail:neo
|
||||||
=/ missing (check-prelude bowl)
|
=/ missing (check-prelude bowl)
|
||||||
~& hoon/hoon.conf
|
|
||||||
?. =(missing ~)
|
?. =(missing ~)
|
||||||
:- %tang !> ^- tang
|
:- %tang !> ^- tang
|
||||||
[leaf/"Missing deps" (turn ~(tap in missing) |=(=term leaf/(trip term)))]
|
[leaf/"Missing deps" (turn ~(tap in missing) |=(=term leaf/(trip term)))]
|
||||||
@ -77,7 +75,6 @@
|
|||||||
|= [=stud:neo vax=vase]
|
|= [=stud:neo vax=vase]
|
||||||
^- (quip card:neo pail:neo)
|
^- (quip card:neo pail:neo)
|
||||||
=/ new=pail:neo (produce bowl)
|
=/ new=pail:neo (produce bowl)
|
||||||
%- (slog leaf/"New val: {<here.bowl>}" (sell q.new) ~)
|
|
||||||
?: =(new pail) `new
|
?: =(new pail) `new
|
||||||
:_ new
|
:_ new
|
||||||
%+ turn ~(tap by poke.conf)
|
%+ turn ~(tap by poke.conf)
|
||||||
@ -87,7 +84,6 @@
|
|||||||
++ init
|
++ init
|
||||||
|= pal=(unit pail:neo)
|
|= pal=(unit pail:neo)
|
||||||
=/ new=pail:neo (produce bowl)
|
=/ new=pail:neo (produce bowl)
|
||||||
%- (slog leaf/"New val: {<here.bowl>}" (sell q.new) ~)
|
|
||||||
`new
|
`new
|
||||||
--
|
--
|
||||||
--
|
--
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
/@ eyre-reqs
|
/@ eyre-reqs
|
||||||
/- serv=sky-server
|
/- serv=sky-server
|
||||||
|
/- srv=server
|
||||||
^- kook:neo
|
^- kook:neo
|
||||||
|%
|
|%
|
||||||
++ state pro/%sig
|
++ state pro/%sig
|
||||||
@ -24,6 +25,11 @@
|
|||||||
%eyre-task
|
%eyre-task
|
||||||
=+ !<(=task:eyre:neo vax)
|
=+ !<(=task:eyre:neo vax)
|
||||||
=/ [eyre-id=@ta req=inbound-request:eyre] task
|
=/ [eyre-id=@ta req=inbound-request:eyre] task
|
||||||
|
?. authenticated.req
|
||||||
|
=/ eyre=pith:neo #/[p/our.bowl]/$/eyre
|
||||||
|
:_ pail
|
||||||
|
%+ ~(respond neo:srv eyre) eyre-id
|
||||||
|
(login-redirect:gen:srv request.req)
|
||||||
=/ purl (parse-url:serv request.req)
|
=/ purl (parse-url:serv request.req)
|
||||||
=/ inner=pith:neo (pave:neo pax.purl)
|
=/ inner=pith:neo (pave:neo pax.purl)
|
||||||
=/ =crew:neo (~(gas by *crew:neo) src/inner ~)
|
=/ =crew:neo (~(gas by *crew:neo) src/inner ~)
|
||||||
|
@ -21,6 +21,12 @@
|
|||||||
%eyre-task
|
%eyre-task
|
||||||
=+ !<(=task:eyre:neo vax)
|
=+ !<(=task:eyre:neo vax)
|
||||||
=/ [eyre-id=@ta req=inbound-request:eyre] task
|
=/ [eyre-id=@ta req=inbound-request:eyre] task
|
||||||
|
?. authenticated.req
|
||||||
|
=/ eyre=pith:neo #/[p/our.bowl]/$/eyre
|
||||||
|
:_ pail
|
||||||
|
%+ ~(respond neo:serv eyre) eyre-id
|
||||||
|
(login-redirect:gen:serv request.req)
|
||||||
|
|
||||||
=/ inner=pith:neo #/[p/our.bowl]/sky
|
=/ inner=pith:neo #/[p/our.bowl]/sky
|
||||||
=/ =crew:neo (~(gas by *crew:neo) src/inner ~)
|
=/ =crew:neo (~(gas by *crew:neo) src/inner ~)
|
||||||
=/ =made:neo [%sky-eyre-handler `[stud vax] crew]
|
=/ =made:neo [%sky-eyre-handler `[stud vax] crew]
|
||||||
|
1
pkg/shrub/sys.kelvin
Normal file
1
pkg/shrub/sys.kelvin
Normal file
@ -0,0 +1 @@
|
|||||||
|
[%zuse 411]
|
Loading…
Reference in New Issue
Block a user