dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

This commit is contained in:
markjcrane 2015-08-20 20:16:30 -06:00
parent c9f7869de9 9066f19b72
commit 115b06b9dd
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
View File

@ -62,6 +62,20 @@
--all other directory actions: sip_auth, user_call
--except for the action: group_call
local sip_auth_method = params:getHeader("sip_auth_method")
if sip_auth_method then
sip_auth_method = sip_auth_method:upper();
end
local from_user = params:getHeader("sip_from_user")
-- verify from_user and number alias for this methods
local METHODS = {
-- _ANY_ = true,
REGISTER = true,
-- INVITE = true,
}
if (user == nil) then
user = "";
end
@ -250,6 +264,15 @@
forward_no_answer_destination = row.forward_no_answer_destination;
do_not_disturb = row.do_not_disturb;
-- check matching UserID and AuthName
if sip_auth_method and (METHODS[sip_auth_method] or METHODS._ANY_) then
continue = (sip_from_user == user) and ((sip_from_number == user) or (sip_from_number == from_user))
if not continue then
XML_STRING = nil;
return 1;
end
end
--set the dial_string
if (string.len(row.dial_string) > 0) then
dial_string = row.dial_string;
@ -509,11 +532,17 @@
end
end
--disable registration for number-alias
if (params:getHeader("sip_auth_method") == "REGISTER") then
if (api:execute("user_data", user .. "@" .. domain_name .." attr id") ~= user) then
XML_STRING = nil;
end
if XML_STRING and sip_auth_method and (METHODS[sip_auth_method] or METHODS._ANY_) then
--disable registration for number-alias
if (api:execute("user_data", user .. "@" .. domain_name .." attr id") ~= user) then
XML_STRING = nil;
end
--disable registration for foreign number_alias
if from_user ~= user then
if (api:execute("user_data", from_user .. "@" .. domain_name .." attr id") ~= user) then
XML_STRING = nil;
end
end
end
--get the XML string from the cache