Support X.509 authentication type in external provisioning. (#1662)

* Support X.509 authentication type in external provisioning. * Add tests * Incorporating review comments. * Test fix * Fix tests #2 * Fix mut reference * Fix error reasons * Put enum variants in alphabetical order.
Azure · Sep 7, 2019 · 0a43fdb · 0a43fdb
1 parent 2b47aec
commit 0a43fdb
Show file tree

Hide file tree

Showing 6 changed files with 764 additions and 153 deletions.
diff --git a/edgelet/edgelet-core/src/lib.rs b/edgelet/edgelet-core/src/lib.rs
@@ -41,7 +41,7 @@ pub use module::{
 };
 pub use network::{Ipam, IpamConfig, MobyNetwork, Network};
 pub use settings::{
-    AttestationMethod, Certificates, Connect, Dps, Listen, Manual, ManualAuthMethod,
+    AttestationMethod, Certificates, Connect, Dps, External, Listen, Manual, ManualAuthMethod,
     ManualDeviceConnectionString, ManualX509Auth, Provisioning, RetryLimit, RuntimeSettings,
     Settings, SymmetricKeyAttestationInfo, TpmAttestationInfo, WatchdogSettings,
     X509AttestationInfo,

diff --git a/edgelet/iotedged/src/error.rs b/edgelet/iotedged/src/error.rs
@@ -197,8 +197,12 @@ pub enum InitializeErrorReason {
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum ExternalProvisioningErrorReason {
     ClientInitialization,
+    DownloadIdentityCertificate,
+    DownloadIdentityPrivateKey,
+    ExternalProvisioningDirCreate,
     HsmInitialization,
     HsmKeyRetrieval,
+    HybridKeyPreparation,
     InvalidAuthenticationType,
     InvalidCredentials,
     Provisioning,
@@ -364,6 +368,20 @@ impl fmt::Display for ExternalProvisioningErrorReason {
                 write!(f, "Could not create the external provisioning client.")
             }
 
+            ExternalProvisioningErrorReason::DownloadIdentityCertificate => write!(
+                f,
+                "The download of the identity certificate from the external environment failed."
+            ),
+
+            ExternalProvisioningErrorReason::DownloadIdentityPrivateKey => write!(
+                f,
+                "The download of the identity private key from the external environment failed."
+            ),
+
+            ExternalProvisioningErrorReason::ExternalProvisioningDirCreate => {
+                write!(f, "Could not create the external provisioning directory.")
+            }
+
             ExternalProvisioningErrorReason::HsmInitialization => {
                 write!(f, "Could not initialize the HSM interface.")
             }
@@ -372,6 +390,10 @@ impl fmt::Display for ExternalProvisioningErrorReason {
                 write!(f, "Could not retrieve the device's key from the HSM.")
             }
 
+            ExternalProvisioningErrorReason::HybridKeyPreparation => {
+                write!(f, "Could not prepare the hybrid key.")
+            }
+
             ExternalProvisioningErrorReason::InvalidAuthenticationType => {
                 write!(f, "Invalid authentication type specified.")
             }