Merge branch 'fix-get-auth' of https://github.com/samparsky/adex-validator-stack-rust into fix-get-auth

samparsky · samparsky · commit 0cb18cde981d · 2019-11-07T14:29:06.000+01:00
diff --git a/primitives/src/config.rs b/primitives/src/config.rs
@@ -15,6 +15,7 @@ lazy_static! {
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all(serialize = "SCREAMING_SNAKE_CASE"))]
 pub struct Config {
     pub identity: Option<String>, // should not be here maybe?
     pub max_channels: u32,
diff --git a/sentry/src/lib.rs b/sentry/src/lib.rs
@@ -2,13 +2,28 @@
 #![deny(rust_2018_idioms)]
 
 use hyper::service::{make_service_fn, service_fn};
-use hyper::{Body, Error, Request, Response, Server, StatusCode};
+use hyper::{Body, Error, Method, Request, Response, Server, StatusCode};
 use primitives::adapter::Adapter;
 use primitives::Config;
 use slog::{error, info, Logger};
 
 pub mod routes {
     pub mod channel;
+    pub mod cfg {
+        use crate::ResponseError;
+        use hyper::header::CONTENT_TYPE;
+        use hyper::{Body, Response};
+        use primitives::Config;
+
+        pub fn return_config(config: &Config) -> Result<Response<Body>, ResponseError> {
+            let config_str = serde_json::to_string(config)?;
+
+            Ok(Response::builder()
+                .header(CONTENT_TYPE, "application/json")
+                .body(Body::from(config_str))
+                .expect("Creating a response should never fail"))
+        }
+    }
 }
 
 pub mod access;
@@ -43,7 +58,7 @@ impl<A: Adapter + 'static> Application<A> {
             async move {
                 Ok::<_, Error>(service_fn(move |req| {
                     let adapter_config = adapter_config.clone();
-                    async move { Ok::<_, Error>(handle_routing(req, adapter_config.0).await) }
+                    async move { Ok::<_, Error>(handle_routing(req, adapter_config).await) }
                 }))
             }
         });
@@ -71,11 +86,16 @@ where
     }
 }
 
-async fn handle_routing(req: Request<Body>, adapter: impl Adapter) -> Response<Body> {
-    if req.uri().path().starts_with("/channel") {
-        crate::routes::channel::handle_channel_routes(req, adapter).await
-    } else {
-        Err(ResponseError::NotFound)
+async fn handle_routing(
+    req: Request<Body>,
+    (adapter, config): (impl Adapter, Config),
+) -> Response<Body> {
+    match (req.uri().path(), req.method()) {
+        ("/cfg", &Method::GET) => crate::routes::cfg::return_config(&config),
+        (route, _) if route.starts_with("/channel") => {
+            crate::routes::channel::handle_channel_routes(req, adapter).await
+        }
+        _ => Err(ResponseError::NotFound),
     }
     .unwrap_or_else(|response_err| match response_err {
         ResponseError::NotFound => not_found(),

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ lazy_static! {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`#[derive(Serialize, Deserialize, Debug, Clone)]`
	`18`	`+#[serde(rename_all(serialize = "SCREAMING_SNAKE_CASE"))]`
`18`	`19`	`pub struct Config {`
`19`	`20`	`pub identity: Option<String>, // should not be here maybe?`
`20`	`21`	`pub max_channels: u32,`