commit 16d88402cbeb51d376d14c9d32e2bc00d00e4cb2
parent 7dcf18151dc7c9ec415b3ce46b4f2ad700adc8dc
Author: vpl <vpl@vpl.me>
Date: Sun, 1 Sep 2019 13:00:12 +0200
Initial version of CORS support
Diffstat:
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/src/main.rs b/src/main.rs
@@ -250,7 +250,8 @@ fn launch_rocket() {
let rocket = rocket
.manage(db::init_pool())
.manage(api::start_notification_server())
- .attach(util::AppHeaders());
+ .attach(util::AppHeaders())
+ .attach(util::CORS());
// Launch and print error if there is one
// The launch will restore the original logging level
diff --git a/src/util.rs b/src/util.rs
@@ -4,6 +4,8 @@
use rocket::fairing::{Fairing, Info, Kind};
use rocket::response::{self, Responder};
use rocket::{Request, Response};
+use rocket::http::{Header, ContentType, Method};
+use std::io::Cursor;
pub struct AppHeaders();
@@ -31,6 +33,39 @@ impl Fairing for AppHeaders {
}
}
+
+pub struct CORS();
+
+impl Fairing for CORS {
+ fn info(&self) -> Info {
+ Info {
+ name: "Add CORS headers to requests",
+ kind: Kind::Response
+ }
+ }
+
+ fn on_response(&self, request: &Request, response: &mut Response) {
+ // We need to explictly get the Origin header for Access-Control-Allow-Origin
+ let origin = match request.headers().get_one("Origin") {
+ Some(h) => h.to_string(),
+ _ => "".to_string(),
+ };
+
+ if request.method() == Method::Options || response.content_type() == Some(ContentType::JSON) {
+ // Requests with credentials need explicit values since they do not allow wildcards.
+ response.set_header(Header::new("Access-Control-Allow-Origin", origin));
+ response.set_header(Header::new("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH"));
+ response.set_header(Header::new("Access-Control-Allow-Headers", "*, Authorization"));
+ response.set_header(Header::new("Access-Control-Allow-Credentials", "true"));
+ }
+
+ if request.method() == Method::Options {
+ response.set_header(ContentType::Plain);
+ response.set_sized_body(Cursor::new(""));
+ }
+ }
+}
+
pub struct Cached<R>(R, &'static str);
impl<R> Cached<R> {