Skip to content

ip2c: Add safety checks to exported function arguments #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 25, 2023
Merged

ip2c: Add safety checks to exported function arguments #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2539bd3
Add argument checks to ip2c exported functions
Fernando-A-Rocha Feb 16, 2023
1cea21e
Fix admin2 trying to get country name when country code may be false
Fernando-A-Rocha Feb 17, 2023
6aa4196
meta.xml: add aclrequest for fetchRemote
Fernando-A-Rocha Feb 20, 2023
307dbcb
Revert "meta.xml: add aclrequest for fetchRemote"
Fernando-A-Rocha Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion [admin]/admin2/server/admin_server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ function updatePlayerCountry(player)
local isIP2CResourceRunning = getResourceFromName( "ip2c" )
isIP2CResourceRunning = isIP2CResourceRunning and getResourceState( isIP2CResourceRunning ) == "running"
aPlayers[player].country = isIP2CResourceRunning and exports.ip2c:getPlayerCountry(player) or false
aPlayers[player].countryname = isIP2CResourceRunning and exports.ip2c:getCountryName(aPlayers[player].country) or false
if aPlayers[player].country then
aPlayers[player].countryname = isIP2CResourceRunning and exports.ip2c:getCountryName(aPlayers[player].country) or false
end
end

function aPlayerInitialize(player)
Expand Down
1 change: 1 addition & 0 deletions [admin]/ip2c/server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ local IP2C_UPDATE_INTERVAL_SECONDS = 60 * 60 * 24 * 1 -- Update no more than onc

-- [Exported]
function getPlayerCountry ( player )
if not (isElement(player) and getElementType(player) == "player") then return false end
if not loadIPGroupsIsReady() then return false end
local ip = getPlayerIP(player)
local ip_group = tonumber ( gettok ( ip, 1, 46 ) )
Expand Down
3 changes: 3 additions & 0 deletions [admin]/ip2c/shared.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,8 @@ local countryListAlpha2 = {

-- [Exported]
function getCountryName( country )
if type(country) ~= "string" then
return "Invalid country code"
end
return countryListAlpha2[ (string.upper(country)) ] or "Unknown"
end