Skip to content

Fix: handle resource names with special characters in admin settings #722

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

Open
Elabyad247 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −4
Open

Fix: handle resource names with special characters in admin settings #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions [admin]/admin/server/admin_settings.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,18 @@ function aGetResourceSettings( resName, bCountOnly )
return {}, count
end
local settings = {}
-- Escape special characters inside resName
local safeResName = string.gsub(resName, '([^%w])', '%%%1')
local namePattern = '^' .. safeResName .. '%.(.*)$'
-- Parse raw settings
for rawname,value in pairs(rawsettings) do
if allowedTypes[type(value)] then
if allowedAccess[string.sub(rawname,1,1)] then
count = count + 1
-- Remove leading '*','#' or '@'
local temp = string.gsub(rawname,'[%*%#%@](.*)','%1')
local temp = string.gsub(rawname, '^[%*%#%@](.*)', '%1')
-- Remove leading 'resName.'
local name = string.gsub(temp,resName..'%.(.*)','%1')
local name = string.gsub(temp, namePattern, '%1')
-- If name didn't have a leading 'resName.', then it must be the default setting
local bIsDefault = ( temp == name )
if settings[name] == nil then
Expand Down
6 changes: 4 additions & 2 deletions [admin]/admin2/server/admin_ACL.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,15 @@ function getResourceSettings(resName, bCountOnly)
return {}, count
end
local settings = {}
local safeResName = string.gsub(resName, '([^%w])', '%%%1')
local namePattern = '^' .. safeResName .. '%.(.*)$'

for rawname, value in pairs(rawsettings) do
if (allowedTypes[type(value)]) then
if allowedAccess[string.sub(rawname, 1, 1)] then
count = count + 1
local temp = string.gsub(rawname, "[%*%#%@](.*)", "%1")
local name = string.gsub(temp, resName .. "%.(.*)", "%1")
local temp = string.gsub(rawname, '^[%*%#%@](.*)', '%1')
local name = string.gsub(temp, namePattern, '%1')
local bIsDefault = (temp == name)
if (not settings[name]) then
settings[name] = {}
Expand Down