wberube
/
iptoasn-webservice
mirror of https://github.com/jedisct1/iptoasn-webservice
1
0
Fork 0
Code Issues Releases Wiki Activity

Send a Vary: Accept, Accept-Encoding header

This commit is contained in:
Frank Denis 2017-09-12 15:32:12 +02:00
parent 4f9788847e
commit 811c41e27e
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -11,8 +11,8 @@ dependencies = [
"iron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"router 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]

2
Cargo.toml
View File

@ -17,9 +17,9 @@ hyper-native-tls = "~0.2"
iron = "~0.5"
log = "~0.3"
router = "~0.5"
serde = "~1.0"
serde_json = "~1.0"
clippy = {version = "~0", optional = true}
unicase = "~1.4"
[features]
default = []

2
src/main.rs
View File

@ -12,8 +12,8 @@ extern crate iron;
extern crate log;
#[macro_use]
extern crate router;
extern crate serde;
extern crate serde_json;
extern crate unicase;
mod asns;
mod webservice;

26
src/webservice.rs
View File

@ -1,7 +1,7 @@
use asns::*;
use horrorshow::prelude::*;
use iron::{typemap, BeforeMiddleware};
use iron::headers::{Accept, CacheControl, CacheDirective};
use iron::headers::{Accept, CacheControl, CacheDirective, Vary};
use iron::mime::*;
use iron::modifiers::Header;
use iron::prelude::*;
@ -11,6 +11,7 @@ use serde_json;
use std::net::IpAddr;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use unicase::UniCase;
const TTL: u32 = 86400;
@ -82,6 +83,7 @@ impl WebService {
fn output_json(
map: serde_json::Map<String, serde_json::value::Value>,
cache_header: Header<CacheControl>,
vary_header: Header<Vary>,
) -> IronResult<Response> {
let json = serde_json::to_string(&map).unwrap();
let mime_json = Mime(
@ -89,12 +91,15 @@ impl WebService {
SubLevel::Json,
vec![(Attr::Charset, Value::Utf8)],
);
Ok(Response::with((status::Ok, mime_json, cache_header, json)))
Ok(Response::with(
(status::Ok, mime_json, cache_header, vary_header, json),
))
}
fn output_html(
map: serde_json::Map<String, serde_json::value::Value>,
cache_header: Header<CacheControl>,
vary_header: Header<Vary>,
) -> IronResult<Response> {
let mime_html = Mime(
TopLevel::Text,
@ -153,17 +158,20 @@ impl WebService {
.into_string()
.unwrap();
let html = format!("<!DOCTYPE html>\n<html>{}</html>", html);
Ok(Response::with((status::Ok, mime_html, cache_header, html)))
Ok(Response::with(
(status::Ok, mime_html, cache_header, vary_header, html),
))
}
fn output(
output_type: OutputType,
map: serde_json::Map<String, serde_json::value::Value>,
cache_header: Header<CacheControl>,
vary_header: Header<Vary>,
) -> IronResult<Response> {
match output_type {
OutputType::Json => Self::output_json(map, cache_header),
_ => Self::output_html(map, cache_header),
OutputType::Json => Self::output_json(map, cache_header, vary_header),
_ => Self::output_html(map, cache_header, vary_header),
}
}
@ -176,6 +184,10 @@ impl WebService {
let cache_header = Header(CacheControl(
vec![CacheDirective::Public, CacheDirective::MaxAge(TTL)],
));
let vary_header = Header(Vary::Items(vec![
UniCase::from_str("accept-encoding").unwrap(),
UniCase::from_str("accept").unwrap(),
]));
let ip_str = match req.extensions.get::<Router>().unwrap().find("ip") {
None => {
let response = Response::with((
@ -211,7 +223,7 @@ impl WebService {
"announced".to_string(),
serde_json::value::Value::Bool(false),
);
return Self::output(Self::accept_type(&req), map, cache_header);
return Self::output(Self::accept_type(&req), map, cache_header, vary_header);
}
Some(found) => found,
};
@ -239,7 +251,7 @@ impl WebService {
"as_description".to_string(),
serde_json::value::Value::String(found.description.clone()),
);
Self::output(Self::accept_type(&req), map, cache_header)
Self::output(Self::accept_type(&req), map, cache_header, vary_header)
}
pub fn start(asns_arc: Arc<RwLock<Arc<ASNs>>>, listen_addr: &str) {