RemoteAccessManager: Allow when accessing from CLI

68publishers · May 24, 2017 · 46d11e0 · 46d11e0
1 parent 432f1e8
commit 46d11e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/RemoteAccessManager/DI/RemoteAccessManagerExtension.php b/src/RemoteAccessManager/DI/RemoteAccessManagerExtension.php
@@ -45,6 +45,7 @@ public function loadConfiguration()
 				'blacklist' => $config['blacklist'],
 				'key' => $config['secretKey'],
 				'mode' => $config['allowAll'],
+				'consoleMode' => $builder->parameters['consoleMode'],
 				'handler' => new $config['handler'],
 			])
 			->addTag('run', TRUE)

diff --git a/src/RemoteAccessManager/RemoteAccessManager.php b/src/RemoteAccessManager/RemoteAccessManager.php
@@ -7,6 +7,7 @@
 use Nette\Http\IRequest;
 use Nette\SmartObject;
 use SixtyEightPublishers\Application\RemoteAccessManager\Handler\IAccessHandler;
+use Tracy\Debugger;
 
 /**
  * @method  RemoteAccessManager   onAccess()
@@ -36,6 +37,9 @@ class RemoteAccessManager implements IRemoteAccessManager
 	/** @var bool|true */
 	private $mode;
 
+	/** @var bool|false */
+	private $consoleMode;
+
 	/** @var \SixtyEightPublishers\Application\RemoteAccessManager\Handler\IAccessHandler */
 	private $handler;
 
@@ -51,14 +55,16 @@ class RemoteAccessManager implements IRemoteAccessManager
 	 * @param string|array            $whitelist
 	 * @param string                  $key
 	 * @param bool|TRUE               $mode
+	 * @param bool|FALSE              $consoleMode
 	 * @param IAccessHandler          $handler
 	 */
-	public function __construct(IRequest $request, $blacklist = [], $whitelist = [], $mode = self::ALLOWED_ALL, $key = self::COOKIE_SECRET, IAccessHandler $handler)
+	public function __construct(IRequest $request, $blacklist = [], $whitelist = [], $mode = self::ALLOWED_ALL, $key = self::COOKIE_SECRET, $consoleMode = FALSE, IAccessHandler $handler)
 	{
 		$this->request = $request;
 		$this->blacklist = $blacklist;
 		$this->whitelist = $whitelist;
 		$this->mode = $mode;
+		$this->consoleMode = $consoleMode;
 		$this->key = $key;
 		$this->handler = $handler;
 
@@ -78,6 +84,10 @@ public function process()
 	 */
 	private function isAllowed() : bool
 	{
+		if ($this->consoleMode) {
+			return TRUE;
+		}
+
 		$addr = $this->request->getRemoteAddress() ?: php_uname('n');
 		$secret = $this->request->getCookie($this->key);