From 16447351c1b488249173837c16dbe945341e8d87 Mon Sep 17 00:00:00 2001
From: Christian Beier <info@christianbeier.net>
Date: Tue, 4 Jan 2022 12:41:17 +0100
Subject: [PATCH] Fix casbin example for actix-web v3 (#467)

---
 Cargo.lock                 | 66 +++++++++++++++-----------------------
 security/casbin/Cargo.toml |  7 +++-
 2 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6293b625..27b5b3b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -55,6 +55,8 @@ dependencies = [
  "actix-web 3.3.2",
  "casbin",
  "loge",
+ "rhai",
+ "rhai_codegen",
 ]
 
 [[package]]
@@ -240,7 +242,7 @@ dependencies = [
  "actix-service 2.0.0",
  "actix-tls 3.0.0-beta.5",
  "actix-utils 3.0.0",
- "ahash",
+ "ahash 0.7.4",
  "base64 0.13.0",
  "bitflags",
  "brotli2",
@@ -658,7 +660,7 @@ dependencies = [
  "actix-service 2.0.0",
  "actix-utils 3.0.0",
  "actix-web-codegen 0.5.0-beta.4",
- "ahash",
+ "ahash 0.7.4",
  "bytes 1.1.0",
  "cfg-if 1.0.0",
  "cookie 0.15.1",
@@ -828,6 +830,17 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "ahash"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "796540673305a66d127804eef19ad696f1f204b8c1025aaca4958c17eab32877"
+dependencies = [
+ "getrandom 0.2.3",
+ "once_cell",
+ "version_check 0.9.3",
+]
+
 [[package]]
 name = "ahash"
 version = "0.7.4"
@@ -1601,7 +1614,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dcc15cd0b9aff8e8326561dcf0bb6e56d0e559f3a4897f615b4a5075ab54c46"
 dependencies = [
- "ahash",
+ "ahash 0.7.4",
  "base64 0.13.0",
  "chrono",
  "hex",
@@ -1739,19 +1752,18 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
 [[package]]
 name = "casbin"
-version = "2.0.9"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3be2866a3a3174b9d31a11d9f9ef219ab84a444d107981c51bf79d7be221adc"
+checksum = "f19b7973e30bea3de9b47e425fb256375f71b8359c7402c624d697e38ea8fea0"
 dependencies = [
+ "async-std",
  "async-trait",
+ "indexmap",
  "lazy_static",
- "parking_lot",
  "regex",
  "rhai",
- "ritelinked",
  "serde 1.0.130",
  "thiserror",
- "tokio 1.12.0",
 ]
 
 [[package]]
@@ -2308,7 +2320,6 @@ dependencies = [
  "env_logger 0.8.4",
  "failure",
  "futures",
- "r2d2",
  "serde 1.0.130",
  "serde_json",
  "uuid",
@@ -3025,9 +3036,6 @@ name = "hashbrown"
 version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
-]
 
 [[package]]
 name = "heck"
@@ -3961,18 +3969,6 @@ dependencies = [
  "version_check 0.9.3",
 ]
 
-[[package]]
-name = "multipart-async-std-example"
-version = "0.3.0"
-dependencies = [
- "actix-multipart",
- "actix-web 3.3.2",
- "async-std",
- "futures-util",
- "sanitize-filename",
- "uuid",
-]
-
 [[package]]
 name = "multipart-example"
 version = "0.3.0"
@@ -4995,24 +4991,23 @@ dependencies = [
 
 [[package]]
 name = "rhai"
-version = "1.0.6"
+version = "0.19.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a2bb3d4236f1aac51ab8f1dccbe7e1c32ce2369ba5b3729affa1e65787a72d7"
+checksum = "309d2e139896eccb9487d8ddc4147dc98062a54d52916d0d638b100de8b1fcac"
 dependencies = [
- "ahash",
+ "ahash 0.6.3",
  "instant",
  "num-traits 0.2.14",
  "rhai_codegen",
  "serde 1.0.130",
  "smallvec",
- "smartstring",
 ]
 
 [[package]]
 name = "rhai_codegen"
-version = "1.0.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a340b02636b22e61d94ee53e6bcc2d01d339958766b2003b860d178ccf5ae5e"
+checksum = "16f2da2116fb882e3977223ab21acb2176bdc995a794aff3c727e6491476c0ef"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5034,16 +5029,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "ritelinked"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98f2771d255fd99f0294f13249fecd0cae6e074f86b4197ec1f1689d537b44d3"
-dependencies = [
- "ahash",
- "hashbrown",
-]
-
 [[package]]
 name = "run-in-thread"
 version = "2.0.0"
@@ -6033,6 +6018,7 @@ version = "2.0.0"
 dependencies = [
  "actix-web 3.3.2",
  "askama",
+ "env_logger 0.8.4",
 ]
 
 [[package]]
diff --git a/security/casbin/Cargo.toml b/security/casbin/Cargo.toml
index 9e1cd295..f90a09e4 100644
--- a/security/casbin/Cargo.toml
+++ b/security/casbin/Cargo.toml
@@ -6,5 +6,10 @@ edition = "2018"
 
 [dependencies]
 actix-web = "3"
-casbin = "2"
+# from v2.0.6 on casbin only supports tokio 1 which conflicts with actix-web 3,
+# see see https://github.com/casbin/casbin-rs#installation
+casbin = "=2.0.5"
+# these rhai deps are needed for casbin v2.0.5
+rhai = "=0.19.14"
+rhai_codegen = "=0.3.3"
 loge = {version = "0.4", default-features = false, features = ["colored", "chrono"]}