Move test client back in the Parsec repo

This commit moves the test client back in the main Parsec repo and moves
it on top of the `BasicClient` - the main core client, thus making the
most out of functionality re-use.

Signed-off-by: Ionut Mihalcea <[email protected]>

Author: ionut-arm

Cargo.lock

@@ -18,7 +18,7 @@ name = "parsec"
 path = "src/bin/main.rs"
 
 [dependencies]
-parsec-interface = "0.12.0"
+parsec-interface = "0.13.0"
 rand = "0.7.2"
 base64 = "0.10.1"
 uuid = "0.7.4"
@@ -40,12 +40,13 @@ derivative = "1.0.3"
 version = "3.0.0"
 
 [dev-dependencies]
-parsec-client-test = { git = "https://github.com/parallaxsecond/parsec-client-test", tag = "0.3.0" }
 num_cpus = "1.10.1"
 picky-asn1-der = "0.2.2"
 picky-asn1 = "0.2.1"
 serde = { version = "1.0", features = ["derive"] }
 sha2 = "0.8.1"
+parsec-client = { git = "https://github.com/parallaxsecond/parsec-client-rust" }
+parsec-interface = { version = "0.13.0", features = ["testing"] }
 
 [build-dependencies]
 bindgen = "0.50.0"

Cargo.toml

@@ -12,8 +12,8 @@
 // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-use parsec_client_test::TestClient;
-use parsec_interface::requests::Result;
+use crate::test_client::TestClient;
+use parsec_client::error::Result;
 use parsec_interface::requests::{Opcode, ProviderID};
 use std::collections::HashSet;
 use uuid::Uuid;

tests/all_providers/mod.rs

@@ -44,3 +44,4 @@
 
 mod all_providers;
 mod per_provider;
+mod test_client;

tests/mod.rs

@@ -12,10 +12,11 @@
 // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-use parsec_client_test::TestClient;
+use crate::test_client::error::{Error, Result};
+use crate::test_client::TestClient;
 use parsec_interface::operations::psa_algorithm::*;
 use parsec_interface::operations::psa_key_attributes::*;
-use parsec_interface::requests::{ResponseStatus, Result};
+use parsec_interface::requests::ResponseStatus;
 use sha2::{Digest, Sha256};
 
 const HASH: [u8; 32] = [
@@ -30,7 +31,7 @@ fn asym_sign_no_key() {
     let status = client
         .sign_with_rsa_sha256(key_name, HASH.to_vec())
         .expect_err("Key should not exist.");
-    assert_eq!(status, ResponseStatus::PsaErrorDoesNotExist);
+    assert_eq!(status, Error::Service(ResponseStatus::PsaErrorDoesNotExist));
 }
 
 #[test]
@@ -41,7 +42,7 @@ fn asym_verify_no_key() {
     let status = client
         .verify_with_rsa_sha256(key_name, HASH.to_vec(), signature)
         .expect_err("Verification should have failed");
-    assert_eq!(status, ResponseStatus::PsaErrorDoesNotExist);
+    assert_eq!(status, Error::Service(ResponseStatus::PsaErrorDoesNotExist));
 }
 
 #[test]
@@ -67,8 +68,8 @@ fn asym_verify_fail() -> Result<()> {
     let status = client
         .verify_with_rsa_sha256(key_name, HASH.to_vec(), signature)
         .expect_err("Verification should fail.");
-    if !(status == ResponseStatus::PsaErrorInvalidSignature
-        || status == ResponseStatus::PsaErrorCorruptionDetected)
+    if !(status == Error::Service(ResponseStatus::PsaErrorInvalidSignature)
+        || status == Error::Service(ResponseStatus::PsaErrorCorruptionDetected))
     {
         panic!("An invalid signature or a tampering detection should be the only reasons of the verification failing.");
     } else {
@@ -171,7 +172,7 @@ fn sign_hash_not_permitted() -> Result<()> {
 
     let status = client.sign_with_rsa_sha256(key_name, hash).unwrap_err();
 
-    assert_eq!(status, ResponseStatus::PsaErrorNotPermitted);
+    assert_eq!(status, Error::Service(ResponseStatus::PsaErrorNotPermitted));
 
     Ok(())
 }
@@ -190,8 +191,14 @@ fn sign_hash_bad_format() -> Result<()> {
         .unwrap_err();
     let status2 = client.sign_with_rsa_sha256(key_name, hash2).unwrap_err();
 
-    assert_eq!(status1, ResponseStatus::PsaErrorInvalidArgument);
-    assert_eq!(status2, ResponseStatus::PsaErrorInvalidArgument);
+    assert_eq!(
+        status1,
+        Error::Service(ResponseStatus::PsaErrorInvalidArgument)
+    );
+    assert_eq!(
+        status2,
+        Error::Service(ResponseStatus::PsaErrorInvalidArgument)
+    );
     Ok(())
 }
 
@@ -247,7 +254,7 @@ fn verify_hash_not_permitted() -> Result<()> {
         .verify_with_rsa_sha256(key_name, hash, signature)
         .unwrap_err();
 
-    assert_eq!(status, ResponseStatus::PsaErrorNotPermitted);
+    assert_eq!(status, Error::Service(ResponseStatus::PsaErrorNotPermitted));
     Ok(())
 }
 
@@ -271,8 +278,14 @@ fn verify_hash_bad_format() -> Result<()> {
         .verify_with_rsa_sha256(key_name, hash2, signature)
         .unwrap_err();
 
-    assert_eq!(status1, ResponseStatus::PsaErrorInvalidArgument);
-    assert_eq!(status2, ResponseStatus::PsaErrorInvalidArgument);
+    assert_eq!(
+        status1,
+        Error::Service(ResponseStatus::PsaErrorInvalidArgument)
+    );
+    assert_eq!(
+        status2,
+        Error::Service(ResponseStatus::PsaErrorInvalidArgument)
+    );
     Ok(())
 }
 
@@ -293,7 +306,10 @@ fn fail_verify_hash() -> Result<()> {
     let status = client
         .verify_with_rsa_sha256(key_name, hash, signature)
         .unwrap_err();
-    assert_eq!(status, ResponseStatus::PsaErrorInvalidSignature);
+    assert_eq!(
+        status,
+        Error::Service(ResponseStatus::PsaErrorInvalidSignature)
+    );
     Ok(())
 }
 
@@ -314,6 +330,9 @@ fn fail_verify_hash2() -> Result<()> {
     let status = client
         .verify_with_rsa_sha256(key_name, hash, signature)
         .unwrap_err();
-    assert_eq!(status, ResponseStatus::PsaErrorInvalidSignature);
+    assert_eq!(
+        status,
+        Error::Service(ResponseStatus::PsaErrorInvalidSignature)
+    );
     Ok(())
 }

tests/per_provider/normal_tests/asym_sign_verify.rs

@@ -12,15 +12,16 @@
 // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-use parsec_client_test::TestClient;
-use parsec_interface::requests::{ResponseStatus, Result};
+use crate::test_client::TestClient;
+use parsec_client::error::{Error, Result};
+use parsec_interface::requests::ResponseStatus;
 
 #[test]
 fn two_auths_same_key_name() -> Result<()> {
     let key_name = String::from("two_auths_same_key_name");
     let mut client = TestClient::new();
-    let auth1 = String::from("first_client").into_bytes();
-    let auth2 = String::from("second_client").into_bytes();
+    let auth1 = String::from("first_client");
+    let auth2 = String::from("second_client");
 
     client.set_auth(auth1);
     client.generate_rsa_sign_key(key_name.clone())?;
@@ -33,8 +34,8 @@ fn two_auths_same_key_name() -> Result<()> {
 fn delete_wrong_key() -> Result<()> {
     let key_name = String::from("delete_wrong_key");
     let mut client = TestClient::new();
-    let auth1 = String::from("first_client").into_bytes();
-    let auth2 = String::from("second_client").into_bytes();
+    let auth1 = String::from("first_client");
+    let auth2 = String::from("second_client");
 
     client.set_auth(auth1);
     client.generate_rsa_sign_key(key_name.clone())?;
@@ -43,7 +44,7 @@ fn delete_wrong_key() -> Result<()> {
     let status = client
         .destroy_key(key_name)
         .expect_err("Destroying key should have failed");
-    assert_eq!(status, ResponseStatus::PsaErrorDoesNotExist);
+    assert_eq!(status, Error::Service(ResponseStatus::PsaErrorDoesNotExist));
 
     Ok(())
 }

tests/per_provider/normal_tests/auth.rs

@@ -12,19 +12,19 @@
 // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-use parsec_client_test::RequestTestClient;
-use parsec_client_test::TestClient;
+use crate::test_client::error::Error;
+use crate::test_client::RawRequestClient;
+use crate::test_client::TestClient;
 use parsec_interface::requests::request::RawHeader;
 use parsec_interface::requests::{Opcode, ProviderID, ResponseStatus};
 
 #[test]
 fn invalid_version() {
-    let mut client = RequestTestClient::new();
+    let mut client = RawRequestClient {};
     let mut req_hdr = RawHeader::new();
 
     req_hdr.provider = ProviderID::Core as u8;
     req_hdr.opcode = Opcode::Ping as u16;
-    req_hdr.version_maj = 0xff;
 
     let resp = client
         .send_raw_request(req_hdr, Vec::new())
@@ -38,12 +38,11 @@ fn invalid_version() {
 
 #[test]
 fn invalid_provider() {
-    let mut client = RequestTestClient::new();
+    let mut client = RawRequestClient {};
     let mut req_hdr = RawHeader::new();
 
     req_hdr.provider = 0xff;
     req_hdr.opcode = Opcode::Ping as u16;
-    req_hdr.version_maj = 0x01;
 
     let resp = client
         .send_raw_request(req_hdr, Vec::new())
@@ -54,12 +53,11 @@ fn invalid_provider() {
 
 #[test]
 fn invalid_content_type() {
-    let mut client = RequestTestClient::new();
+    let mut client = RawRequestClient {};
     let mut req_hdr = RawHeader::new();
 
     req_hdr.provider = ProviderID::Core as u8;
     req_hdr.opcode = Opcode::Ping as u16;
-    req_hdr.version_maj = 1;
     req_hdr.content_type = 0xff;
 
     let resp = client
@@ -71,12 +69,11 @@ fn invalid_content_type() {
 
 #[test]
 fn invalid_accept_type() {
-    let mut client = RequestTestClient::new();
+    let mut client = RawRequestClient {};
     let mut req_hdr = RawHeader::new();
 
     req_hdr.provider = ProviderID::Core as u8;
     req_hdr.opcode = Opcode::Ping as u16;
-    req_hdr.version_maj = 1;
 
     req_hdr.accept_type = 0xff;
 
@@ -89,12 +86,11 @@ fn invalid_accept_type() {
 
 #[test]
 fn invalid_body_len() {
-    let mut client = RequestTestClient::new();
+    let mut client = RawRequestClient {};
     let mut req_hdr = RawHeader::new();
 
     req_hdr.provider = ProviderID::Core as u8;
     req_hdr.opcode = Opcode::Ping as u16;
-    req_hdr.version_maj = 1;
 
     req_hdr.body_len = 0xff_ff;
 
@@ -106,12 +102,11 @@ fn invalid_body_len() {
 
 #[test]
 fn invalid_auth_len() {
-    let mut client = RequestTestClient::new();
+    let mut client = RawRequestClient {};
     let mut req_hdr = RawHeader::new();
 
     req_hdr.provider = ProviderID::Core as u8;
     req_hdr.opcode = Opcode::Ping as u16;
-    req_hdr.version_maj = 1;
 
     req_hdr.auth_len = 0xff_ff;
 
@@ -123,12 +118,11 @@ fn invalid_auth_len() {
 
 #[test]
 fn invalid_opcode() {
-    let mut client = RequestTestClient::new();
+    let mut client = RawRequestClient {};
     let mut req_hdr = RawHeader::new();
 
     req_hdr.provider = ProviderID::Core as u8;
     req_hdr.opcode = 0xff_ff;
-    req_hdr.version_maj = 1;
 
     let resp = client
         .send_raw_request(req_hdr, Vec::new())
@@ -144,5 +138,8 @@ fn wrong_provider_core() {
     let response_status = client
         .destroy_key(String::new())
         .expect_err("Core Provider should not support DestroyKey operation!");
-    assert_eq!(response_status, ResponseStatus::PsaErrorNotSupported);
+    assert_eq!(
+        response_status,
+        Error::Service(ResponseStatus::PsaErrorNotSupported)
+    );
 }