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

[SVN commits to the Digium repositories]

Author: jrose
Date: Thu Jun 12 10:26:23 2014
New Revision: 415832

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

ASTERISK-23609 #close
Reported by: Corey Farrell
........

Merged revisions 415825 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/UPGRADE.txt
    branches/12/apps/app_mixmonitor.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/branches/12/UPGRADE.txt?view=diff&rev=415832&r1=415831&r2=415832
==============================================================================
--- branches/12/UPGRADE.txt (original)
+++ branches/12/UPGRADE.txt Thu Jun 12 10:26:23 2014
@@ -28,11 +28,17 @@
    safe_asterisk script is customized, be sure to keep your changes. Custom
    values for variables should be created in *.sh file(s) inside
    ASTETCDIR/startup.d/. See ASTERISK-21965.
+
  - Changed a log message in safe_asterisk and the $NOTIFY mail subject. If
    you use tools to parse either of them, update your parse functions
    accordingly. The changed strings are:
    - "Exited on signal $EXITSIGNAL" => "Asterisk exited on signal $EXITSIGNAL."
    - "Asterisk Died" => "Asterisk on $MACHINE died (sig $EXITSIGNAL)"
+
+ - MixMonitor AMI actions now require users to have authorization classes.
+   * MixMonitor - system
+   * MixMonitorMute - call or system
+   * StopMixMonitor - call or system
 
 From 12.2.0 to 12.3.0:
 

Modified: branches/12/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/apps/app_mixmonitor.c?view=diff&rev=415832&r1=415831&r2=415832
==============================================================================
--- branches/12/apps/app_mixmonitor.c (original)
+++ branches/12/apps/app_mixmonitor.c Thu Jun 12 10:26:23 2014
@@ -1415,9 +1415,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);
 	res |= set_mixmonitor_methods();
 
 	return res;