actix-web upgrade

Author: vsilent

Cargo.toml

@@ -2,19 +2,18 @@
 name = "stackdog"
 version = "0.1.0"
 authors = ["Vasili Pascal <info@try.direct>"]
-edition = "2018"
+edition = "2021"
 
 #[package.metadata.docs.rs]
 features = ["openssl", "rustls", "compress", "secure-cookies"]
 
 [dependencies]
-bollard = "0.11"
+#actix-web = { version = "3.0.0-beta.3", features=["rustls"] }
 actix-web = { version = "3.3.3", features=["rustls"] }
-actix-rt = "2.1.0"
+actix-rt = "1.1.1"
 actix-service = "1.0.6"
 actix-cors = "0.3.0"
 actix-http = "2.1.0"
-#actix = "0.12"
 log = "0.4.11"
 env_logger = "0.9.0"
 serde = "1.0.116"
@@ -29,6 +28,7 @@ derive_more = "0.99.10"
 jsonwebtoken = "7.2.0"
 bcrypt = "0.10.0"
 actix-tls = "3.0.0"
+bollard = "0.11.1"
 awc = { version = "2.0.0", default-features = false }
 open-ssl = { package = "openssl", version = "0.10", optional = true }
 rust-tls = { package = "rustls", version = "0.18.0", optional = true }

ROADMAP.md

@@ -1,21 +1,21 @@
 # Roadmap
 
-## 03-2021
+## 03-2022
 
- * [ ] Implement tests 
+ * [ ] Implement tests
  * [ ] Implement base components
  * [ ] Implement plugin/extension subsystem
  * [ ] Implement Web UI
- 
-## 04-2021
+
+## 04-2022
  * [ ] Implement RESTful API (read-only)
  * [ ] Security testing
  * [ ] Beta release
 
-## 05-2021
+## 05-2022
 * [ ] Release v1.0
 
-## 08-2021
+## 08-2022
 * [ ] Release v1.1
 
 
@@ -37,17 +37,17 @@
   - * [ ] View container logs
   - * [ ] Container command
  * [ ] Task Manager
-  - * [ ] Scheduler 
- 
+  - * [ ] Scheduler
+
 ## Plugin/Extension subsystem:
  * [ ] IPtables firewall manager
  * [ ] Crontab Manager
- 
+
 ## RESTful API:
   - * [ ] Display status
 
 
 ## Web UI:
   * [ ] Docker manager
   * [ ] DNS indicator
-  
+

docker-compose.yml

@@ -9,7 +9,8 @@ services:
     build:
       context: .
       dockerfile: docker/local/Dockerfile
-#    entrypoint: [ 'bash', '-c', 'sleep infinity' ]
+    #entrypoint: [ 'bash', '-c', 'sleep infinity' ]
+    entrypoint: ['/app/stackdog']
 #    restart: always
     ports:
     - "5003:5000"

docker/prod/Dockerfile

@@ -13,7 +13,6 @@ RUN apt-get update; \
 # copy binary and configuration files
 COPY ./stackdog .
 COPY ./.env .
-COPY ./migrations .
 # expose port
 EXPOSE 5000
 

src/api/docker_controller.rs

@@ -10,3 +10,50 @@ pub async fn find_all() -> Result<HttpResponse> {
         Err(err) => Ok(err.response()),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::{App, config};
+    use actix_cors::Cors;
+    use actix_service::Service;
+    use actix_web::{test, http, http::StatusCode};
+    use futures::FutureExt;
+    use http::header;
+
+
+    #[actix_rt::test]
+    async fn test_list_ok() {
+        let mut app = test::init_service(
+            App::new()
+                .wrap(Cors::new()
+                    .send_wildcard()
+                    .allowed_methods(vec!["GET", "POST", "PUT", "DELETE"])
+                    .allowed_header(http::header::CONTENT_TYPE)
+                    .max_age(3600)
+                    .finish())
+                .data(config::db::migrate_and_config_db(":memory:"))
+                .wrap(actix_web::middleware::Logger::default())
+                .wrap(crate::middleware::authen_middleware::Authentication)
+                .wrap_fn(|req, srv| {
+                    srv.call(req).map(|res| res)
+                })
+                .configure(crate::config::app::config_services)
+        ).await;
+
+        let resp = test::TestRequest::post()
+            .uri("/api/auth/login")
+            .set(header::ContentType::json())
+            .set_payload(r#"{"username_or_email":"admin","password":"password"}"#.as_bytes())
+            .send_request(&mut app)
+            .await;
+
+        assert_eq!(resp.status(), StatusCode::OK);
+
+        let resp = test::TestRequest::post()
+            .uri("/api/services")
+            .set(header::ContentType::json())
+            // .set(header::ContentType::json()) // here we need to set bearer token
+            .send_request(&mut app)
+            .await;
+    }
+}

src/config/app.rs

@@ -20,7 +20,7 @@ pub fn config_services(cfg: &mut web::ServiceConfig) {
             .service(
                 web::scope("/services")
                     .service(
-                        web::resource("")
+                        web::resource("/")
                             .route(web::get().to(docker_controller::find_all))
                     )
                     // .service(

src/config/db.rs

@@ -5,8 +5,8 @@ use diesel::{
     r2d2::{self, ConnectionManager},
     dsl
 };
-use crate::schema::users::columns::updated_at;
-use chrono::Utc;
+
+
 
 embed_migrations!();
 

src/main.rs

@@ -52,6 +52,7 @@ async fn main() -> io::Result<()> {
     let app_url = format!("{}:{}", &app_host, &app_port);
     let db_url = env::var("DATABASE_URL").expect("DATABASE_URL not found.");
 
+    println!("Starting server..");
     HttpServer::new(move || {
         App::new()
             .wrap(Cors::new() // allowed_origin return access-control-allow-origin: * by default

src/services/account_service.rs

@@ -13,7 +13,7 @@ use actix_web::{
     },
     web,
 };
-use crate::models::user::UserDTO;
+
 
 #[derive(Serialize, Deserialize)]
 pub struct TokenBodyResponse {

src/services/docker_service.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 use bollard::container::ListContainersOptions;
 use bollard::Docker;
+// use bollard::models::ContainerSummaryInner;
 use serde_json;
 
 use crate::{