[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] RE: [Xen-API] [PATCH] CA-35368: use unambiguous key-tag in permission
Hi Dave, The test team has already been informed of this modification; the XenCenter team has already tested this patch and said everything was working as expected. So, I think it's better if we could push this patch asap as well, so everything is synchronized. Cheers, Marcus > -----Original Message----- > From: Dave Scott > Sent: 02 December 2009 17:15 > To: Marcus Granado; xen-api > Subject: RE: [Xen-API] [PATCH] CA-35368: use unambiguous key-tag in > permission > > Hi Marcus, > > Do any of the RBAC automated tests depend on this patch? Is it urgent > or can I add it to my pending queue and deal with it later? > > Cheers, > Dave > > > -----Original Message----- > > From: xen-api-bounces@xxxxxxxxxxxxxxxxxxx [mailto:xen-api- > > bounces@xxxxxxxxxxxxxxxxxxx] On Behalf Of Marcus Granado > > Sent: 02 December 2009 13:24 > > To: xen-api > > Subject: [Xen-API] [PATCH] CA-35368: use unambiguous key-tag in > > permission > > > > 2 files changed, 5 insertions(+), 4 deletions(-) > > ocaml/idl/ocaml_backend/gen_rbac.ml | 5 +++-- > > ocaml/idl/ocaml_backend/rbac.ml | 4 ++-- > > > > > > # HG changeset patch > > # User Marcus Granado <marcus.granado@xxxxxxxxxx> # Date 1259760103 0 > # > > Node ID 27bf2365d9e208039b1f663f82a4cc46b89305a1 > > # Parent 994723beb3142a90e7247ed5c4cd947bf6e77a83 > > CA-35368: use unambiguous key-tag in permission > > > > Signed-off-by: Marcus Granado <marcus.granado@xxxxxxxxxxxxx> > > > > diff -r 994723beb314 -r 27bf2365d9e2 > > ocaml/idl/ocaml_backend/gen_rbac.ml > > --- a/ocaml/idl/ocaml_backend/gen_rbac.ml Tue Dec 01 12:16:01 > 2009 > > +0000 > > +++ b/ocaml/idl/ocaml_backend/gen_rbac.ml Wed Dec 02 13:21:43 > 2009 > > +0000 > > @@ -80,7 +80,8 @@ > > let permission_name wire_name = > > let s1 =replace_char (Printf.sprintf "permission_%s" wire_name) > > '.' '_' in > > let s2 = replace_char s1 '/' '_' in > > - Stringext.String.replace "*" "WILDCHAR" s2 > > + let s3 = Stringext.String.replace "*" "WILDCHAR" s2 in > > + Stringext.String.replace ":" "_" s3 > > > > let permission_index = ref 0 > > let writer_permission name nperms = > > @@ -215,7 +216,7 @@ > > concat (xperm,((r,xperm::perms)::r2),extra_rs) > > > > let get_key_permission_name permission key_name = > > - permission ^ "/key_" ^ key_name > > + permission ^ "/key:" ^ key_name > > > > let add_permission_to_roles roles_permissions (obj: obj) (x: message) > > = > > let msg_allowed_roles = x.msg_allowed_roles in diff -r > > 994723beb314 -r 27bf2365d9e2 ocaml/idl/ocaml_backend/rbac.ml > > --- a/ocaml/idl/ocaml_backend/rbac.ml Tue Dec 01 12:16:01 2009 > > +0000 > > +++ b/ocaml/idl/ocaml_backend/rbac.ml Wed Dec 02 13:21:43 2009 > > +0000 > > @@ -97,11 +97,11 @@ > > > > (* create a key permission name that can be in the session *) let > > get_key_permission_name permission key_name = > > - permission ^ "/key_" ^ key_name > > + permission ^ "/key:" ^ key_name > > > > (* create a key-error permission name that is never in the session *) > > let get_keyERR_permission_name permission err = > > - permission ^ "/keyERR_" ^ err > > + permission ^ "/keyERR:" ^ err > > > > let permission_of_action ?args ~keys _action = > > (* all permissions are in lowercase, see gen_rbac.writer_ *) _______________________________________________ xen-api mailing list xen-api@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/mailman/listinfo/xen-api
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |