Merge d834905 into 9e818c4

.gitignore

@@ -7,3 +7,4 @@ composer.lock
 .subsplit
 .php_cs.cache
 /runtime
+*.log

casbin-rbac-model.conf

@@ -0,0 +1,14 @@
+[request_definition]
+r = sub, obj, act
+
+[policy_definition]
+p = sub, obj, act
+
+[role_definition]
+g = _, _
+
+[policy_effect]
+e = some(where (p.eft == allow))
+
+[matchers]
+m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act

composer.json

@@ -10,8 +10,8 @@
     ],
     "require": {
         "php": "^7.2",
-        "ext-swoole": ">=4.5",
-        "casbin/casbin": "~3.1",
+        "ext-swoole": ">=4.4",
+        "casbin/casbin": "~3.0",
         "easyswoole/orm": "^1.4",
         "easyswoole/easyswoole": "~3.3|~3.4"
     },

dev.php

@@ -34,9 +34,14 @@
         'host'          => '127.0.0.1',
         'port'          => 3306,
         'user'          => 'root',
-        'password'      => '',
-        'database'      => 'easyswoole_permission',
+        'password'      => 'root',
+        'database'      => 'test',
         'timeout'       => 5,
         'charset'       => 'utf8mb4',
+    ],
+    'Enforcer' => [
+        'model_config_type' => 'file',
+        'model_config_file_path' => __DIR__ . '/casbin-rbac-model.conf',
+        'log_enable' => true,
     ]
 ];

phpunit.php

@@ -0,0 +1,10 @@
+<?php
+
+
+defined("MYSQL_HOST") ?: define('MYSQL_HOST', '127.0.0.1');
+defined("MYSQL_PORT") ?: define('MYSQL_PORT', 3306);
+defined("MYSQL_USER") ?: define('MYSQL_USER', 'root');
+defined("MYSQL_PASSWORD") ?: define('MYSQL_PASSWORD', '');
+defined("MYSQL_DATABASE") ?: define('MYSQL_DATABASE', 'easyswoole_permission');
+defined("MYSQL_TIMEOUT") ?: define('MYSQL_TIMEOUT', 5);
+defined("MYSQL_CHARSET") ?: define('MYSQL_CHARSET', 'utf8mb4');

src/Adapters/DatabaseAdapter.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace EasySwoole\Permission\Adapters;
 
 use Casbin\Persist\AdapterHelper;
@@ -176,7 +174,6 @@ public function addPolicies(string $sec, string $ptype, array $rules): void
             }
             $cols[] = $temp;
         }
-
         RulesModel::create()->saveAll($cols);
     }
 

src/Casbin.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace EasySwoole\Permission;
 
 use Casbin\Enforcer;

src/Config.php

@@ -5,8 +5,10 @@
 namespace EasySwoole\Permission;
 
 use Casbin\Persist\Adapter;
+use EasySwoole\Permission\Adapters\DatabaseAdapter;
+use EasySwoole\Spl\SplBean;
 
-class Config
+class Config extends SplBean
 {
     const CONFIG_TYPE_FILE = 'file';
 
@@ -95,7 +97,7 @@ public function setModelConfigText(string $model_config_text): void
      */
     public function getAdapter(): ?Adapter
     {
-        return $this->adapter;
+        return $this->adapter instanceof Adapter ? $this->adapter : new DatabaseAdapter();
     }
 
     /**

src/Enforcer.php

@@ -0,0 +1,80 @@
+<?php
+
+
+namespace EasySwoole\Permission;
+
+use Casbin\Exceptions\InvalidFilePathException;
+use Casbin\Log\Log;
+use Casbin\Model\Model;
+use EasySwoole\Component\Context\ContextManager;
+use EasySwoole\Component\Context\Exception\ModifyError;
+use InvalidArgumentException;
+use Casbin\Exceptions\CasbinException;
+use Casbin\Enforcer as BaseEnforcer;
+
+/**
+ * Class Enforcer
+ * @package EasySwoole\Permission
+ * @mixin EnforcerIDE
+ */
+class Enforcer
+{
+    /**
+     * @return BaseEnforcer
+     * @throws CasbinException
+     */
+    protected static function init()
+    {
+        $config = \EasySwoole\EasySwoole\Config::getInstance()->getConf('Enforcer');
+
+        $config = new Config($config);
+
+        if ($config->isLogEnable()) {
+            $loggerClass = $config->getLoggerClass();
+            $logger = new $loggerClass();
+            if (!$logger instanceof Log) {
+                throw new InvalidArgumentException("Enforcer config is invalid.");
+            }
+            Log::setLogger($logger);
+        }
+
+        $model = new Model();
+        if (Config::CONFIG_TYPE_FILE === $config->getModelConfigType()) {
+            $model->loadModel($config->getModelConfigFilePath());
+        } elseif (Config::CONFIG_TYPE_TEXT === $config->getModelConfigType()) {
+            $model->loadModelFromText($config->getModelConfigText());
+        }
+
+        $adapter = $config->getAdapter();
+
+        return new BaseEnforcer($model, $adapter, $config->isLogEnable());
+    }
+
+    /**
+     * @return BaseEnforcer|mixed
+     * @throws CasbinException
+     * @throws ModifyError
+     */
+    protected static function getInstance()
+    {
+        $enforcer = ContextManager::getInstance()->get(\Casbin\Enforcer::class);
+        if (is_null($enforcer)) {
+            $enforcer = self::init();
+            ContextManager::getInstance()->set(\Casbin\Enforcer::class, $enforcer);
+        }
+
+        return $enforcer;
+    }
+
+    /**
+     * @param $name
+     * @param $arguments
+     * @return mixed
+     * @throws CasbinException
+     * @throws ModifyError
+     */
+    public static function __callStatic($name, $arguments)
+    {
+        return self::getInstance()->{$name}(...$arguments);
+    }
+}