From 43b3a84db50d80d7f97e1474c5872ed97f3a7bd7 Mon Sep 17 00:00:00 2001 From: Isaac Visintainer Date: Tue, 19 Jun 2018 14:43:16 -0700 Subject: [PATCH] included full group information in scry --- sys/vane/clay.hoon | 19 ++++++++++++------- sys/zuse.hoon | 5 ++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/sys/vane/clay.hoon b/sys/vane/clay.hoon index 91dd1aa7c1..9ba390a5b4 100644 --- a/sys/vane/clay.hoon +++ b/sys/vane/clay.hoon @@ -2370,20 +2370,19 @@ (read-p-in pax pew.red) :: ++ read-p-in - !: |= {pax/path pes/regs} ^- dict =/ rul=(unit rule) (~(get by pes) pax) ?^ rul :+ pax mod.u.rul %- ~(rep in who.u.rul) - |= {w/whom out/(set @p)} + |= {w/whom out/(pair (set @p) (map @ta crew))} ?: ?=([$& @p] w) - (~(put in out) +.w) - =/ cru=(unit (set @p)) (~(get by cez.ruf) +.w) + [(~(put in p.out) +.w) q.out] + =/ cru=(unit crew) (~(get by cez.ruf) +.w) ?~ cru out - (~(uni in out) u.cru) - ?~ pax [/ %white ~] + [p.out (~(put by q.out) +.w u.cru)] + ?~ pax [/ %white ~ ~] $(pax (scag (dec (lent pax)) `path`pax)) :: ++ may-read @@ -2417,7 +2416,13 @@ |= {who/ship pax/path pes/regs} ^- ? =/ rul=real rul:(read-p-in pax pes) - =/ in-list=? (~(has in who.rul) who) + =/ in-list=? + ?| (~(has in p.who.rul) who) + %- ~(rep by q.who.rul) + |= [[@ta cru=crew] out=_|] + ?: out & + (~(has in cru) who) + == ?: =(%black mod.rul) !in-list in-list diff --git a/sys/zuse.hoon b/sys/zuse.hoon index bc0a291cae..d429998d57 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -508,7 +508,10 @@ {$mult p/mool} :: next version of any {$many p/? q/moat} :: track range == :: - ++ real {mod/?($black $white) who/(set ship)} :: resolved permissions + ++ real :: resolved permissions + $: mod/?($black $white) :: + who/(pair (set ship) (map @ta crew)) :: + == :: ++ regs (map path rule) :: rules for paths ++ riff {p/desk q/(unit rave)} :: request+desist ++ rite :: new permissions