Merge remote branch 'cbarberis/master'

api/RestfulServer.php

@@ -123,6 +123,10 @@ class RestfulServer extends Controller {
 	 */
 	protected $member;
 	
+	static $allowed_actions = array(
+		'index'
+	);
+	
 	/*
 	function handleItem($request) {
 		return new RestfulServer_Item(DataObject::get_by_id($request->param("ClassName"), $request->param("ID")));

api/SapphireSoapServer.php

@@ -26,6 +26,11 @@ class SapphireSoapServer extends Controller {
 		'binary' => 'xsd:base64Binary',
 	);
 	
+	static $allowed_actions = array( 
+		'index',
+		'wsdl'
+	);
+	
 	function wsdl() {
 		$this->getResponse()->addHeader("Content-Type", "text/xml"); 
 		

api/VersionedRestfulServer.php

@@ -6,6 +6,11 @@
  * @subpackage integration
  */ 
 class VersionedRestfulServer extends Controller {
+	
+	static $allowed_actions = array( 
+		'index'
+	);
+	
 	function handleRequest($request) {
 		Versioned::reading_stage('Live');
 		$restfulserver = new RestfulServer();

cli/CliController.php

@@ -11,6 +11,10 @@
  */
 abstract class CliController extends Controller {
 	
+	static $allowed_actions = array(
+		'index'
+	);
+
 	function init() {
 		parent::init();
 		// Unless called from the command line, all CliControllers need ADMIN privileges

dev/CodeViewer.php

@@ -7,11 +7,17 @@
  */
 class CodeViewer extends Controller {
 	
-	public static $url_handlers = array (
+	public static $url_handlers = array(
 		''       => 'browse',
 		'$Class' => 'viewClass'
 	);
 	
+	static $allowed_actions = array(
+		'index',
+		'browse',
+		'viewClass'
+	);
+	
 	/**
 	 * Define a simple finite state machine.
 	 * Top keys are the state names.  'start' is the first state, and 'die' is the error state.

dev/DevelopmentAdmin.php

@@ -17,6 +17,17 @@ class DevelopmentAdmin extends Controller {
 		'$Action//$Action/$ID' => 'handleAction',
 	);
 	
+	static $allowed_actions = array( 
+        'index', 
+        'tests', 
+        'jstests', 
+        'tasks', 
+        'viewmodel', 
+        'build', 
+        'reset', 
+        'viewcode' 
+ 	);
+	
 	function init() {
 		parent::init();
 		

dev/InstallerTest.php

@@ -6,6 +6,10 @@
  */
 class InstallerTest extends Controller {
 	
+	static $allowed_actions = array(
+		'testrewrite'
+	);
+
 	function testrewrite() {
 		echo "OK";
 	}

dev/JSTestRunner.php

@@ -42,6 +42,13 @@ class JSTestRunner extends Controller {
 		'$TestCase' => 'only',
 	);
 	
+	static $allowed_actions = array(
+		'index',
+		'all',
+		'browse',
+		'only'
+	);
+	
 	/**
 	 * Override the default reporter with a custom configured subclass.
 	 *

dev/SapphireREPL.php

@@ -24,6 +24,10 @@ define('30719',E_ALL);
  */
 class SapphireREPL extends Controller {
 	
+	static $allowed_actions = array(
+		'index'
+	);
+
 	public function error_handler( $errno, $errstr, $errfile, $errline, $errctx ) {
 		// Ignore unless important error
 		if ( ($errno & ~( 2048 | 8192 | 16384 )) == 0 ) return ;

dev/TaskRunner.php

@@ -10,6 +10,10 @@ class TaskRunner extends Controller {
 		'$TaskName' => 'runTask'
 	);
 	
+	static $allowed_actions = array(
+		'index'
+	);
+	
 	function init() {
 		parent::init();
 

dev/TestRunner.php

@@ -40,6 +40,21 @@ class TestRunner extends Controller {
 		'$TestCase' => 'only',
 	);
 	
+	static $allowed_actions = array(
+        'index',
+        'browse',
+        'coverage',
+        'startsession',
+        'endsession',
+        'cleanupdb',
+        'module',
+        'all',
+        'build',
+        'only'
+	);
+	
+	
+	
 	/**
 	 * @var Array Blacklist certain directories for the coverage report.
 	 * Filepaths are relative to the webroot, without leading slash.

email/Email.php

@@ -616,6 +616,10 @@ class Email extends ViewableData {
  */
 class Email_BounceHandler extends Controller {
 	
+	static $allowed_actions = array( 
+		'index'
+	);
+	
 	function init() {
 		BasicAuth::protect_entire_site(false);
 		parent::init();

filesystem/Upload.php

@@ -21,6 +21,11 @@
  */
 class Upload extends Controller {
 	
+	static $allowed_actions = array( 
+		'index',
+		'load'
+	);
+	
 	/**
 	 * A File object
 	 * @var File

security/Security.php

@@ -6,6 +6,18 @@
  */
 class Security extends Controller {
 	
+	static $allowed_actions = array( 
+	    'index', 
+	    'login', 
+	    'logout', 
+	    'basicauthlogin', 
+	    'lostpassword', 
+	    'passwordsent', 
+	    'changepassword', 
+	    'ping',
+		'LoginForm'
+ 	);
+
 	/**
 	 * Default user name. Only used in dev-mode by {@link setDefaultAdmin()}
 	 * 

tests/ControllerTest.php

@@ -139,7 +139,7 @@ class ControllerTest extends FunctionalTest {
 /**
  * Simple controller for testing
  */
-class ControllerTest_Controller extends Controller {
+class ControllerTest_Controller extends Controller implements TestOnly {
 	public $Content = "default content";
 	
 	function methodaction() {
@@ -156,7 +156,7 @@ class ControllerTest_Controller extends Controller {
 /**
  * Controller with an $allowed_actions value
  */
-class ControllerTest_SecuredController extends Controller {
+class ControllerTest_SecuredController extends Controller implements TestOnly {
 	static $allowed_actions = array(
 		"methodaction",
 		"adminonly" => "ADMIN",
@@ -179,7 +179,7 @@ class ControllerTest_SecuredController extends Controller {
 	}
 }
 
-class ControllerTest_FullSecuredController extends Controller {
+class ControllerTest_FullSecuredController extends Controller implements TestOnly {
 	
 	static $allowed_actions = array(
 		"*" => "ADMIN",
@@ -195,7 +195,7 @@ class ControllerTest_FullSecuredController extends Controller {
 	}
 }
 
-class ControllerTest_UnsecuredController extends ControllerTest_SecuredController {}
+class ControllerTest_UnsecuredController extends ControllerTest_SecuredController implements TestOnly {}
 
 class ControllerTest_HasAction extends Controller {
 	
@@ -210,7 +210,7 @@ class ControllerTest_HasAction extends Controller {
 	
 }
 
-class ControllerTest_HasAction_Unsecured extends ControllerTest_HasAction {
+class ControllerTest_HasAction_Unsecured extends ControllerTest_HasAction implements TestOnly {
 	
 	public function defined_action() {  }
 	

tests/RequestHandlingTest.php

@@ -265,7 +265,7 @@ Director::addRules(50, array(
 /**
  * Controller for the test
  */
-class RequestHandlingTest_Controller extends Controller {
+class RequestHandlingTest_Controller extends Controller implements TestOnly {
 	static $url_handlers = array(
 		// The double-slash is need here to ensure that 
 		'$Action//$ID/$OtherID' => "handleAction",
@@ -383,7 +383,7 @@ class RequestHandlingTest_ControllerExtension extends Extension {
 /**
  * Controller for the test
  */
-class RequestHandlingTest_AllowedController extends Controller {
+class RequestHandlingTest_AllowedController extends Controller implements TestOnly  {
 	static $url_handlers = array(
 		// The double-slash is need here to ensure that 
 		'$Action//$ID/$OtherID' => "handleAction",
@@ -458,7 +458,7 @@ class RequestHandlingTest_Form extends Form {
 	}
 }
 
-class RequestHandlingTest_ControllerFormWithAllowedActions extends Controller {
+class RequestHandlingTest_ControllerFormWithAllowedActions extends Controller implements TestOnly {
 	
 	function Form() {
 		return new RequestHandlingTest_FormWithAllowedActions(

tests/WebserverRoutingTest.php

@@ -37,7 +37,7 @@ class WebserverRoutingTest extends SapphireTest {
  * @package sapphire
  * @subpackage tests
  */
-class WebserverRoutingTest_Controller extends Controller {
+class WebserverRoutingTest_Controller extends Controller implements TestOnly {
 	function index() {
 		BasicAuth::protect_entire_site(false);
 		

tests/api/RestfulServiceTest.php

@@ -134,7 +134,7 @@ class RestfulServiceTest extends SapphireTest {
 	}
 }
 
-class RestfulServiceTest_Controller extends Controller {
+class RestfulServiceTest_Controller extends Controller implements TestOnly {
 	public function init() {
 		$this->basicAuthEnabled = false;
 		parent::init();

tests/forms/FormTest.php

@@ -368,7 +368,7 @@ class FormTest_Team extends DataObject implements TestOnly {
 	);
 }
 
-class FormTest_Controller extends Controller {
+class FormTest_Controller extends Controller implements TestOnly {
 	static $url_handlers = array(
 		'$Action//$ID/$OtherID' => "handleAction",
 	);
@@ -424,7 +424,7 @@ class FormTest_Controller extends Controller {
 	}
 }
 
-class FormTest_ControllerWithSecurityToken extends Controller {
+class FormTest_ControllerWithSecurityToken extends Controller implements TestOnly {
 	static $url_handlers = array(
 		'$Action//$ID/$OtherID' => "handleAction",
 	);

tests/forms/TableFieldTest.php

@@ -288,7 +288,7 @@ class TableFieldTest extends SapphireTest {
 /**
  * Stub controller
  */
-class TableFieldTest_Controller extends Controller {
+class TableFieldTest_Controller extends Controller implements TestOnly {
 	function Link($action = null) {
 		return Controller::join_links('TableFieldTest/', $action);
 	}

widgets/Widget.php

@@ -150,6 +150,10 @@ class Widget_Controller extends Controller {
 	 */
 	protected $widget;
 	
+	static $allowed_actions = array( 
+		'editablesegment'
+	);
+	
 	function __construct($widget = null) {
 		// TODO This shouldn't be optional, is only necessary for editablesegment()
 		if($widget) {