gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlencode stuff 

for example spaces should be %20 encoded and the @ in `Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz` should be encoded to %40

but the real problem is the possibility that these stings may include the `&` character, which should be encoded as %25 (but wasn't prior to this commit)
This commit is contained in:
divinity76 2019-04-14 13:54:30 +02:00 committed by GitHub
parent e244ba4775
commit 97d2be8187
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
modules/client_stats/stats.lua
View File

@ -65,33 +65,33 @@ function onConnect(protocol)
end end
local post = '' local post = ''
post = post .. 'uid=' .. UUID post = post .. 'uid=' .. urlencode(UUID)
post = post .. '&report_delay=' .. REPORT_DELAY post = post .. '&report_delay=' .. REPORT_DELAY
post = post .. '&os=' .. g_app.getOs() post = post .. '&os=' .. urlencode(g_app.getOs())
post = post .. '&graphics_vendor=' .. g_graphics.getVendor() post = post .. '&graphics_vendor=' .. urlencode(g_graphics.getVendor())
post = post .. '&graphics_renderer=' .. g_graphics.getRenderer() post = post .. '&graphics_renderer=' .. urlencode(g_graphics.getRenderer())
post = post .. '&graphics_version=' .. g_graphics.getVersion() post = post .. '&graphics_version=' .. urlencode(g_graphics.getVersion())
post = post .. '&painter_engine=' .. g_graphics.getPainterEngine() post = post .. '&painter_engine=' .. urlencode(g_graphics.getPainterEngine())
post = post .. '&fps=' .. g_app.getBackgroundPaneFps() post = post .. '&fps=' .. urlencode(g_app.getBackgroundPaneFps())
post = post .. '&max_fps=' .. g_app.getBackgroundPaneMaxFps() post = post .. '&max_fps=' .. urlencode(g_app.getBackgroundPaneMaxFps())
post = post .. '&fullscreen=' .. tostring(g_window.isFullscreen()) post = post .. '&fullscreen=' .. urlencode(tostring(g_window.isFullscreen()))
post = post .. '&window_width=' .. g_window.getWidth() post = post .. '&window_width=' .. urlencode(g_window.getWidth())
post = post .. '&window_height=' .. g_window.getHeight() post = post .. '&window_height=' .. urlencode(g_window.getHeight())
post = post .. '&player_name=' .. g_game.getCharacterName() post = post .. '&player_name=' .. urlencode(g_game.getCharacterName())
post = post .. '&world_name=' .. g_game.getWorldName() post = post .. '&world_name=' .. urlencode(g_game.getWorldName())
post = post .. '&otserv_host=' .. G.host post = post .. '&otserv_host=' .. urlencode(G.host)
post = post .. '&otserv_port=' .. G.port post = post .. '&otserv_port=' .. G.port
post = post .. '&otserv_protocol=' .. g_game.getProtocolVersion() post = post .. '&otserv_protocol=' .. urlencode(g_game.getProtocolVersion())
post = post .. '&otserv_client=' .. g_game.getClientVersion() post = post .. '&otserv_client=' .. urlencode(g_game.getClientVersion())
post = post .. '&build_version=' .. g_app.getVersion() post = post .. '&build_version=' .. urlencode(g_app.getVersion())
post = post .. '&build_revision=' .. g_app.getBuildRevision() post = post .. '&build_revision=' .. urlencode(g_app.getBuildRevision())
post = post .. '&build_commit=' .. g_app.getBuildCommit() post = post .. '&build_commit=' .. urlencode(g_app.getBuildCommit())
post = post .. '&build_date=' .. g_app.getBuildDate() post = post .. '&build_date=' .. urlencode(g_app.getBuildDate())
post = post .. '&display_width=' .. g_window.getDisplayWidth() post = post .. '&display_width=' .. g_window.getDisplayWidth()
post = post .. '&display_height=' .. g_window.getDisplayHeight() post = post .. '&display_height=' .. g_window.getDisplayHeight()
post = post .. '&cpu=' .. g_platform.getCPUName() post = post .. '&cpu=' .. urlencode(g_platform.getCPUName())
post = post .. '&mem=' .. g_platform.getTotalSystemMemory() post = post .. '&mem=' .. g_platform.getTotalSystemMemory()
post = post .. '&os_name=' .. g_platform.getOSName() post = post .. '&os_name=' .. urlencode(g_platform.getOSName())
post = post .. getAdditionalData() post = post .. getAdditionalData()
local message = '' local message = ''
@ -121,3 +121,11 @@ end
function onError(protocol, message, code) function onError(protocol, message, code)
pdebug('Could not send statistics: ' .. message) pdebug('Could not send statistics: ' .. message)
end end
function urlencode(str)
local encodeChar=function(chr)
return string.format("%%%X",string.byte(chr))
end
local output, t = string.gsub(str,"[^%w]",encodeChar)
return output
end