[Tarantool-patches] [PATCH] box: user.grant error should be versatile

Igor Munkin imun at tarantool.org
Thu Feb 20 13:47:24 MSK 2020


Masha,

Thanks for the patch. It LGTM except the one minor comment below.

On 19.02.20, Maria Khaydich wrote:
> 
> Error message on granted privileges was not flexible and
> did not distinguish between universal or any other priviliges
> leaving either 'nil' or simply '' at the end.
>  
> Closes #714
> ----------------------------------------------------------------------
> Issue:
> https://github.com/tarantool/tarantool/issues/714  
> Branch:
> https://github.com/tarantool/tarantool/tree/eljashm/gh-714-box-schema-user-grant-invalid-error  
>  
>  src/box/errcode.h        |  2 +-
>  src/box/lua/schema.lua   |  3 +++
>  test/box/access.result   | 30 ++++++++++++++++++++++++++++--
>  test/box/access.test.lua | 14 ++++++++++++++
>  4 files changed, 46 insertions(+), 3 deletions(-)
>  

<snipped>

> diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua
> index 50c96a335..228f8798a 100644
> --- a/src/box/lua/schema.lua
> +++ b/src/box/lua/schema.lua
> @@ -2408,6 +2408,9 @@ local function grant(uid, name, privilege, object_type,
>                 privilege == 'execute' then
>                  box.error(box.error.ROLE_GRANTED, name, object_name)
>              else
> +                if object_type ~= 'universe' then
> +                    object_name = ' \''..object_name..'\''

Minor: the way you build the resulting error string seems to be
inconvenient to me. Please consider the following and choose the one
you guess fits more:
| object_name = " '" .. object_name .. "'"
or
| object name = string.format(" '%s'", object_name)

> +                end
>                  box.error(box.error.PRIV_GRANTED, name, privilege,
>                            object_type, object_name)
>              end
>  

<snipped>

> -- 
> 2.24.0
>  
> --
> Maria Khaydich

-- 
Best regards,
IM


More information about the Tarantool-patches mailing list