wikimedia/mediawiki-extensions-Scribunto
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto synced 2024-11-28 02:00:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

LuaStandalone: Properly handle serialization errors

Browse source 
When we're making a call from Lua to PHP, serialization errors should be
propagated to whatever in Lua made the call. That works fine.

But when we're returning data in response to a call from PHP, if there's
a serialization error we need to catch it and tell PHP about it.
Otherwise PHP just gets a useless "the interpreter exited".

Change-Id: Iaac498fa2e486631d38e2366977b360140756519
This commit is contained in:
Brad Jorsch 2018-02-06 15:53:40 -05:00
parent c3f6e81839
commit 2a70e8b3f1
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
engines/LuaStandalone/MWServer.lua
View file

@ -289,7 +289,7 @@ end
-- @return The matching response message
function MWServer:dispatch( msgToPhp )
if msgToPhp then
self:sendMessage( msgToPhp )
self:sendMessage( msgToPhp, 'call' )
end
while true do
local msgFromPhp = self:receiveMessage()
@ -299,22 +299,22 @@ function MWServer:dispatch( msgToPhp )
return msgFromPhp
elseif op == 'call' then
msgToPhp = self:handleCall( msgFromPhp )
self:sendMessage( msgToPhp )
self:sendMessage( msgToPhp, 'reply' )
elseif op == 'loadString' then
msgToPhp = self:handleLoadString( msgFromPhp )
self:sendMessage( msgToPhp )
self:sendMessage( msgToPhp, 'reply' )
elseif op == 'registerLibrary' then
msgToPhp = self:handleRegisterLibrary( msgFromPhp )
self:sendMessage( msgToPhp )
self:sendMessage( msgToPhp, 'reply' )
elseif op == 'wrapPhpFunction' then
msgToPhp = self:handleWrapPhpFunction( msgFromPhp )
self:sendMessage( msgToPhp )
self:sendMessage( msgToPhp, 'reply' )
elseif op == 'cleanupChunks' then
msgToPhp = self:handleCleanupChunks( msgFromPhp )
self:sendMessage( msgToPhp )
self:sendMessage( msgToPhp, 'reply' )
elseif op == 'getStatus' then
msgToPhp = self:handleGetStatus( msgFromPhp )
self:sendMessage( msgToPhp )
self:sendMessage( msgToPhp, 'reply' )
elseif op == 'quit' then
self:debug( 'MWServer:dispatch: quit message received' )
os.exit(0)
@ -369,12 +369,29 @@ end
--- Send a message to PHP
-- @param msg The message table
function MWServer:sendMessage( msg )
-- @param direction 'call' or 'reply'
function MWServer:sendMessage( msg, direction )
if not msg.op then
self:internalError( "MWServer:sendMessage: invalid message", 2 )
end
self:debug('TX ==> ' .. msg.op)
local encMsg = self:encodeMessage( msg )
-- If we're making an outgoing call, let errors go to our caller. If we're
-- replying to a call from PHP, catch serialization errors and return them
-- to PHP.
local encMsg;
if direction == 'reply' then
local ok
ok, encMsg = pcall( self.encodeMessage, self, msg )
if not ok then
self:debug('Serialization failed: ' .. encMsg)
self:debug('TX ==> error')
encMsg = self:encodeMessage( { op = 'error', value = encMsg } )
end
else
encMsg = self:encodeMessage( msg )
end
local success, errorMsg = io.stdout:write( encMsg )
if not success then
self:ioError( 'Write error', errorMsg )