Add cors support

sigp · Sep 18, 2020 · 1f7445b · 1f7445b
1 parent 9202f89
commit 1f7445b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/beacon_node/http_api/src/lib.rs b/beacon_node/http_api/src/lib.rs
@@ -169,6 +169,7 @@ pub fn serve<T: BeaconChainTypes>(
 ) -> Result<(SocketAddr, impl Future<Output = ()>), Error> {
     let config = ctx.config.clone();
     let log = ctx.log.clone();
+    let allow_origin = config.allow_origin.clone();
 
     if !config.enabled {
         crit!(log, "Cannot start disabled HTTP server");
@@ -177,8 +178,6 @@ pub fn serve<T: BeaconChainTypes>(
         ));
     }
 
-    // TODO: cors
-
     let eth1_v1 = warp::path(API_PREFIX).and(warp::path(API_VERSION));
 
     let beacon_proposer_cache = ctx
@@ -1583,7 +1582,21 @@ pub fn serve<T: BeaconChainTypes>(
         .boxed()
         .recover(warp_utils::reject::handle_rejection)
         .with(slog_logging(log.clone()))
-        .with(prometheus_metrics());
+        .with(prometheus_metrics())
+        .map(|reply| warp::reply::with_header(reply, "Server", &version_with_platform()))
+        .map(move |reply| {
+            let reply: Box<dyn warp::Reply> = if let Some(allow_origin) = allow_origin.as_ref() {
+                Box::new(warp::reply::with_header(
+                    reply,
+                    "Access-Control-Allow-Origin",
+                    allow_origin,
+                ))
+            } else {
+                Box::new(reply)
+            };
+
+            reply
+        });
 
     let (listening_socket, server) = warp::serve(routes).try_bind_with_graceful_shutdown(
         SocketAddrV4::new(config.listen_addr, config.listen_port),

diff --git a/beacon_node/http_metrics/Cargo.toml b/beacon_node/http_metrics/Cargo.toml
@@ -18,6 +18,7 @@ slot_clock = { path = "../../common/slot_clock" }
 lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
 lazy_static = "1.4.0"
 eth2 = { path = "../../common/eth2" }
+lighthouse_version = { path = "../../common/lighthouse_version" }
 
 [dev-dependencies]
 tokio = { version = "0.2.21", features = ["sync"] }

diff --git a/beacon_node/http_metrics/src/lib.rs b/beacon_node/http_metrics/src/lib.rs
@@ -4,6 +4,7 @@ extern crate lazy_static;
 mod metrics;
 
 use beacon_chain::{BeaconChain, BeaconChainTypes};
+use lighthouse_version::version_with_platform;
 use serde::{Deserialize, Serialize};
 use slog::{crit, info, Logger};
 use std::future::Future;
@@ -63,6 +64,7 @@ pub fn serve<T: BeaconChainTypes>(
 ) -> Result<(SocketAddr, impl Future<Output = ()>), Error> {
     let config = &ctx.config;
     let log = ctx.log.clone();
+    let allow_origin = config.allow_origin.clone();
 
     if !config.enabled {
         crit!(log, "Cannot start disabled metrics HTTP server");
@@ -86,6 +88,20 @@ pub fn serve<T: BeaconChainTypes>(
                             .unwrap()
                     }),
             )
+        })
+        .map(|reply| warp::reply::with_header(reply, "Server", &version_with_platform()))
+        .map(move |reply| {
+            let reply: Box<dyn warp::Reply> = if let Some(allow_origin) = allow_origin.as_ref() {
+                Box::new(warp::reply::with_header(
+                    reply,
+                    "Access-Control-Allow-Origin",
+                    allow_origin,
+                ))
+            } else {
+                Box::new(reply)
+            };
+
+            reply
         });
 
     let (listening_socket, server) = warp::serve(routes).try_bind_with_graceful_shutdown(