Revert "occ web executor (#24957)"

This reverts commit 9fcb269.
nextcloud · Jul 7, 2016 · f593a09 · f593a09
1 parent 4782b92
commit f593a09
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 324 deletions.
diff --git a/core/application.php b/core/application.php
@@ -28,7 +28,6 @@
 
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\AppFramework\Utility\TimeFactory;
-use OC\Core\Controller\OccController;
 use \OCP\AppFramework\App;
 use OC\Core\Controller\LostController;
 use OC\Core\Controller\UserController;
@@ -90,18 +89,6 @@ public function __construct(array $urlParams=array()){
 				$c->query('Logger')
 			);
 		});
-		$container->registerService('OccController', function(SimpleContainer $c) {
-			return new OccController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->query('Config'),
-				new \OC\Console\Application(
-					$c->query('Config'),
-					$c->query('ServerContainer')->getEventDispatcher(),
-					$c->query('Request')
-				)
-			);
-		});
 
 		/**
 		 * Core class wrappers

diff --git a/core/controller/occcontroller.php b/core/controller/occcontroller.php
diff --git a/core/routes.php b/core/routes.php
@@ -42,7 +42,6 @@
 		['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
 		['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
 		['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'],
-		['name' => 'occ#execute', 'url' => '/occ/{command}', 'verb' => 'POST'],
 	]
 ]);
 

diff --git a/lib/base.php b/lib/base.php
@@ -53,8 +53,6 @@
  *
  */
 
-use OCP\IRequest;
-
 require_once 'public/constants.php';
 
 /**
@@ -298,20 +296,9 @@ public static function checkInstalled() {
 		}
 	}
 
-	/**
-	 * Limit maintenance mode access
-	 * @param IRequest $request
-	 */
-	public static function checkMaintenanceMode(IRequest $request) {
-		// Check if requested URL matches 'index.php/occ'
-		$isOccControllerRequested = preg_match('|/index\.php$|', $request->getScriptName()) === 1
-				&& strpos($request->getPathInfo(), '/occ/') === 0;
+	public static function checkMaintenanceMode() {
 		// Allow ajax update script to execute without being stopped
-		if (
-			\OC::$server->getSystemConfig()->getValue('maintenance', false)
-			&& OC::$SUBURI != '/core/ajax/update.php'
-			&& !$isOccControllerRequested
-		) {
+		if (\OC::$server->getSystemConfig()->getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
 			// send http status 503
 			header('HTTP/1.1 503 Service Temporarily Unavailable');
 			header('Status: 503 Service Temporarily Unavailable');
@@ -934,7 +921,7 @@ public static function handleRequest() {
 		$request = \OC::$server->getRequest();
 		$requestPath = $request->getRawPathInfo();
 		if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
-			self::checkMaintenanceMode($request);
+			self::checkMaintenanceMode();
 			self::checkUpgrade();
 		}
 

diff --git a/lib/private/console/application.php b/lib/private/console/application.php
@@ -138,10 +138,9 @@ public function setAutoExit($boolean) {
 	 * @throws \Exception
 	 */
 	public function run(InputInterface $input = null, OutputInterface $output = null) {
-		$args = isset($this->request->server['argv']) ? $this->request->server['argv'] : [];
 		$this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
 			ConsoleEvent::EVENT_RUN,
-			$args
+			$this->request->server['argv']
 		));
 		return $this->application->run($input, $output);
 	}

diff --git a/public.php b/public.php
@@ -35,9 +35,9 @@
 		exit;
 	}
 
-	$request = \OC::$server->getRequest();
-	OC::checkMaintenanceMode($request);
+	OC::checkMaintenanceMode();
 	OC::checkSingleUserMode(true);
+	$request = \OC::$server->getRequest();
 	$pathInfo = $request->getPathInfo();
 
 	if (!$pathInfo && $request->getParam('service', '') === '') {

diff --git a/tests/Core/Controller/OccControllerTest.php b/tests/Core/Controller/OccControllerTest.php