Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade axum to 0.7 #9

Merged
merged 2 commits into from
Feb 27, 2024
Merged

feat: upgrade axum to 0.7 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
847fd8a
feat: upgrade dependencies
MuZhou233 Feb 27, 2024
1137552
refactor: cargo fmt
MuZhou233 Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ path = "src/lib.rs"
casbin = { version = "2.0.9", default-features = false, features = ["incremental", "cached"] }
tokio = { version = "1.17.0", default-features = false, optional = true }
async-std = { version = "1.10.0", default-features = false, optional = true }
axum = "0.5.7"
axum = "0.7.4"
futures = "0.3"
tower = { version = "0.4", features = ["full"] }
http = "0.2.8"
http-body = "0.4.5"
http = "1.0.0"
http-body = "1.0.0"
http-body-util = "0.1.0"
bytes = "1.1.0"

[features]
Expand All @@ -32,7 +33,7 @@ runtime-async-std = ["casbin/runtime-async-std", "async-std/std"]
[dev-dependencies]
tokio = { version = "1.17.0", features = [ "full" ] }
async-std = { version = "1.10.0", features = [ "attributes" ] }
axum-test-helper = "0.1.1"
axum-test-helpers = "0.7.5"

[profile.release]
codegen-units = 1
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

## Install

Add it to `Cargo.toml`
Add dependencies to `Cargo.toml`

```toml
axum = "0.5.7"
axum-casbin = "1.0.0"
tokio = { version = "1.17.0", features = [ "full" ] }
```bash
cargo add axum
cargo add axum-casbin
cargo add tokio --features full
```

## Requirement
Expand Down
27 changes: 12 additions & 15 deletions src/middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
use axum::{
body::{self, BoxBody},
response::Response,
BoxError,
};
use axum::{body, response::Response, BoxError};
use bytes::Bytes;
use casbin::prelude::{TryIntoAdapter, TryIntoModel};
use casbin::{CachedEnforcer, CoreApi, Result as CasbinResult};
use futures::future::BoxFuture;
use http::{Request, StatusCode};
use http_body::{Body as HttpBody, Full};
use http_body::Body as HttpBody;
use http_body_util::Full;
use std::{
convert::Infallible,
ops::{Deref, DerefMut},
Expand Down Expand Up @@ -93,7 +90,7 @@ where
ResBody: HttpBody<Data = Bytes> + Send + 'static,
ResBody::Error: Into<BoxError>,
{
type Response = Response<BoxBody>;
type Response = Response;
type Error = Infallible;
// `BoxFuture` is a type alias for `Pin<Box<dyn Future + Send + 'a>>`
type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
Expand All @@ -116,7 +113,7 @@ where
None => {
return Ok(Response::builder()
.status(StatusCode::UNAUTHORIZED)
.body(body::boxed(Full::from("401 Unauthorized")))
.body(body::Body::new(Full::from("401 Unauthorized")))
.unwrap());
}
};
Expand All @@ -129,20 +126,20 @@ where
match lock.enforce_mut(vec![subject, domain, path, action]) {
Ok(true) => {
drop(lock);
Ok(inner.call(req).await?.map(body::boxed))
Ok(inner.call(req).await?.map(body::Body::new))
}
Ok(false) => {
drop(lock);
Ok(Response::builder()
.status(StatusCode::FORBIDDEN)
.body(body::boxed(Full::from("403 Forbidden")))
.body(body::Body::new(Full::from("403 Forbidden")))
.unwrap())
}
Err(_) => {
drop(lock);
Ok(Response::builder()
.status(StatusCode::BAD_GATEWAY)
.body(body::boxed(Full::from("502 Bad Gateway")))
.body(body::Body::new(Full::from("502 Bad Gateway")))
.unwrap())
}
}
Expand All @@ -151,28 +148,28 @@ where
match lock.enforce_mut(vec![subject, path, action]) {
Ok(true) => {
drop(lock);
Ok(inner.call(req).await?.map(body::boxed))
Ok(inner.call(req).await?.map(body::Body::new))
}
Ok(false) => {
drop(lock);
Ok(Response::builder()
.status(StatusCode::FORBIDDEN)
.body(body::boxed(Full::from("403 Forbidden")))
.body(body::Body::new(Full::from("403 Forbidden")))
.unwrap())
}
Err(_) => {
drop(lock);
Ok(Response::builder()
.status(StatusCode::BAD_GATEWAY)
.body(body::boxed(Full::from("502 Bad Gateway")))
.body(body::Body::new(Full::from("502 Bad Gateway")))
.unwrap())
}
}
}
} else {
Ok(Response::builder()
.status(StatusCode::UNAUTHORIZED)
.body(body::boxed(Full::from("401 Unauthorized")))
.body(body::Body::new(Full::from("401 Unauthorized")))
.unwrap())
}
})
Expand Down
8 changes: 4 additions & 4 deletions tests/test_middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use axum::{response::Response, routing::get, BoxError, Router};
use axum_casbin::{CasbinAxumLayer, CasbinVals};
use axum_test_helper::TestClient;
use axum_test_helpers::TestClient;
use bytes::Bytes;
use casbin::function_map::key_match2;
use casbin::{CoreApi, DefaultModel, FileAdapter};
Expand Down Expand Up @@ -95,12 +95,12 @@ async fn test_middleware() {

let client = TestClient::new(app);

let resp_pen_1 = client.get("/pen/1").send().await;
let resp_pen_1 = client.get("/pen/1").await;
assert_eq!(resp_pen_1.status(), StatusCode::OK);

let resp_book = client.get("/book/2").send().await;
let resp_book = client.get("/book/2").await;
assert_eq!(resp_book.status(), StatusCode::OK);

let resp_pen_2 = client.get("/pen/2").send().await;
let resp_pen_2 = client.get("/pen/2").await;
assert_eq!(resp_pen_2.status(), StatusCode::FORBIDDEN);
}
6 changes: 3 additions & 3 deletions tests/test_middleware_domain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use axum::{response::Response, routing::get, BoxError, Router};
use axum_casbin::{CasbinAxumLayer, CasbinVals};
use axum_test_helper::TestClient;
use axum_test_helpers::TestClient;
use bytes::Bytes;
use casbin::{DefaultModel, FileAdapter};
use futures::future::BoxFuture;
Expand Down Expand Up @@ -85,9 +85,9 @@ async fn test_middleware_domain() {

let client = TestClient::new(app);

let resp_pen = client.get("/pen/1").send().await;
let resp_pen = client.get("/pen/1").await;
assert_eq!(resp_pen.status(), StatusCode::OK);

let resp_book = client.get("/book/1").send().await;
let resp_book = client.get("/book/1").await;
assert_eq!(resp_book.status(), StatusCode::FORBIDDEN);
}
8 changes: 4 additions & 4 deletions tests/test_set_enforcer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use axum::{response::Response, routing::get, BoxError, Router};
use axum_casbin::{CasbinAxumLayer, CasbinVals};
use axum_test_helper::TestClient;
use axum_test_helpers::TestClient;
use bytes::Bytes;
use casbin::function_map::key_match2;
use casbin::{CachedEnforcer, CoreApi, DefaultModel, FileAdapter};
Expand Down Expand Up @@ -103,12 +103,12 @@ async fn test_set_enforcer() {

let client = TestClient::new(app);

let resp_pen_1 = client.get("/pen/1").send().await;
let resp_pen_1 = client.get("/pen/1").await;
assert_eq!(resp_pen_1.status(), StatusCode::OK);

let resp_book = client.get("/book/2").send().await;
let resp_book = client.get("/book/2").await;
assert_eq!(resp_book.status(), StatusCode::OK);

let resp_pen_2 = client.get("/pen/2").send().await;
let resp_pen_2 = client.get("/pen/2").await;
assert_eq!(resp_pen_2.status(), StatusCode::FORBIDDEN);
}