ViciDial/agc_2-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added HTTP error code 418 for both APIs, more data validation for API logging output

Browse Source 
git-svn-id: svn://192.168.202.10@2803 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2017-08-15 17:26:24 +00:00
parent 64d7c53356
commit 5d0d8704b9
2 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/agc/api.php
+25 -3
View File
@@ -90,10 +90,11 @@
# 170209-1222 - Added URL and IP logging
# 170220-1303 - Added switch_lead function
# 170527-2250 - Fix for rare inbound logging issue #1017, Added variable filtering
# 170815-1314 - Added HTTP error code 418
#
$version = '2.14-56';
$build = '170527-2250';
$version = '2.14-57';
$build = '170815-1314';
$startMS = microtime();
@@ -395,6 +396,26 @@ if ($function == 'version')
################################################################################
### BEGIN - coffee/teapot 418 - reject coffee requests
################################################################################
if ( ($function == 'coffee') or ($function == 'start_coffee') or ($function == 'make_coffee') or ($function == 'brew_coffee') )
{
$data = _QXZ("Coffee").": $function|Error 418 I'm a teapot";
$result = _QXZ("ERROR");
Header("HTTP/1.0 418 I'm a teapot");
echo "$data";
api_log($link,$api_logging,$api_script,$user,$agent_user,$function,$value,$result,$result_reason,$source,$data);
exit;
}
################################################################################
### END - coffee/teapot
################################################################################
################################################################################
### BEGIN - user validation section (most functions run through this first)
################################################################################
@@ -4136,7 +4157,8 @@ function api_log($link,$api_logging,$api_script,$user,$agent_user,$function,$val
}
$NOW_TIME = date("Y-m-d H:i:s");
$stmt="INSERT INTO vicidial_api_log set user='$user',agent_user='$agent_user',function='$function',value='$value',result='$result',result_reason='$result_reason',source='$source',data='$data',api_date='$NOW_TIME',api_script='$api_script',run_time='$TOTALrun',webserver='$webserver_id',api_url='$url_id';";
$data = preg_replace("/\"/","'",$data);
$stmt="INSERT INTO vicidial_api_log set user='$user',agent_user='$agent_user',function='$function',value='$value',result=\"$result\",result_reason='$result_reason',source='$source',data=\"$data\",api_date='$NOW_TIME',api_script='$api_script',run_time='$TOTALrun',webserver='$webserver_id',api_url='$url_id';";
$rslt=mysql_to_mysqli($stmt, $link);
$ALaffected_rows = mysqli_affected_rows($link);
$api_id = mysqli_insert_id($link);
www/vicidial/non_agent_api.php
+25 -3
View File
@@ -123,10 +123,11 @@
# 170609-1107 - Added ccc_lead_info function
# 170615-0006 - Added DIAL status for manual dial agent calls that have not been answered, to 4 functions
# 170713-2312 - Fix for issue #1028
# 170815-1315 - Added HTTP error code 418
#
$version = '2.14-99';
$build = '170713-2312';
$version = '2.14-100';
$build = '170815-1315';
$api_url_log = 0;
$startMS = microtime();
@@ -710,6 +711,26 @@ if ($function == 'version')
################################################################################
### BEGIN - coffee/teapot 418 - reject coffee requests
################################################################################
if ( ($function == 'coffee') or ($function == 'start_coffee') or ($function == 'make_coffee') or ($function == 'brew_coffee') )
{
$data = _QXZ("Coffee").": $function|Error 418 I'm a teapot";
$result = _QXZ("ERROR");
Header("HTTP/1.0 418 I'm a teapot");
echo "$data";
api_log($link,$api_logging,$api_script,$user,$agent_user,$function,$value,$result,$result_reason,$source,$data);
exit;
}
################################################################################
### END - coffee/teapot
################################################################################
##### BEGIN user authentication for all functions below #####
$auth=0;
$auth_message = user_authorization($user,$pass,'REPORTS',1,1);
@@ -10412,7 +10433,8 @@ function api_log($link,$api_logging,$api_script,$user,$agent_user,$function,$val
}
$NOW_TIME = date("Y-m-d H:i:s");
$stmt="INSERT INTO vicidial_api_log set user='$user',agent_user='$agent_user',function='$function',value='$value',result='$result',result_reason='$result_reason',source='$source',data='$data',api_date='$NOW_TIME',api_script='$api_script',run_time='$TOTALrun',webserver='$webserver_id',api_url='$url_id';";
$data = preg_replace("/\"/","'",$data);
$stmt="INSERT INTO vicidial_api_log set user='$user',agent_user='$agent_user',function='$function',value='$value',result=\"$result\",result_reason='$result_reason',source='$source',data=\"$data\",api_date='$NOW_TIME',api_script='$api_script',run_time='$TOTALrun',webserver='$webserver_id',api_url='$url_id';";
$rslt=mysql_to_mysqli($stmt, $link);
$ALaffected_rows = mysqli_affected_rows($link);
$api_id = mysqli_insert_id($link);