Merge pull request #18 from hackerchai/master

Feat: bump version 0.4.1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-casbin-auth"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Eason Chai <[email protected]>","Cheng JIANG <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"

README.md

@@ -12,7 +12,7 @@
 Add it to `Cargo.toml`
 
 ```rust
-actix-casbin-auth = "0.4.0"
+actix-casbin-auth = "0.4.1"
 actix-rt = "1.1.1"
 actix-web = "2.0.0"
 ```
@@ -107,11 +107,21 @@ mod fake_auth;
 
 #[actix_rt::main]
 async fn main() -> Result<()> {
-    let m = DefaultModel::from_file("examples/rbac_restful_keymatch2_model.conf").await?;
-    let a = FileAdapter::new("examples/rbac_restful_keymatch2_policy.csv");  //You can also use diesel-adapter or sqlx-adapter
+    let m = DefaultModel::from_file("examples/rbac_with_pattern_model.conf")
+        .await
+        .unwrap();
+    let a = FileAdapter::new("examples/rbac_with_pattern_policy.csv");  //You can also use diesel-adapter or sqlx-adapter
 
     let casbin_middleware = CasbinService::new(m, a).await;
 
+    casbin_middleware
+        .write()
+        .await
+        .get_role_manager()
+        .write()
+        .unwrap()
+        .matching_fn(Some(key_match2), None);
+
     HttpServer::new(move || {
         App::new()
             .wrap(casbin_middleware.clone())

examples/rbac_with_domains_model.conf

@@ -6,10 +6,9 @@ p = sub, dom, obj, act
 
 [role_definition]
 g = _, _, _
-g2 = _, _, _
 
 [policy_effect]
 e = some(where (p.eft == allow))
 
 [matchers]
-m = g(r.sub, p.sub, r.dom) && r.dom == p.dom && r.obj == p.obj && r.act == p.act
+m = g(r.sub, p.sub, r.dom) && r.dom == p.dom && r.obj == p.obj && regexMatch(r.act, p.act)

tests/test_middleware.rs

@@ -10,7 +10,8 @@ use futures::future::{ok, Future, Ready};
 use actix_casbin_auth::{CasbinService, CasbinVals};
 
 use actix_web::{test, web, App};
-use casbin::{DefaultModel, FileAdapter};
+use casbin::function_map::key_match2;
+use casbin::{CoreApi, DefaultModel, FileAdapter};
 
 pub struct FakeAuth;
 
@@ -69,13 +70,21 @@ where
 
 #[actix_rt::test]
 async fn test_middleware() {
-    let m = DefaultModel::from_file("examples/rbac_restful_keymatch2_model.conf")
+    let m = DefaultModel::from_file("examples/rbac_with_pattern_model.conf")
         .await
         .unwrap();
-    let a = FileAdapter::new("examples/rbac_restful_keymatch2_policy.csv");
+    let a = FileAdapter::new("examples/rbac_with_pattern_policy.csv");
 
     let casbin_middleware = CasbinService::new(m, a).await;
 
+    casbin_middleware
+        .write()
+        .await
+        .get_role_manager()
+        .write()
+        .unwrap()
+        .matching_fn(Some(key_match2), None);
+
     let mut app = test::init_service(
         App::new()
             .wrap(casbin_middleware.clone())

tests/test_set_enforcer.rs

@@ -10,6 +10,7 @@ use futures::future::{ok, Future, Ready};
 use actix_casbin_auth::{CasbinService, CasbinVals};
 
 use actix_web::{test, web, App};
+use casbin::function_map::key_match2;
 use casbin::{CachedEnforcer, CoreApi, DefaultModel, FileAdapter};
 
 use std::sync::Arc;
@@ -77,18 +78,26 @@ where
 
 #[actix_rt::test]
 async fn test_set_enforcer() {
-    let m = DefaultModel::from_file("examples/rbac_restful_keymatch2_model.conf")
+    let m = DefaultModel::from_file("examples/rbac_with_pattern_model.conf")
         .await
         .unwrap();
-    let a = FileAdapter::new("examples/rbac_restful_keymatch2_policy.csv");
+    let a = FileAdapter::new("examples/rbac_with_pattern_policy.csv");
 
     let enforcer = Arc::new(RwLock::new(CachedEnforcer::new(m, a).await.unwrap()));
 
     let casbin_middleware = CasbinService::set_enforcer(enforcer);
 
+    casbin_middleware
+        .write()
+        .await
+        .get_role_manager()
+        .write()
+        .unwrap()
+        .matching_fn(Some(key_match2), None);
+
     let mut app = test::init_service(
         App::new()
-            .wrap(casbin_middleware)
+            .wrap(casbin_middleware.clone())
             .wrap(FakeAuth)
             .route("/pen/1", web::get().to(|| HttpResponse::Ok()))
             .route("/book/{id}", web::get().to(|| HttpResponse::Ok())),