Fix: remove certs folder & refactor startup.rs

ALU-Schumacher · Jan 20, 2025 · 447a888 · 447a888
1 parent 5044142
commit 447a888
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 114 deletions.
diff --git a/auditor/certs/certs/cert.pem b/auditor/certs/certs/cert.pem
diff --git a/auditor/certs/certs/key.pem b/auditor/certs/certs/key.pem
diff --git a/auditor/src/startup.rs b/auditor/src/startup.rs
@@ -30,72 +30,46 @@ pub fn run(
 
     let db_pool = web::Data::new(db_pool);
 
-    let server = match tls_params {
+    let app_config = move || {
+        App::new()
+            // Logging middleware
+            .wrap(TracingLogger::default())
+            .wrap(RequestMetrics::default())
+            .route(
+                "/metrics",
+                web::get().to(PrometheusMetricsHandler::new(
+                    request_metrics.prom_registry.clone(),
+                )),
+            )
+            // Routes
+            .route("/health_check", web::get().to(health_check))
+            .service(
+                web::resource("/record")
+                    .route(web::post().to(add))
+                    .route(web::put().to(update)),
+            )
+            .route("/record/{record_id}", web::get().to(query_one_record))
+            // DB connection pool
+            .service(
+                web::resource("/records")
+                    .route(web::post().to(bulk_add))
+                    .route(web::get().to(query_records)),
+            )
+            .app_data(db_pool.clone())
+    };
+
+    let server = HttpServer::new(app_config).listen(listener)?;
+
+    match tls_params {
         Some(params) if params.use_tls => {
             println!("********* AUDITOR running in TLS mode *********");
-            HttpServer::new(move || {
-                App::new()
-                    // Logging middleware
-                    .wrap(TracingLogger::default())
-                    .wrap(RequestMetrics::default())
-                    .route(
-                        "/metrics",
-                        web::get().to(PrometheusMetricsHandler::new(
-                            request_metrics.prom_registry.clone(),
-                        )),
-                    )
-                    // Routes
-                    .route("/health_check", web::get().to(health_check))
-                    .service(
-                        web::resource("/record")
-                            .route(web::post().to(add))
-                            .route(web::put().to(update)),
-                    )
-                    .route("/record/{record_id}", web::get().to(query_one_record))
-                    // DB connection pool
-                    .service(
-                        web::resource("/records")
-                            .route(web::post().to(bulk_add))
-                            .route(web::get().to(query_records)),
-                    )
-                    .app_data(db_pool.clone())
-            })
-            .listen(listener)?
-            .bind_rustls_0_23((params.https_addr, params.https_port), params.config)?
-            .run()
+            Ok(server
+                .bind_rustls_0_23((params.https_addr, params.https_port), params.config)?
+                .run())
         }
         _ => {
             println!("********* AUDITOR running without TLS *********");
-            HttpServer::new(move || {
-                App::new()
-                    // Logging middleware
-                    .wrap(TracingLogger::default())
-                    .wrap(RequestMetrics::default())
-                    .route(
-                        "/metrics",
-                        web::get().to(PrometheusMetricsHandler::new(
-                            request_metrics.prom_registry.clone(),
-                        )),
-                    )
-                    // Routes
-                    .route("/health_check", web::get().to(health_check))
-                    .service(
-                        web::resource("/record")
-                            .route(web::post().to(add))
-                            .route(web::put().to(update)),
-                    )
-                    .route("/record/{record_id}", web::get().to(query_one_record))
-                    // DB connection pool
-                    .service(
-                        web::resource("/records")
-                            .route(web::post().to(bulk_add))
-                            .route(web::get().to(query_records)),
-                    )
-                    .app_data(db_pool.clone())
-            })
-            .listen(listener)?
-            .run()
+            Ok(server.run())
         }
-    };
-    Ok(server)
+    }
 }
diff --git a/media/website/content/migration.md b/media/website/content/migration.md
@@ -8,7 +8,7 @@ weight = 3
 
 ### New feature - TLS
 
-TLS is added to AUDITOR, all collectors and plugins. A new config section called tls_config is required by all config files. `use-tls` is a compulsory field of type bool that defines whether to use the TLS or not.
+TLS is added to AUDITOR, all collectors and plugins. A new config section called tls_config is required by all config files. `use_tls` is a compulsory field of type bool that defines whether to use the TLS or not.
 
 ## TLS Configuration Table for AUDITOR (AUDITOR is referred to as the server)
 

diff --git a/pyauditor/pyproject.toml b/pyauditor/pyproject.toml
@@ -19,4 +19,4 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "License :: OSI Approved :: Apache Software License",
 ]
-
+version = "0.1.0"
diff --git a/scripts/test_mtls.sh b/scripts/test_mtls.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#!/usr/bin/env bash
+
 set -x
 set -eo pipefail