Merge pull request #27 from code-troopers/fix/windowsBuild

Cedric Gatay · web-flow · commit 684d3caa3675 · 2018-06-21T09:47:57.000+02:00
chore(): Fix windows build target
diff --git a/.travis.yml b/.travis.yml
@@ -47,8 +47,8 @@ matrix:
 #    # Windows
 #    - env: TARGET=x86_64-pc-windows-gnu
      # Windows
-#    - env: TARGET=x86_64-pc-windows-gnu
-#      rust: nightly
+    - env: TARGET=x86_64-pc-windows-gnu
+      rust: nightly
 
     # Testing other channels
     - env: TARGET=x86_64-unknown-linux-gnu
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,8 +15,8 @@ serde_derive = "1.0"
 # Each data format lives in its own crate; the sample code below uses JSON
 # but you may be using a different one.
 serde_json = "1.0"
-rocket = "0.3.11"
-rocket_codegen = "0.3.11"
+hyper = "0.12.0"
+futures = "0.1.21"
 linked-hash-map = "0.5.1"
 lazy_static = "1.0"
-clap = "2.0.0"
+clap = "2.0.0"
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,9 +1,10 @@
 #![feature(plugin, extern_prelude)]
-#![plugin(rocket_codegen)]
-extern crate colored;
+extern crate futures;
+extern crate hyper;
 #[macro_use]
 extern crate lazy_static;
-extern crate rocket;
+extern crate colored;
+
 #[macro_use]
 extern crate serde_derive;
 
@@ -12,8 +13,6 @@ use colored::*;
 use file_finder::CTFile;
 use man::CTMan;
 use ports::CTPorts;
-use rocket::http::ContentType;
-use rocket::response::Content;
 use std::env;
 use std::error::Error;
 use std::fs::File;
@@ -31,6 +30,14 @@ pub mod banner;
 #[macro_use]
 pub mod ports_html;
 
+
+use futures::future;
+use hyper::rt::Future;
+use hyper::service::service_fn;
+use hyper::{Body, Method, Request, Response, Server, StatusCode, HeaderMap};
+use hyper::header::CONTENT_TYPE;
+
+
 pub fn show_banner(){
     let show_banner = env::var("CTNOBANNER").unwrap_or("false".to_string());
     if show_banner == "false" {
@@ -66,9 +73,10 @@ pub fn init_project(){
 
 pub fn start_port_listening() {
     println!("👂 Started ports web server at http://localhost:1500, CTRL+C to exit...");
-    start_rocket();
+    start_hyper();
 }
 
+
 pub fn show_man(man_entry: Option<&str>, ct_file: Option<CTFile>) {
     if let Some(ct_file) = ct_file {
         if let Some(ct_man) = CTMan::all(&ct_file) {
@@ -83,22 +91,46 @@ pub fn show_man(man_entry: Option<&str>, ct_file: Option<CTFile>) {
     }
 }
 
-#[get("/scan")]
 fn scan() -> String {
     serde_json::to_string(&CTPorts::all().unwrap()).unwrap()
 }
 
-#[get("/", format = "text/html")]
-fn home_page() -> Content<String> {
-    Content(ContentType::HTML, INDEX_HTML!().to_string())
+
+fn home_page() -> &'static str {
+    INDEX_HTML!()
 }
 
-pub fn start_rocket() {
-    let config = rocket::config::Config::build(rocket::config::Environment::Production)
-        .port(1500)
-        .finalize().expect("Could not create config");
+type BoxFut = Box<Future<Item = Response<Body>, Error = hyper::Error> + Send>;
+
+fn echo(req: Request<Body>) -> BoxFut {
+    let mut response = Response::new(Body::empty());
+
+    match (req.method(), req.uri().path()) {
+        (&Method::GET, "/") => {
+            let mut map = HeaderMap::new();
+
+            map.insert(CONTENT_TYPE, "text/html;charset=utf-8".parse().unwrap());
 
-    rocket::custom(config, false)
-        .mount("/", routes![scan, home_page])
-        .launch();
-}
+            *response.headers_mut() = map;
+            *response.body_mut() = Body::from(home_page());
+        }
+        (&Method::GET, "/scan") => {
+            *response.body_mut() = Body::from(scan());
+        }
+        _ => {
+            *response.status_mut() = StatusCode::NOT_FOUND;
+        }
+    }
+    Box::new(future::ok(response))
+}
+
+pub fn start_hyper() {
+    let addr = ([0, 0, 0, 0], 1500).into();
+
+    let server = Server::bind(&addr)
+        .serve(|| service_fn(echo))
+        .map_err(|e| eprintln!("server error: {}", e));
+
+
+    hyper::rt::run(server);
+}
