Merge pull request #525 from 7flying/dev-dependencies

Dev dependencies

Author: mergify[bot]

.github/workflows/ci.yml

@@ -107,12 +107,12 @@ jobs:
         with:
           toolchain: stable
       - name: Build
-        run: cargo build
+        run: cargo build --workspace
       - name: Run tests
         env:
           FDO_PRIVILEGED: true
           PER_DEVICE_SERVICEINFO: false
-        run: cargo test
+        run: cargo test --workspace
       - name: Check aio
         run: |
           mkdir aio-dir/
@@ -167,4 +167,4 @@ jobs:
       - name: Build devcontainer
         run: devcontainer build --image-name devcontainer-fdo-rs .
       - name: Test building in devcontainer
-        run: docker run --rm -v `pwd`:/code:z --workdir /code --user root devcontainer-fdo-rs cargo build --verbose
+        run: docker run --rm -v `pwd`:/code:z --workdir /code --user root devcontainer-fdo-rs cargo build --workspace --verbose

Cargo.lock

@@ -17,3 +17,20 @@ members = [
 
     "integration-tests",
 ]
+
+default-members = [
+    "libfdo-data",
+    "data-formats",
+    "http-wrapper",
+    "store",
+    "util",
+
+    "client-linuxapp",
+    "owner-onboarding-server",
+    "owner-tool",
+    "rendezvous-server",
+    "manufacturing-server",
+    "manufacturing-client",
+    "serviceinfo-api-server",
+    "admin-tool",
+]

Cargo.toml

@@ -15,7 +15,6 @@ time = "0.3"
 clap = { version = "4.2", features = ["derive"] }
 futures = "0.3"
 reqwest = "0.11"
-tera = "1"
 serde = "1"
 serde_yaml = "0.9"
 pretty_env_logger = "0.4"

admin-tool/Cargo.toml

@@ -21,8 +21,6 @@ libcryptsetup-rs = { version = "0.8.0", features = ["mutex"] }
 secrecy = "0.8"
 devicemapper = "0.33"
 openssl = "0.10.55"
-sha-crypt = "0.5.0"
-logtest = "2.0.0"
 
 fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
 fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.11", features = ["client"] }

client-linuxapp/Cargo.toml

@@ -1,4 +1,4 @@
-use std::process::Command;
+use std::process::{Command, Stdio};
 use std::{
     collections::HashSet,
     fs::{File, Permissions},
@@ -21,8 +21,6 @@ use fdo_data_formats::{
 };
 use fdo_http_wrapper::client::{RequestResult, ServiceClient};
 
-use sha_crypt::{sha256_check, sha256_simple, Sha256Params};
-
 const MAX_SERVICE_INFO_LOOPS: u32 = 1000;
 
 fn find_available_modules() -> Result<Vec<ServiceInfoModule>> {
@@ -111,9 +109,24 @@ fn create_user_with_password(user: &str, password: &str) -> Result<()> {
     log::info!("Checking for password encryption");
     if !is_password_encrypted(password) {
         log::info!("Encrypting password");
-        let default_params: Sha256Params = Default::default();
-        str_encrypted_pw = sha256_simple(password, &default_params).expect("Hashing failed");
-        assert!(sha256_check(password, &str_encrypted_pw).is_ok());
+        let echo = Command::new("echo")
+            .arg(password)
+            .stdout(Stdio::piped())
+            .spawn()
+            .expect("Error spawning echo");
+        let hasher = Command::new("openssl")
+            .arg("passwd")
+            .arg("-6")
+            .arg("-stdin")
+            .stdin(Stdio::from(
+                echo.stdout.expect("Error getting stdout from echo"),
+            ))
+            .output()
+            .expect("Error getting output of openssl");
+        str_encrypted_pw = str::from_utf8(&hasher.stdout)
+            .expect("Error converting [u8] to string")
+            .trim_end()
+            .to_string();
     }
     // Creates new user if user not present
     log::info!("Creating user {user} with password");

client-linuxapp/src/serviceinfo.rs

@@ -27,7 +27,6 @@ tss-esapi = { version = "7.2", features = ["generate-bindings"] }
 byteorder = "1"
 
 http = "0.2"
-hyper = "0.14"
 
 openssl-kdf = { version = "0.4.1", features = ["allow_custom"] }
 

data-formats/Cargo.toml

@@ -16,7 +16,7 @@ path = "tests/di_diun.rs"
 name = "to-tests"
 path = "tests/to.rs"
 
-[dependencies]
+[dev-dependencies]
 anyhow = "1"
 hex = "0.4"
 tempfile = "3"

integration-tests/Cargo.toml

@@ -1,6 +1,5 @@
 mod common;
 use std::env;
-#[allow(unused_imports)]
 use std::{fs, io::Write, process::Command, time::Duration};
 
 use common::{Binary, LogSide, TestContext};
@@ -412,7 +411,6 @@ ssh-ed25519 sshkey_default user@example.com
                 false,
                 "Password not created during onboarding"
             );
-            assert!(sha256_check("testpassword", &test_user.password).is_ok());
         }
     } else {
         L.l("Skipped create initial user validation

integration-tests/tests/e2e.rs

@@ -289,7 +289,6 @@ ssh-ed25519 sshkey_default user@example.com
                 false,
                 "Password not created during onboarding"
             );
-            assert!(sha256_check("testpassword", &test_user.password).is_ok());
         }
     } else {
         L.l("Skipped create initial user validation