izaya/OC-Minitel
1
0
Fork 0
mirror of https://github.com/ShadowKatStudios/OC-Minitel.git synced 2024-11-23 10:38:05 +11:00
Code Issues Releases Wiki Activity

Do not unregister listeners on unexpected data

Browse Source 
If a registered event listener callback returns `false`, the listener is
unregistered. A network packet arriving on a different port, or a
message with a missing part, should not cause the syslog system to shut
down. Return `nil` instead of `false` if those sanity checks fail, to
keep the listener registered.
This commit is contained in:
Christopher Head 2021-01-22 19:21:23 -08:00
parent 4c462a5d4e
commit 074a980d81
No known key found for this signature in database
GPG Key ID: 889FF36E814738DE
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syslog/OpenOS/etc/rc.d/syslogd.lua
View File

@ -69,15 +69,15 @@ local function wentry(_,msg,level,service,host)
end end
local function remote_listener(_,from,port,data) local function remote_listener(_,from,port,data)
if port ~= cfg.port then return false end if port ~= cfg.port then return end
local service, level, msg = data:match("(.-)\t(%d)\t(.+)") local service, level, msg = data:match("(.-)\t(%d)\t(.+)")
if not service or not level or not msg then return false end if not service or not level or not msg then return end
msg, level, service = tostring(msg),tonumber(level),tostring(service) msg, level, service = tostring(msg),tonumber(level),tostring(service)
wentry(nil,msg,level,service,from) wentry(nil,msg,level,service,from)
end end
local function local_listener(_,msg,level,service) local function local_listener(_,msg,level,service)
if not service or not level or not msg then return false end if not service or not level or not msg then return end
msg, level, service = tostring(msg),tonumber(level),tostring(service) msg, level, service = tostring(msg),tonumber(level),tostring(service)
wentry(nil,msg,level,service,hostname) wentry(nil,msg,level,service,hostname)
end end