wip

croogo · Sep 16, 2020 · b48ae21 · b48ae21
1 parent 26d8d93
commit b48ae21
Show file tree

Hide file tree

Showing 37 changed files with 61 additions and 66 deletions.
diff --git a/Acl/config/routes.php b/Acl/config/routes.php
@@ -6,7 +6,6 @@
 Router::plugin('Croogo/Acl', ['path' => '/'], function (RouteBuilder $route) {
     $route->prefix('admin', function (RouteBuilder $route) {
         $route->setExtensions(['json']);
-        $route->applyMiddleware('csrf');
 
         $route->scope('/acl', [], function (RouteBuilder $route) {
             $route->fallbacks();

diff --git a/Acl/src/Controller/Component/AutoLoginComponent.php b/Acl/src/Controller/Component/AutoLoginComponent.php
@@ -61,7 +61,8 @@ public function startup(Event $event)
             return;
         }
 
-        $this->_registry->Cookie->configKey($this->getConfig('cookieName'), $this->getConfig('cookieConfig'));
+        // FIXME
+        // $this->_registry->Cookie->configKey($this->getConfig('cookieName'), $this->getConfig('cookieConfig'));
 
         $setting = $this->_registry->Auth->getConfig('authenticate.all');
         list(, $this->_userModel) = pluginSplit($setting['userModel']);

diff --git a/Acl/src/Controller/Component/FilterComponent.php b/Acl/src/Controller/Component/FilterComponent.php
@@ -74,10 +74,14 @@ protected function _configure()
         if (!$this->_registry->has('Croogo/Acl.AutoLogin')) {
             $this->_registry->load('Croogo/Acl.AutoLogin');
             if (!$this->_registry->has('Cookie')) {
-                $this->_registry->load('Cookie');
+                // FIXME
+                // $this->_registry->load('Cookie');
             }
         }
 
+        $this->_controller->loadComponent('Auth'); // FIXME
+        $this->_controller->loadComponent('Acl.Acl'); // FIXME
+
         //Configure AuthComponent
         $this->_controller->Auth->setConfig('authenticate', [
             AuthComponent::ALL => [
@@ -97,7 +101,7 @@ protected function _configure()
             if (!function_exists('mcrypt_encrypt') && !function_exists('openssl_encrypt')) {
                 $notice = __d('croogo', '"AutoLogin" (Remember Me) disabled since mcrypt_encrypt or openssl_encrypt is not available');
                 $this->log($notice, LOG_CRIT);
-                if ($this->_controller->request->getParam('prefix') == 'admin') {
+                if ($this->_controller->getRequest()->getParam('prefix') == 'admin') {
                     $this->_controller->Flash->error($notice);
                 }
                 if (isset($this->_controller->Settings)) {
@@ -125,7 +129,7 @@ protected function _configure()
             ]
         ]);
 
-        if ($this->_controller->request->getParam('prefix') == 'admin' &&
+        if ($this->_controller->getRequest()->getParam('prefix') == 'admin' &&
             !$this->_controller->Auth->user()) {
             $this->_controller->Auth->setConfig('authError', false);
         }
@@ -146,7 +150,7 @@ public function configureLoginActions()
             'controller' => 'Users',
             'action' => 'login',
         ]);
-        if ($this->request->getParam('prefix') === 'admin') {
+        if ($this->_controller->getRequest()->getParam('prefix') === 'admin') {
             $this->_controller->Auth->setConfig('loginAction', [
                 'prefix' => 'admin',
                 'plugin' => 'Croogo/Users',
@@ -159,7 +163,7 @@ public function configureLoginActions()
             'controller' => 'Users',
             'action' => 'login',
         ]);
-        if ($this->request->getParam('prefix') == 'admin') {
+        if ($this->_controller->getRequest()->getParam('prefix') == 'admin') {
             $dashboardUrl = Configure::read('Site.dashboard_url');
             if (is_string($dashboardUrl)) {
                 $converter = new StringConverter();
@@ -172,7 +176,7 @@ public function configureLoginActions()
             $this->_controller->Auth->setConfig('loginRedirect', $loginRedirect);
         }
 
-        if ($this->_controller->request->is('ajax')) {
+        if ($this->_controller->getRequest()->is('ajax')) {
             $this->_controller->Auth->setConfig('unauthorizedRedirect', false);
         } else {
             $this->_controller->Auth->setConfig('unauthorizedRedirect', [
@@ -184,7 +188,7 @@ public function configureLoginActions()
 
         $config = Configure::read('Acl');
         if (!empty($config['Auth']) && is_array($config['Auth'])) {
-            $isAdminRequest = !empty($this->_controller->request->getParam('admin'));
+            $isAdminRequest = !empty($this->_controller->getRequest()->getParam('admin'));
             $authActions = [
                 'loginAction',
                 'loginRedirect',
@@ -219,9 +223,9 @@ public function auth()
 
         $authorizer = $this->_controller->Auth->getAuthorize('Croogo/Acl.AclCached');
 
-        if ($this->_controller->Acl->check('Role-public', $authorizer->action($this->_controller->request))) {
+        if ($this->_controller->Acl->check('Role-public', $authorizer->action($this->_controller->getRequest()))) {
             $this->_controller->Auth->allow(
-                $this->_controller->request->getParam('action')
+                $this->_controller->getRequest()->getParam('action')
             );
         }
     }

diff --git a/Blocks/config/routes.php b/Blocks/config/routes.php
@@ -6,7 +6,6 @@
 Router::plugin('Croogo/Blocks', ['path' => '/'], function (RouteBuilder $route) {
     $route->prefix('admin', function (RouteBuilder $route) {
         $route->setExtensions(['json']);
-        $route->applyMiddleware('csrf');
 
         $route->scope('/blocks', [], function (RouteBuilder $route) {
             $route->fallbacks();

diff --git a/Blocks/src/View/Helper/RegionsHelper.php b/Blocks/src/View/Helper/RegionsHelper.php
@@ -154,7 +154,7 @@ public function blocks($regionAlias, $options = [])
     /**
      * @return array
      */
-    public function implementedEvents()
+    public function implementedEvents(): array
     {
         $events = parent::implementedEvents();
         $events['Helper.Layout.beforeFilter'] = [

diff --git a/Comments/config/routes.php b/Comments/config/routes.php
@@ -6,7 +6,6 @@
 Router::plugin('Croogo/Comments', ['path' => '/'], function (RouteBuilder $route) {
     $route->prefix('admin', function (RouteBuilder $route) {
         $route->setExtensions(['json']);
-        $route->applyMiddleware('csrf');
 
         $route->scope('/comments', [], function (RouteBuilder $route) {
             $route->fallbacks();

diff --git a/Contacts/config/routes.php b/Contacts/config/routes.php
@@ -6,7 +6,6 @@
 Router::plugin('Croogo/Contacts', ['path' => '/'], function (RouteBuilder $route) {
     $route->prefix('admin', function (RouteBuilder $route) {
         $route->setExtensions(['json']);
-        $route->applyMiddleware('csrf');
 
         $route->scope('/contacts', [], function (RouteBuilder $route) {
             $route->fallbacks();

diff --git a/Core/config/routes.php b/Core/config/routes.php
@@ -1,15 +1,11 @@
 <?php
 
 use Cake\Core\Configure;
-use Cake\Http\Middleware\CsrfProtectionMiddleware;
 use Cake\Routing\RouteBuilder;
 use Cake\Routing\Router;
 use Croogo\Core\Utility\StringConverter;
 
 Router::prefix('admin', function (RouteBuilder $routeBuilder) {
-    $routeBuilder->registerMiddleware('csrf', new CsrfProtectionMiddleware());
-    $routeBuilder->applyMiddleware('csrf');
-
     $dashboardUrl = Configure::read('Site.dashboard_url');
     if (!$dashboardUrl) {
         return;

diff --git a/Core/src/Controller/AppController.php b/Core/src/Controller/AppController.php
@@ -183,7 +183,8 @@ public function beforeFilter(EventInterface $event)
         }
 
         if (!$this->getRequest()->is('api')) {
-            $this->Security->blackHoleCallback = '_securityError';
+            // FIXME
+            // $this->Security->blackHoleCallback = '_securityError';
             if ($this->getRequest()->getParam('action') == 'delete' && $this->getRequest()->getParam('prefix') == 'admin') {
                 $this->getRequest()->allowMethod('post');
             }
@@ -241,6 +242,7 @@ public function _securityError($type = null, $exception = null)
      */
     protected function _setupAclComponent()
     {
+        $this->loadComponent('Croogo/Acl.Filter'); /// FIXME
         $config = Configure::read('Access Control');
         if (isset($config['rowLevel']) && $config['rowLevel'] == true) {
             if (strpos($config['models'], str_replace('/', '\/', $this->modelClass)) === false) {
@@ -258,7 +260,7 @@ protected function _setupAclComponent()
      */
     protected function _setupPrg()
     {
-        $this->loadComponent('Search.Prg', [
+        $this->loadComponent('Search.Search', [
             'queryStringWhitelist' => ['sort', 'direction', 'limit', 'chooser'],
             'actions' => ['index']
         ]);

diff --git a/Core/src/Controller/Component/BulkProcessComponent.php b/Core/src/Controller/Component/BulkProcessComponent.php
@@ -40,7 +40,7 @@ class BulkProcessComponent extends Component
     public function beforeFilter(Event $event)
     {
         $this->_controller = $event->getSubject();
-        if ($this->_controller->request->getParam('action') == 'process') {
+        if ($this->_controller->getRequest()->getParam('action') == 'process') {
             $this->_controller->Security->setConfig('validatePost', false);
         }
     }

diff --git a/Core/src/Controller/Component/RecaptchaComponent.php b/Core/src/Controller/Component/RecaptchaComponent.php
@@ -4,7 +4,7 @@
 use Cake\Controller\Component;
 use Cake\Controller\ComponentRegistry;
 use Cake\Core\Configure;
-use Cake\Network\Http\Client;
+use Cake\Http\Client;
 
 /**
  * Recaptcha Component
@@ -33,22 +33,22 @@ class RecaptchaComponent extends Component
      */
     public function __construct(ComponentRegistry $registry, array $config = [])
     {
-        $this->_defaultConfig['modelClass'] = $registry->getController()->modelClass;
+        $this->_defaultConfig['modelClass'] = $registry->getController()->getModelType();
         parent::__construct($registry, $config);
     }
 
     /**
      * initialize
      */
-    public function initialize(array $config)
+    public function initialize(array $config): void
     {
         $controller = $this->_registry->getController();
         $this->_controller = $controller;
         if ($controller->getName() === 'CakeError') {
             return;
         }
 
-        if (in_array($this->request->getParam('action'), $this->getConfig('actions'))) {
+        if (in_array($controller->getRequest()->getParam('action'), $this->getConfig('actions'))) {
             $controller->Security->validatePost = false;
         }
 

diff --git a/Core/src/Croogo.php b/Core/src/Croogo.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Croogo\Core;
 
@@ -287,7 +288,7 @@ public static function options($configKey, $object, $option = null)
             $options = Hash::merge(Configure::read($configKey . '.*'), $options);
         }
 
-        if ($option) {
+        if (!empty($options[$option])) {
             return $options[$option];
         }
 

diff --git a/Core/src/Model/Behavior/CachedBehavior.php b/Core/src/Model/Behavior/CachedBehavior.php
@@ -3,8 +3,8 @@
 namespace Croogo\Core\Model\Behavior;
 
 use Cake\Cache\Cache;
+use Cake\Cache\InvalidArgumentException;
 use Cake\ORM\Behavior;
-use InvalidArgumentException;
 
 /**
  * Cached Behavior

diff --git a/Dashboards/config/routes.php b/Dashboards/config/routes.php
@@ -6,7 +6,6 @@
 Router::plugin('Croogo/Dashboards', ['path' => '/'], function (RouteBuilder $route) {
     $route->prefix('admin', function (RouteBuilder $route) {
         $route->setExtensions(['json']);
-        $route->applyMiddleware('csrf');
 
         $route->scope('/dashboards', [], function (RouteBuilder $route) {
             $route->fallbacks();

diff --git a/Example/config/routes.php b/Example/config/routes.php
@@ -6,7 +6,6 @@
 Router::plugin('Croogo/Example', ['path' => '/'], function (RouteBuilder $routeBuilder) {
     $routeBuilder->prefix('admin', function (RouteBuilder $routeBuilder) {
         $routeBuilder->setExtensions(['json']);
-        $routeBuilder->applyMiddleware('csrf');
 
         $routeBuilder->connect('/route/here', [
             'plugin' => 'Croogo/Example',

diff --git a/Extensions/config/routes.php b/Extensions/config/routes.php
@@ -6,7 +6,6 @@
 Router::plugin('Croogo/Extensions', ['path' => '/'], function (RouteBuilder $route) {
     $route->prefix('admin', function (RouteBuilder $route) {
         $route->setExtensions(['json']);
-        $route->applyMiddleware('csrf');
 
         $route->scope('/extensions', [], function (RouteBuilder $route) {
             $route->fallbacks();

diff --git a/FileManager/config/routes.php b/FileManager/config/routes.php
@@ -6,7 +6,6 @@
 Router::plugin('Croogo/FileManager', ['path' => '/'], function (RouteBuilder $route) {
     $route->prefix('admin', function (RouteBuilder $route) {
         $route->setExtensions(['json']);
-        $route->applyMiddleware('csrf');
 
         $route->scope('/file-manager', [], function (RouteBuilder $route) {
             $route->fallbacks();

diff --git a/FileManager/src/Controller/Admin/AttachmentsController.php b/FileManager/src/Controller/Admin/AttachmentsController.php
@@ -45,7 +45,7 @@ class AttachmentsController extends AppController
     public function initialize(): void
     {
         parent::initialize();
-        $this->loadComponent('Search.Prg', [
+        $this->loadComponent('Search.Search', [
             'actions' => [
                 'index', 'browse', 'listings',
             ],

diff --git a/FileManager/src/Model/Behavior/LinkedAssetsBehavior.php b/FileManager/src/Model/Behavior/LinkedAssetsBehavior.php
@@ -26,7 +26,7 @@ class LinkedAssetsBehavior extends Behavior
      * @param array $config
      * @return void
      */
-    public function initialize(array $config = [])
+    public function initialize(array $config): void
     {
         $this->_table->addAssociations([
             'hasMany' => [

diff --git a/FileManager/src/Model/Table/AssetUsagesTable.php b/FileManager/src/Model/Table/AssetUsagesTable.php
@@ -19,7 +19,7 @@ class AssetUsagesTable extends CroogoTable
      * @param array $config
      * @return void
      */
-    public function initialize(array $config)
+    public function initialize(array $config): void
     {
         $this->setTable('asset_usages');
 
@@ -42,7 +42,7 @@ public function beforeSave(Event $event, EntityInterface $entity, ArrayObject $o
     {
         if (!empty($entity->featured_image)) {
             $entity->type = 'FeaturedImage';
-            $entity->unsetProperty('featured_image');
+            $entity->unset('featured_image');
         }
 
         return true;

diff --git a/FileManager/src/Model/Table/AssetsTable.php b/FileManager/src/Model/Table/AssetsTable.php
@@ -16,7 +16,7 @@ class AssetsTable extends CroogoTable
         'file' => 'checkFileUpload'
     ];
 
-    public function initialize(array $config)
+    public function initialize(array $config): void
     {
         $this->setTable('assets');
 
@@ -45,7 +45,7 @@ public function initialize(array $config)
         $this->addBehavior('Croogo/Core.Trackable');
     }
 
-    public function validationDefault(Validator $validator)
+    public function validationDefault(Validator $validator): Validator
     {
         $validator
             ->requirePresence('adapter', 'create');

diff --git a/FileManager/src/Model/Table/AttachmentsTable.php b/FileManager/src/Model/Table/AttachmentsTable.php
@@ -40,7 +40,7 @@ class AttachmentsTable extends CroogoTable
      * @param array $config
      * @return void
      */
-    public function initialize(array $config)
+    public function initialize(array $config): void
     {
         $this->setTable('attachments');
 
@@ -62,32 +62,32 @@ public function initialize(array $config)
 
         $this->searchManager()
             ->add('title', 'Search.Like', [
-                'field' => $this->Assets->aliasField('filename'),
+                'fields' => $this->Assets->aliasField('filename'),
                 'before' => true,
                 'after' => true,
             ])
             ->add('search', 'Search.Callback', [
                 'callback' => [$this, 'filterAttachments'],
             ])
             ->add('filename', 'Search.Like', [
-                'field' => $this->Assets->aliasField('filename'),
+                'fields' => $this->Assets->aliasField('filename'),
                 'before' => true,
                 'after' => true,
             ])
             ->value('model', [
-                'field' => $this->Assets->AssetUsages->aliasField('model'),
+                'fields' => $this->Assets->AssetUsages->aliasField('model'),
             ])
             ->value('foreign_key', [
-                'field' => $this->Assets->AssetUsages->aliasField('foreign_key'),
+                'fields' => $this->Assets->AssetUsages->aliasField('foreign_key'),
             ])
             ->value('asset_id', [
-                'field' => $this->Assets->aliasField('id'),
+                'fields' => $this->Assets->aliasField('id'),
             ])
             ->value('id', [
-                'field' => $this->aliasField('id'),
+                'fields' => $this->aliasField('id'),
             ])
             ->value('type', [
-                'field' => $this->Assets->AssetUsages->aliasField('type'),
+                'fields' => $this->Assets->AssetUsages->aliasField('type'),
             ]);
     }