mirror of
https://gitlab.com/msrd0/gotham-restful.git
synced 2025-06-07 14:20:42 +00:00
update to gotham 0.5 and start using rustfmt
This commit is contained in:
parent
5317e50961
commit
d55b0897e9
GPG key ID:
DCC8C247452E98F9
39 changed files with 1798 additions and 2095 deletions
|
|
@ -5,7 +5,7 @@ use gotham::{
|
|||
router::builder::*,
|
||||
test::{Server, TestRequest, TestServer}
|
||||
};
|
||||
use gotham_restful::{CorsConfig, DrawResources, Origin, Raw, Resource, change_all, read_all};
|
||||
use gotham_restful::{change_all, read_all, CorsConfig, DrawResources, Origin, Raw, Resource};
|
||||
use itertools::Itertools;
|
||||
use mime::TEXT_PLAIN;
|
||||
|
||||
|
|
@ -14,70 +14,108 @@ use mime::TEXT_PLAIN;
|
|||
struct FooResource;
|
||||
|
||||
#[read_all(FooResource)]
|
||||
fn read_all()
|
||||
{
|
||||
}
|
||||
fn read_all() {}
|
||||
|
||||
#[change_all(FooResource)]
|
||||
fn change_all(_body : Raw<Vec<u8>>)
|
||||
{
|
||||
}
|
||||
fn change_all(_body: Raw<Vec<u8>>) {}
|
||||
|
||||
fn test_server(cfg : CorsConfig) -> TestServer
|
||||
{
|
||||
fn test_server(cfg: CorsConfig) -> TestServer {
|
||||
let (chain, pipeline) = single_pipeline(new_pipeline().add(cfg).build());
|
||||
TestServer::new(build_router(chain, pipeline, |router| {
|
||||
router.resource::<FooResource>("/foo")
|
||||
})).unwrap()
|
||||
TestServer::new(build_router(chain, pipeline, |router| router.resource::<FooResource>("/foo"))).unwrap()
|
||||
}
|
||||
|
||||
fn test_response<TS, C>(req : TestRequest<TS, C>, origin : Option<&str>, vary : Option<&str>, credentials : bool)
|
||||
fn test_response<TS, C>(req: TestRequest<TS, C>, origin: Option<&str>, vary: Option<&str>, credentials: bool)
|
||||
where
|
||||
TS : Server + 'static,
|
||||
C : Connect + Clone + Send + Sync + 'static
|
||||
TS: Server + 'static,
|
||||
C: Connect + Clone + Send + Sync + 'static
|
||||
{
|
||||
let res = req.with_header(ORIGIN, "http://example.org".parse().unwrap()).perform().unwrap();
|
||||
let res = req
|
||||
.with_header(ORIGIN, "http://example.org".parse().unwrap())
|
||||
.perform()
|
||||
.unwrap();
|
||||
assert_eq!(res.status(), StatusCode::NO_CONTENT);
|
||||
let headers = res.headers();
|
||||
println!("{}", headers.keys().join(","));
|
||||
assert_eq!(headers.get(ACCESS_CONTROL_ALLOW_ORIGIN).and_then(|value| value.to_str().ok()).as_deref(), origin);
|
||||
assert_eq!(
|
||||
headers
|
||||
.get(ACCESS_CONTROL_ALLOW_ORIGIN)
|
||||
.and_then(|value| value.to_str().ok())
|
||||
.as_deref(),
|
||||
origin
|
||||
);
|
||||
assert_eq!(headers.get(VARY).and_then(|value| value.to_str().ok()).as_deref(), vary);
|
||||
assert_eq!(headers.get(ACCESS_CONTROL_ALLOW_CREDENTIALS).and_then(|value| value.to_str().ok()).map(|value| value == "true").unwrap_or(false), credentials);
|
||||
assert_eq!(
|
||||
headers
|
||||
.get(ACCESS_CONTROL_ALLOW_CREDENTIALS)
|
||||
.and_then(|value| value.to_str().ok())
|
||||
.map(|value| value == "true")
|
||||
.unwrap_or(false),
|
||||
credentials
|
||||
);
|
||||
assert!(headers.get(ACCESS_CONTROL_MAX_AGE).is_none());
|
||||
}
|
||||
|
||||
fn test_preflight(server : &TestServer, method : &str, origin : Option<&str>, vary : &str, credentials : bool, max_age : u64)
|
||||
{
|
||||
let res = server.client().options("http://example.org/foo")
|
||||
fn test_preflight(server: &TestServer, method: &str, origin: Option<&str>, vary: &str, credentials: bool, max_age: u64) {
|
||||
let res = server
|
||||
.client()
|
||||
.options("http://example.org/foo")
|
||||
.with_header(ACCESS_CONTROL_REQUEST_METHOD, method.parse().unwrap())
|
||||
.with_header(ORIGIN, "http://example.org".parse().unwrap())
|
||||
.perform().unwrap();
|
||||
.perform()
|
||||
.unwrap();
|
||||
assert_eq!(res.status(), StatusCode::NO_CONTENT);
|
||||
let headers = res.headers();
|
||||
println!("{}", headers.keys().join(","));
|
||||
assert_eq!(headers.get(ACCESS_CONTROL_ALLOW_METHODS).and_then(|value| value.to_str().ok()).as_deref(), Some(method));
|
||||
assert_eq!(headers.get(ACCESS_CONTROL_ALLOW_ORIGIN).and_then(|value| value.to_str().ok()).as_deref(), origin);
|
||||
assert_eq!(
|
||||
headers
|
||||
.get(ACCESS_CONTROL_ALLOW_METHODS)
|
||||
.and_then(|value| value.to_str().ok())
|
||||
.as_deref(),
|
||||
Some(method)
|
||||
);
|
||||
assert_eq!(
|
||||
headers
|
||||
.get(ACCESS_CONTROL_ALLOW_ORIGIN)
|
||||
.and_then(|value| value.to_str().ok())
|
||||
.as_deref(),
|
||||
origin
|
||||
);
|
||||
assert_eq!(headers.get(VARY).and_then(|value| value.to_str().ok()).as_deref(), Some(vary));
|
||||
assert_eq!(headers.get(ACCESS_CONTROL_ALLOW_CREDENTIALS).and_then(|value| value.to_str().ok()).map(|value| value == "true").unwrap_or(false), credentials);
|
||||
assert_eq!(headers.get(ACCESS_CONTROL_MAX_AGE).and_then(|value| value.to_str().ok()).and_then(|value| value.parse().ok()), Some(max_age));
|
||||
assert_eq!(
|
||||
headers
|
||||
.get(ACCESS_CONTROL_ALLOW_CREDENTIALS)
|
||||
.and_then(|value| value.to_str().ok())
|
||||
.map(|value| value == "true")
|
||||
.unwrap_or(false),
|
||||
credentials
|
||||
);
|
||||
assert_eq!(
|
||||
headers
|
||||
.get(ACCESS_CONTROL_MAX_AGE)
|
||||
.and_then(|value| value.to_str().ok())
|
||||
.and_then(|value| value.parse().ok()),
|
||||
Some(max_age)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
fn cors_origin_none()
|
||||
{
|
||||
fn cors_origin_none() {
|
||||
let cfg = Default::default();
|
||||
let server = test_server(cfg);
|
||||
|
||||
test_preflight(&server, "PUT", None, "Access-Control-Request-Method", false, 0);
|
||||
|
||||
|
||||
test_response(server.client().get("http://example.org/foo"), None, None, false);
|
||||
test_response(server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN), None, None, false);
|
||||
test_response(
|
||||
server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN),
|
||||
None,
|
||||
None,
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cors_origin_star()
|
||||
{
|
||||
fn cors_origin_star() {
|
||||
let cfg = CorsConfig {
|
||||
origin: Origin::Star,
|
||||
..Default::default()
|
||||
|
|
@ -85,44 +123,80 @@ fn cors_origin_star()
|
|||
let server = test_server(cfg);
|
||||
|
||||
test_preflight(&server, "PUT", Some("*"), "Access-Control-Request-Method", false, 0);
|
||||
|
||||
|
||||
test_response(server.client().get("http://example.org/foo"), Some("*"), None, false);
|
||||
test_response(server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN), Some("*"), None, false);
|
||||
test_response(
|
||||
server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN),
|
||||
Some("*"),
|
||||
None,
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cors_origin_single()
|
||||
{
|
||||
fn cors_origin_single() {
|
||||
let cfg = CorsConfig {
|
||||
origin: Origin::Single("https://foo.com".to_owned()),
|
||||
..Default::default()
|
||||
};
|
||||
let server = test_server(cfg);
|
||||
|
||||
test_preflight(&server, "PUT", Some("https://foo.com"), "Access-Control-Request-Method", false, 0);
|
||||
|
||||
test_response(server.client().get("http://example.org/foo"), Some("https://foo.com"), None, false);
|
||||
test_response(server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN), Some("https://foo.com"), None, false);
|
||||
test_preflight(
|
||||
&server,
|
||||
"PUT",
|
||||
Some("https://foo.com"),
|
||||
"Access-Control-Request-Method",
|
||||
false,
|
||||
0
|
||||
);
|
||||
|
||||
test_response(
|
||||
server.client().get("http://example.org/foo"),
|
||||
Some("https://foo.com"),
|
||||
None,
|
||||
false
|
||||
);
|
||||
test_response(
|
||||
server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN),
|
||||
Some("https://foo.com"),
|
||||
None,
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cors_origin_copy()
|
||||
{
|
||||
fn cors_origin_copy() {
|
||||
let cfg = CorsConfig {
|
||||
origin: Origin::Copy,
|
||||
..Default::default()
|
||||
};
|
||||
let server = test_server(cfg);
|
||||
|
||||
test_preflight(&server, "PUT", Some("http://example.org"), "Access-Control-Request-Method,Origin", false, 0);
|
||||
|
||||
test_response(server.client().get("http://example.org/foo"), Some("http://example.org"), Some("Origin"), false);
|
||||
test_response(server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN), Some("http://example.org"), Some("Origin"), false);
|
||||
test_preflight(
|
||||
&server,
|
||||
"PUT",
|
||||
Some("http://example.org"),
|
||||
"Access-Control-Request-Method,Origin",
|
||||
false,
|
||||
0
|
||||
);
|
||||
|
||||
test_response(
|
||||
server.client().get("http://example.org/foo"),
|
||||
Some("http://example.org"),
|
||||
Some("Origin"),
|
||||
false
|
||||
);
|
||||
test_response(
|
||||
server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN),
|
||||
Some("http://example.org"),
|
||||
Some("Origin"),
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cors_credentials()
|
||||
{
|
||||
fn cors_credentials() {
|
||||
let cfg = CorsConfig {
|
||||
origin: Origin::None,
|
||||
credentials: true,
|
||||
|
|
@ -131,14 +205,18 @@ fn cors_credentials()
|
|||
let server = test_server(cfg);
|
||||
|
||||
test_preflight(&server, "PUT", None, "Access-Control-Request-Method", true, 0);
|
||||
|
||||
|
||||
test_response(server.client().get("http://example.org/foo"), None, None, true);
|
||||
test_response(server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN), None, None, true);
|
||||
test_response(
|
||||
server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN),
|
||||
None,
|
||||
None,
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cors_max_age()
|
||||
{
|
||||
fn cors_max_age() {
|
||||
let cfg = CorsConfig {
|
||||
origin: Origin::None,
|
||||
max_age: 31536000,
|
||||
|
|
@ -147,7 +225,12 @@ fn cors_max_age()
|
|||
let server = test_server(cfg);
|
||||
|
||||
test_preflight(&server, "PUT", None, "Access-Control-Request-Method", false, 31536000);
|
||||
|
||||
|
||||
test_response(server.client().get("http://example.org/foo"), None, None, false);
|
||||
test_response(server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN), None, None, false);
|
||||
test_response(
|
||||
server.client().put("http://example.org/foo", Body::empty(), TEXT_PLAIN),
|
||||
None,
|
||||
None,
|
||||
false
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue