Tarantool development patches archive
 help / color / mirror / Atom feed
* [Tarantool-patches] [PATCH luajit] test: adapt tests checking loading bytecode files
@ 2021-09-24 14:28 Maxim Kokryashkin via Tarantool-patches
  2021-10-11 14:25 ` Sergey Kaplun via Tarantool-patches
  0 siblings, 1 reply; 4+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2021-09-24 14:28 UTC (permalink / raw)
  To: tarantool-patches, imun, skaplun

Loading bytecode with an extra header (BOM or "#") is disabled
for security reasons since LuaJIT-2.0.0-beta10.
For more information see comment for `lj_lex_setup()` in <src/lj_lex.c>.
Also see commit 53a285c ('Disable
loading bytecode with an extra header (BOM or #!).').
Tests are adapted to LuaJIT behavior.

Closes tarantool/tarantool#5691
Part of tarantool/tarantool#5845
Part of tarantool/tarantool#4473
---
Issue: https://github.com/tarantool/tarantool/issues/5691
Branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-5691-adapt-bytecode-PUC-Rio

 test/PUC-Rio-Lua-5.1-tests/main.lua | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/PUC-Rio-Lua-5.1-tests/main.lua b/test/PUC-Rio-Lua-5.1-tests/main.lua
index 07facc4c..c62950c8 100644
--- a/test/PUC-Rio-Lua-5.1-tests/main.lua
+++ b/test/PUC-Rio-Lua-5.1-tests/main.lua
@@ -172,23 +172,17 @@ prepfile(s)
 prepfile[[#comment in 1st line without \n at the end]]
 RUN("lua %s", prog)
 
--- FIXME: Loading bytecode with an extra header (BOM or "#")
+-- Loading bytecode with an extra header (BOM or "#")
 -- is disabled for security reasons since LuaJIT-2.0.0-beta10.
 -- For more information see comment for `lj_lex_setup()`
 -- in <src/lj_lex.c>.
 -- Also see commit 53a285c0c3544ff5dea7c67b741c3c2d06d22b47
 -- (Disable loading bytecode with an extra header (BOM or #!).).
 -- See also https://github.com/tarantool/tarantool/issues/5691.
--- The test is disabled for LuaJIT.
-prepfile("#comment with a binary file\n"..string.dump(loadstring("print(1)")))
--- RUN("lua %s > %s", prog, out)
--- checkout("1\n")
-
-prepfile("#comment with a binary file\r\n"..string.dump(loadstring("print(1)")))
--- FIXME: Behavior is different for LuaJIT. See the comment above.
--- The test is disabled for LuaJIT.
--- RUN("lua %s > %s", prog, out)
--- checkout("1\n")
+-- The test is adapted to LuaJIT behavior.
+prepfile(string.dump(loadstring("print(1)")))
+RUN("lua %s > %s", prog, out)
+checkout("1\n")
 
 -- close Lua with an open file
 prepfile(string.format([[io.output(%q); io.write('alo')]], out))
-- 
2.33.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Tarantool-patches] [PATCH luajit] test: adapt tests checking loading bytecode files
  2021-09-24 14:28 [Tarantool-patches] [PATCH luajit] test: adapt tests checking loading bytecode files Maxim Kokryashkin via Tarantool-patches
@ 2021-10-11 14:25 ` Sergey Kaplun via Tarantool-patches
  2021-10-11 20:02   ` Максим Корякшин via Tarantool-patches
  0 siblings, 1 reply; 4+ messages in thread
From: Sergey Kaplun via Tarantool-patches @ 2021-10-11 14:25 UTC (permalink / raw)
  To: Maxim Kokryashkin; +Cc: tarantool-patches

Hi, Maxim!

Thanks for the patch!

LGTM, except a few comments below.

On 24.09.21, Maxim Kokryashkin wrote:
> Loading bytecode with an extra header (BOM or "#") is disabled
> for security reasons since LuaJIT-2.0.0-beta10.
> For more information see comment for `lj_lex_setup()` in <src/lj_lex.c>.
> Also see commit 53a285c ('Disable

Nit: It is better to use the full commit hash here to avoid clashing.

> loading bytecode with an extra header (BOM or #!).').
> Tests are adapted to LuaJIT behavior.
> 
> Closes tarantool/tarantool#5691
> Part of tarantool/tarantool#5845
> Part of tarantool/tarantool#4473

Looks like it should be 5870 instead. 5873 is a unbrella for all tests
activities.

> ---

Also, please attach tarantool branch with CI to check it is OK.

> Issue: https://github.com/tarantool/tarantool/issues/5691
> Branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-5691-adapt-bytecode-PUC-Rio
> 
>  test/PUC-Rio-Lua-5.1-tests/main.lua | 16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)
> 
> diff --git a/test/PUC-Rio-Lua-5.1-tests/main.lua b/test/PUC-Rio-Lua-5.1-tests/main.lua
> index 07facc4c..c62950c8 100644
> --- a/test/PUC-Rio-Lua-5.1-tests/main.lua
> +++ b/test/PUC-Rio-Lua-5.1-tests/main.lua
> @@ -172,23 +172,17 @@ prepfile(s)
>  prepfile[[#comment in 1st line without \n at the end]]
>  RUN("lua %s", prog)
>  
> --- FIXME: Loading bytecode with an extra header (BOM or "#")
> +-- Loading bytecode with an extra header (BOM or "#")
>  -- is disabled for security reasons since LuaJIT-2.0.0-beta10.
>  -- For more information see comment for `lj_lex_setup()`
>  -- in <src/lj_lex.c>.
>  -- Also see commit 53a285c0c3544ff5dea7c67b741c3c2d06d22b47
>  -- (Disable loading bytecode with an extra header (BOM or #!).).
>  -- See also https://github.com/tarantool/tarantool/issues/5691.
> --- The test is disabled for LuaJIT.
> -prepfile("#comment with a binary file\n"..string.dump(loadstring("print(1)")))
> --- RUN("lua %s > %s", prog, out)
> --- checkout("1\n")
> -
> -prepfile("#comment with a binary file\r\n"..string.dump(loadstring("print(1)")))
> --- FIXME: Behavior is different for LuaJIT. See the comment above.
> --- The test is disabled for LuaJIT.
> --- RUN("lua %s > %s", prog, out)
> --- checkout("1\n")
> +-- The test is adapted to LuaJIT behavior.
> +prepfile(string.dump(loadstring("print(1)")))
> +RUN("lua %s > %s", prog, out)
> +checkout("1\n")

May be it is better to test `NoRun()` for 1 binary file with a comment at the
first string and `Run()` for another binary file without the comment.

>  
>  -- close Lua with an open file
>  prepfile(string.format([[io.output(%q); io.write('alo')]], out))
> -- 
> 2.33.0
> 

-- 
Best regards,
Sergey Kaplun

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Tarantool-patches]  [PATCH luajit] test: adapt tests checking loading bytecode files
  2021-10-11 14:25 ` Sergey Kaplun via Tarantool-patches
@ 2021-10-11 20:02   ` Максим Корякшин via Tarantool-patches
  2021-10-12  8:13     ` Sergey Kaplun via Tarantool-patches
  0 siblings, 1 reply; 4+ messages in thread
From: Максим Корякшин via Tarantool-patches @ 2021-10-11 20:02 UTC (permalink / raw)
  To: Sergey Kaplun; +Cc: Maxim Kokryashkin, tarantool-patches

[-- Attachment #1: Type: text/plain, Size: 3641 bytes --]


Hi!
Thanks for the comments, here is the new commit message:
==========================================================
test: adapt tests checking loading bytecode files
 
Loading bytecode with an extra header (BOM or "#") is disabled
for security reasons since LuaJIT-2.0.0-beta10.
For more information see comment for `lj_lex_setup()` in <src/lj_lex.c>.
Also see commit 53a285c0c3544ff5dea7c67b741c3c2d06d22b47 ('Disable
loading bytecode with an extra header (BOM or #!).').
Tests are adapted to LuaJIT behavior.
 
Part of tarantool/tarantool#5870
==========================================================
 
CI:  https://github.com/tarantool/tarantool/tree/fckxorg/gh-5691-adapt-bytecode-PUC-Rio
 
Best regards,
Maxim Kokryashkin
  
>Понедельник, 11 октября 2021, 17:26 +03:00 от Sergey Kaplun <skaplun@tarantool.org>:
> 
>Hi, Maxim!
>
>Thanks for the patch!
>
>LGTM, except a few comments below.
>
>On 24.09.21, Maxim Kokryashkin wrote:
>> Loading bytecode with an extra header (BOM or "#") is disabled
>> for security reasons since LuaJIT-2.0.0-beta10.
>> For more information see comment for `lj_lex_setup()` in <src/lj_lex.c>.
>> Also see commit 53a285c ('Disable
>
>Nit: It is better to use the full commit hash here to avoid clashing.
>
>> loading bytecode with an extra header (BOM or #!).').
>> Tests are adapted to LuaJIT behavior.
>>
>> Closes tarantool/tarantool#5691
>> Part of tarantool/tarantool#5845
>> Part of tarantool/tarantool#4473
>
>Looks like it should be 5870 instead. 5873 is a unbrella for all tests
>activities.
>
>> ---
>
>Also, please attach tarantool branch with CI to check it is OK.
>
>> Issue:  https://github.com/tarantool/tarantool/issues/5691
>> Branch:  https://github.com/tarantool/luajit/tree/fckxorg/gh-5691-adapt-bytecode-PUC-Rio
>>
>> test/PUC-Rio-Lua-5.1-tests/main.lua | 16 +++++-----------
>> 1 file changed, 5 insertions(+), 11 deletions(-)
>>
>> diff --git a/test/PUC-Rio-Lua-5.1-tests/main.lua b/test/PUC-Rio-Lua-5.1-tests/main.lua
>> index 07facc4c..c62950c8 100644
>> --- a/test/PUC-Rio-Lua-5.1-tests/main.lua
>> +++ b/test/PUC-Rio-Lua-5.1-tests/main.lua
>> @@ -172,23 +172,17 @@ prepfile(s)
>> prepfile[[#comment in 1st line without \n at the end]]
>> RUN("lua %s", prog)
>>
>> --- FIXME: Loading bytecode with an extra header (BOM or "#")
>> +-- Loading bytecode with an extra header (BOM or "#")
>> -- is disabled for security reasons since LuaJIT-2.0.0-beta10.
>> -- For more information see comment for `lj_lex_setup()`
>> -- in <src/lj_lex.c>.
>> -- Also see commit 53a285c0c3544ff5dea7c67b741c3c2d06d22b47
>> -- (Disable loading bytecode with an extra header (BOM or #!).).
>> -- See also  https://github.com/tarantool/tarantool/issues/5691 .
>> --- The test is disabled for LuaJIT.
>> -prepfile("#comment with a binary file\n"..string.dump(loadstring("print(1)")))
>> --- RUN("lua %s > %s", prog, out)
>> --- checkout("1\n")
>> -
>> -prepfile("#comment with a binary file\r\n"..string.dump(loadstring("print(1)")))
>> --- FIXME: Behavior is different for LuaJIT. See the comment above.
>> --- The test is disabled for LuaJIT.
>> --- RUN("lua %s > %s", prog, out)
>> --- checkout("1\n")
>> +-- The test is adapted to LuaJIT behavior.
>> +prepfile(string.dump(loadstring("print(1)")))
>> +RUN("lua %s > %s", prog, out)
>> +checkout("1\n")
>
>May be it is better to test `NoRun()` for 1 binary file with a comment at the
>first string and `Run()` for another binary file without the comment.
>
>>
>> -- close Lua with an open file
>> prepfile(string.format([[io.output(%q); io.write('alo')]], out))
>> --
>> 2.33.0
>>
>
>--
>Best regards,
>Sergey Kaplun
 

[-- Attachment #2: Type: text/html, Size: 4832 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Tarantool-patches] [PATCH luajit] test: adapt tests checking loading bytecode files
  2021-10-11 20:02   ` Максим Корякшин via Tarantool-patches
@ 2021-10-12  8:13     ` Sergey Kaplun via Tarantool-patches
  0 siblings, 0 replies; 4+ messages in thread
From: Sergey Kaplun via Tarantool-patches @ 2021-10-12  8:13 UTC (permalink / raw)
  To: Максим
	Корякшин
  Cc: Maxim Kokryashkin, tarantool-patches

Hi!

Thanks for the fixes!

On 11.10.21, Максим Корякшин wrote:
> 

<snipped>

> >>
> >> --- FIXME: Loading bytecode with an extra header (BOM or "#")
> >> +-- Loading bytecode with an extra header (BOM or "#")
> >> -- is disabled for security reasons since LuaJIT-2.0.0-beta10.
> >> -- For more information see comment for `lj_lex_setup()`
> >> -- in <src/lj_lex.c>.
> >> -- Also see commit 53a285c0c3544ff5dea7c67b741c3c2d06d22b47
> >> -- (Disable loading bytecode with an extra header (BOM or #!).).
> >> -- See also  https://github.com/tarantool/tarantool/issues/5691 .
> >> --- The test is disabled for LuaJIT.
> >> -prepfile("#comment with a binary file\n"..string.dump(loadstring("print(1)")))
> >> --- RUN("lua %s > %s", prog, out)
> >> --- checkout("1\n")
> >> -
> >> -prepfile("#comment with a binary file\r\n"..string.dump(loadstring("print(1)")))
> >> --- FIXME: Behavior is different for LuaJIT. See the comment above.
> >> --- The test is disabled for LuaJIT.
> >> --- RUN("lua %s > %s", prog, out)
> >> --- checkout("1\n")
> >> +-- The test is adapted to LuaJIT behavior.
> >> +prepfile(string.dump(loadstring("print(1)")))
> >> +RUN("lua %s > %s", prog, out)
> >> +checkout("1\n")
> >
> >May be it is better to test `NoRun()` for 1 binary file with a comment at the
> >first string and `Run()` for another binary file without the comment.

What are your thoughts about this idea?

> >
> >>
> >> -- close Lua with an open file
> >> prepfile(string.format([[io.output(%q); io.write('alo')]], out))
> >> --
> >> 2.33.0
> >>
> >
> >--
> >Best regards,
> >Sergey Kaplun
>  

-- 
Best regards,
Sergey Kaplun

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-10-12  8:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-24 14:28 [Tarantool-patches] [PATCH luajit] test: adapt tests checking loading bytecode files Maxim Kokryashkin via Tarantool-patches
2021-10-11 14:25 ` Sergey Kaplun via Tarantool-patches
2021-10-11 20:02   ` Максим Корякшин via Tarantool-patches
2021-10-12  8:13     ` Sergey Kaplun via Tarantool-patches

Tarantool development patches archive

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lists.tarantool.org/tarantool-patches/0 tarantool-patches/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 tarantool-patches tarantool-patches/ https://lists.tarantool.org/tarantool-patches \
		tarantool-patches@dev.tarantool.org.
	public-inbox-index tarantool-patches

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git