[svn-commits] jrose: branch 11 r415825 - in /branches/11: UPGRADE.txt apps/app_mixmonitor.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Thu Jun 12 10:22:02 2014
New Revision: 415825

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=415825
Log:
MixMonitor: Add privelege requirements to Start/Stop MixMonitor AMI commands

ASTERISK-23609 #close
Reported by: Corey Farrell

Modified:
    branches/11/UPGRADE.txt
    branches/11/apps/app_mixmonitor.c

Modified: branches/11/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/branches/11/UPGRADE.txt?view=diff&rev=415825&r1=415824&r2=415825
==============================================================================
--- branches/11/UPGRADE.txt (original)
+++ branches/11/UPGRADE.txt Thu Jun 12 10:22:02 2014
@@ -23,6 +23,11 @@
 from 11.9 to 11.10
  - The asterisk command line -I option and the asterisk.conf internal_timing
    option are removed and always enabled if any timing module is loaded.
+
+ - MixMonitor AMI actions now require users to have authorization classes.
+   * MixMonitor - system
+   * MixMonitorMute - call or system
+   * StopMixMonitor - call or system
 
  - Added a new Compiler Flag, REF_DEBUG. When enabled, reference counted
    objects will emit additional debug information to the refs log file located

Modified: branches/11/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_mixmonitor.c?view=diff&rev=415825&r1=415824&r2=415825
==============================================================================
--- branches/11/apps/app_mixmonitor.c (original)
+++ branches/11/apps/app_mixmonitor.c Thu Jun 12 10:22:02 2014
@@ -1376,9 +1376,9 @@
 	ast_cli_register_multiple(cli_mixmonitor, ARRAY_LEN(cli_mixmonitor));
 	res = ast_register_application_xml(app, mixmonitor_exec);
 	res |= ast_register_application_xml(stop_app, stop_mixmonitor_exec);
-	res |= ast_manager_register_xml("MixMonitorMute", 0, manager_mute_mixmonitor);
-	res |= ast_manager_register_xml("MixMonitor", 0, manager_mixmonitor);
-	res |= ast_manager_register_xml("StopMixMonitor", 0, manager_stop_mixmonitor);
+	res |= ast_manager_register_xml("MixMonitorMute", EVENT_FLAG_SYSTEM | EVENT_FLAG_CALL, manager_mute_mixmonitor);
+	res |= ast_manager_register_xml("MixMonitor", EVENT_FLAG_SYSTEM, manager_mixmonitor);
+	res |= ast_manager_register_xml("StopMixMonitor", EVENT_FLAG_SYSTEM | EVENT_FLAG_CALL, manager_stop_mixmonitor);
 
 	return res;
 }