Merge pull request #96 from anta5010/can-do-crypto

Merge origin/main into can-do-crypto

Author: anta5010

.cargo/audit.toml

@@ -1,6 +1,5 @@
 [advisories]
-ignore = ["RUSTSEC-2021-0073", # We do not use `prost_types::Timestamp` anywhere in our code.
-          "RUSTSEC-2020-0036"] # We don't have control over the exact dependencies of `protoc-grpcio`; See https://github.com/mtp401/protoc-grpcio/issues/36
+ignore = []
 informational_warnings = ["unmaintained"] # warn for categories of informational advisories
 severity_threshold = "low" # CVSS severity ("none", "low", "medium", "high", "critical")
 
@@ -28,4 +27,4 @@ source = "all" # "all", "public" or "local"
 
 [yanked]
 enabled = true # Warn for yanked crates in Cargo.lock
-update_index = true # Auto-update the crates.io index
+update_index = true # Auto-update the crates.io index

.github/workflows/ci.yml

@@ -7,6 +7,16 @@ jobs:
     name: Build and check formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Execute all tests
-        run: ./tests/ci.sh
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+      - name: Download Parsec Mock, install dependencies and execute all tests
+        run: |
+          curl -s -N -L https://github.com/parallaxsecond/parsec-mock/archive/refs/tags/0.1.1.tar.gz | tar xz
+          cd parsec-mock-0.1.1/
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+          cd ..
+          ./tests/ci.sh

Cargo.toml

@@ -19,7 +19,7 @@ derivative = "2.1.1"
 zeroize = "1.1.0"
 users = "0.10.0"
 url = "2.2.0"
-spiffe = { version = "0.1.1", optional = true }
+spiffe = { version = "0.2.0", optional = true }
 
 [dev-dependencies]
 mockstream = "0.0.3"

src/core/basic_client.rs

@@ -117,16 +117,16 @@ impl BasicClient {
     ///#
     ///# fn main() -> Result<(), Box<dyn Error>> {
     ///use parsec_client::BasicClient;
-    ///let client = BasicClient::new_naked();
+    ///let client = BasicClient::new_naked()?;
     ///let (major, minor) = client.ping()?;
     ///# Ok(())}
     /// ```
-    pub fn new_naked() -> Self {
-        BasicClient {
-            op_client: Default::default(),
+    pub fn new_naked() -> Result<Self> {
+        Ok(BasicClient {
+            op_client: OperationClient::new()?,
             auth_data: Authentication::None,
             implicit_provider: ProviderId::Core,
-        }
+        })
     }
 
     /// Query the service for the list of authenticators provided and use the first one as default
@@ -151,7 +151,7 @@ impl BasicClient {
     ///# fn main() -> Result<(), Box<dyn Error>> {
     ///use parsec_client::BasicClient;
     ///use parsec_client::core::interface::requests::ProviderId;
-    ///let mut client = BasicClient::new_naked();
+    ///let mut client = BasicClient::new_naked()?;
     ///// Set the default authenticator but choose a specific provider.
     ///client.set_implicit_provider(ProviderId::Pkcs11);
     ///client.set_default_auth(Some("main_client".to_string()))?;
@@ -210,7 +210,7 @@ impl BasicClient {
     ///# fn main() -> Result<(), Box<dyn Error>> {
     ///use parsec_client::BasicClient;
     ///use parsec_client::auth::Authentication;
-    ///let mut client = BasicClient::new_naked();
+    ///let mut client = BasicClient::new_naked()?;
     ///client.set_auth_data(Authentication::UnixPeerCredentials);
     ///assert_eq!(Authentication::UnixPeerCredentials, client.auth_data());
     ///# Ok(())}
@@ -234,7 +234,7 @@ impl BasicClient {
     ///# fn main() -> Result<(), Box<dyn Error>> {
     ///use parsec_client::BasicClient;
     ///use parsec_client::auth::Authentication;
-    ///let mut client = BasicClient::new_naked();
+    ///let mut client = BasicClient::new_naked()?;
     ///// Use the default provider but use a specific authentication.
     ///client.set_default_provider()?;
     ///client.set_auth_data(Authentication::UnixPeerCredentials);
@@ -269,7 +269,7 @@ impl BasicClient {
     ///# fn main() -> Result<(), Box<dyn Error>> {
     ///use parsec_client::BasicClient;
     ///use parsec_client::core::interface::requests::ProviderId;
-    ///let mut client = BasicClient::new_naked();
+    ///let mut client = BasicClient::new_naked()?;
     ///client.set_implicit_provider(ProviderId::Pkcs11);
     ///assert_eq!(ProviderId::Pkcs11, client.implicit_provider());
     ///# Ok(())}
@@ -328,7 +328,7 @@ impl BasicClient {
     ///# fn main() -> Result<(), Box<dyn Error>> {
     ///use parsec_client::BasicClient;
     ///
-    ///let mut client: BasicClient = BasicClient::new_naked();
+    ///let mut client: BasicClient = BasicClient::new_naked()?;
     ///let providers = client.list_providers()?;
     ///// Set the second most prioritary provider
     ///client.set_implicit_provider(providers[1].id);
@@ -1316,3 +1316,13 @@ impl BasicClient {
         }
     }
 }
+
+impl Default for BasicClient {
+    fn default() -> Self {
+        BasicClient {
+            op_client: Default::default(),
+            auth_data: Authentication::None,
+            implicit_provider: ProviderId::Core,
+        }
+    }
+}

src/core/testing/core_tests.rs

@@ -56,22 +56,6 @@ fn get_operation_from_req_bytes(bytes: Vec<u8>) -> NativeOperation {
         .unwrap()
 }
 
-#[test]
-fn ping_test() {
-    let mut client: TestBasicClient = Default::default();
-    client.set_mock_read(&get_response_bytes_from_result(NativeResult::Ping(
-        operations::ping::Result {
-            wire_protocol_version_maj: 1,
-            wire_protocol_version_min: 0,
-        },
-    )));
-    // Check request:
-    // Ping request is empty so no checking to be done
-
-    // Check response:
-    assert_eq!(client.ping().expect("Ping failed"), (1, 0));
-}
-
 #[test]
 fn list_provider_test() {
     let mut client: TestBasicClient = Default::default();

tests/ci.sh

@@ -27,6 +27,18 @@ if cargo clippy -h; then
 	cargo clippy --all-targets -- -D clippy::all -D clippy::cargo
 fi
 
+######################
+# Start Mock Service #
+######################
+CURRENT_PATH=$(pwd)
+cd parsec-mock-0.1.1
+python parsec_mock/parsec_mock.py --parsec-socket $CURRENT_PATH/parsec_mock.sock &
+while [[ ! -S $CURRENT_PATH/parsec_mock.sock ]]; do
+	sleep 5
+done
+cd ..
+export PARSEC_SERVICE_ENDPOINT="unix://$CURRENT_PATH/parsec_mock.sock"
+
 #############
 # Run tests #
 #############

tests/mock_service.rs

@@ -0,0 +1,11 @@
+// Copyright 2021 Contributors to the Parsec project.
+// SPDX-License-Identifier: Apache-2.0
+use parsec_client::BasicClient;
+
+#[test]
+fn ping_noauth() {
+    let client = BasicClient::new_naked().unwrap();
+
+    // ping_noauth request
+    assert_eq!(client.ping().expect("Ping failed"), (1, 0));
+}