Tarantool development patches archive
 help / color / mirror / Atom feed
From: Serge Petrenko <sergepetrenko@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Serge Petrenko <sergepetrenko@tarantool.org>
Subject: [tarantool-patches] [PATCH] lua: fix assertion failure after improper box.schema.user:passwd() call
Date: Mon, 10 Sep 2018 16:36:43 +0300	[thread overview]
Message-ID: <20180910133643.22656-1-sergepetrenko@tarantool.org> (raw)

Calling box.schema.user:passwd() instead of box.schema.user.passwd()
leads to lua passing box.schema.user table as first function argument.
This case was unhandled in box.schema.user.passwd() function and lead to
an assertion failure.
Fix this by handling the aforementioned case and add a test.

Closes #3659
---
https://github.com/tarantool/tarantool/issues/3659
https://github.com/tarantool/tarantool/tree/sp/gh-3659-assert-in-user-passwd

 src/box/lua/schema.lua | 2 +-
 test/box/misc.result   | 8 ++++++++
 test/box/misc.test.lua | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua
index 540a2a5fd..6b0c1cbb7 100644
--- a/src/box/lua/schema.lua
+++ b/src/box/lua/schema.lua
@@ -2025,7 +2025,7 @@ local function chpasswd(uid, new_password)
 end
 
 box.schema.user.passwd = function(name, new_password)
-    if name == nil then
+    if name == nil or type(name) == 'table' then
         box.error(box.error.PROC_LUA, "Usage: box.schema.user.passwd([user,] password)")
     end
     if new_password == nil then
diff --git a/test/box/misc.result b/test/box/misc.result
index 62376754e..6f05df0fa 100644
--- a/test/box/misc.result
+++ b/test/box/misc.result
@@ -1148,6 +1148,14 @@ s = box.schema.space.create('test', {user="no_such_user"})
 ---
 - error: User 'no_such_user' is not found
 ...
+--
+-- gh-3659 assertion failure on improper call to
+-- box.schema.user:passwd()
+--
+box.schema.user:passwd()
+---
+- error: 'Usage: box.schema.user.passwd([user,] password)'
+...
 -- Too long WAL write warning (gh-2743).
 s = box.schema.space.create('test')
 ---
diff --git a/test/box/misc.test.lua b/test/box/misc.test.lua
index d6815645e..79c74ecbb 100644
--- a/test/box/misc.test.lua
+++ b/test/box/misc.test.lua
@@ -320,6 +320,12 @@ s:drop()
 --
 s = box.schema.space.create('test', {user="no_such_user"})
 
+--
+-- gh-3659 assertion failure on improper call to
+-- box.schema.user:passwd()
+--
+box.schema.user:passwd()
+
 -- Too long WAL write warning (gh-2743).
 s = box.schema.space.create('test')
 _ = s:create_index('pk')
-- 
2.15.2 (Apple Git-101.1)

             reply	other threads:[~2018-09-10 13:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-10 13:36 Serge Petrenko [this message]
2018-09-14 15:17 ` Vladimir Davydov
2018-09-17 14:48   ` Serge Petrenko
2018-09-17 15:42     ` Vladimir Davydov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180910133643.22656-1-sergepetrenko@tarantool.org \
    --to=sergepetrenko@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [tarantool-patches] [PATCH] lua: fix assertion failure after improper box.schema.user:passwd() call' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox