Upgrade to serde-indexed v0.2.0

Author: AlfioEmanueleFresta

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "solo/src/ext"]
 	path = solo/src/ext
 	url = https://github.com/AlfioEmanueleFresta/solo.git
-[submodule "serde-indexed"]
-	path = serde-indexed
-	url = git@github.com:AlfioEmanueleFresta/serde-indexed.git

Cargo.lock

@@ -30,7 +30,7 @@ futures = "0.3.5"
 tokio = { version = "1.1.1", features = ["full"] }
 serde = "1.0.110"
 serde_cbor = "0.11.1"
-serde-indexed = { path = "../serde-indexed" }
+serde-indexed = "0.2.0"
 serde_derive = "1.0.123"
 serde_repr = "0.1.6"
 serde_bytes = "0.11.5"

libwebauthn/Cargo.toml

@@ -53,9 +53,10 @@ mod tests {
     use serde_indexed::{DeserializeIndexed, SerializeIndexed};
 
     #[derive(Debug, PartialEq, SerializeIndexed, DeserializeIndexed)]
-    #[serde_indexed(offset = 1)]
     struct TestStruct {
+        #[serde(index = 0x01)]
         pub a: u8,
+        #[serde(index = 0x02)]
         pub b: u8,
     }
 

libwebauthn/src/proto/ctap2/cbor/serde.rs

@@ -6,21 +6,24 @@ use serde_repr::{Deserialize_repr, Serialize_repr};
 use super::Ctap2PinUvAuthProtocol;
 
 #[derive(Debug, Clone, SerializeIndexed)]
-#[serde_indexed(offset = 1)]
 pub struct Ctap2AuthenticatorConfigRequest {
     // subCommand (0x01)
+    #[serde(index = 0x01)]
     pub subcommand: Ctap2AuthenticatorConfigCommand,
 
     // subCommandParams (0x02)
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x02)]
     pub subcommand_params: Option<Ctap2AuthenticatorConfigParams>,
 
     ///pinUvAuthProtocol (0x03)
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x03)]
     pub protocol: Option<Ctap2PinUvAuthProtocol>,
 
     /// pinUvAuthParam (0x04):
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x04)]
     pub uv_auth_param: Option<ByteBuf>,
 }
 
@@ -106,17 +109,19 @@ pub enum Ctap2AuthenticatorConfigParams {
 }
 
 #[derive(Debug, Clone, SerializeIndexed)]
-#[serde_indexed(offset = 1)]
 pub struct Ctap2SetMinPINLengthParams {
     // newMinPINLength (0x01)
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x01)]
     pub new_min_pin_length: Option<u64>,
 
     // minPinLengthRPIDs (0x02)
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x02)]
     pub min_pin_length_rpids: Option<Vec<String>>,
 
     // forceChangePin (0x03)
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x03)]
     pub force_change_pin: Option<bool>,
 }

libwebauthn/src/proto/ctap2/model/authenticator_config.rs

@@ -9,29 +9,35 @@ use std::time::Duration;
 pub struct Ctap2BioEnrollmentRequest {
     // modality (0x01) 	Unsigned Integer 	Optional 	The user verification modality being requested
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x01)]
     pub modality: Option<Ctap2BioEnrollmentModality>,
 
     // subCommand (0x02) 	Unsigned Integer 	Optional 	The authenticator user verification sub command currently being requested
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x02)]
     pub subcommand: Option<Ctap2BioEnrollmentSubcommand>,
 
     // subCommandParams (0x03) 	CBOR Map 	Optional 	Map of subCommands parameters. This parameter MAY be omitted when the subCommand does not take any arguments.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x03)]
     pub subcommand_params: Option<Ctap2BioEnrollmentParams>,
 
     // pinUvAuthProtocol (0x04) 	Unsigned Integer 	Optional 	PIN/UV protocol version chosen by the platform.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x04)]
     pub protocol: Option<Ctap2PinUvAuthProtocol>,
 
     // pinUvAuthParam (0x05) 	Byte String 	Optional 	First 16 bytes of HMAC-SHA-256 of contents using pinUvAuthToken.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x05)]
     pub uv_auth_param: Option<ByteBuf>,
 
     // getModality (0x06) 	Boolean 	Optional 	Get the user verification type modality. This MUST be set to true.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x06)]
     pub get_modality: Option<bool>,
 
-    #[serde(skip_serializing_if = "always_skip_bool")]
+    #[serde(skip)]
     pub use_legacy_preview: bool,
 }
 
@@ -48,63 +54,73 @@ pub enum Ctap2BioEnrollmentSubcommand {
 }
 
 #[derive(Debug, Clone, SerializeIndexed)]
-#[serde_indexed(offset = 1)]
 pub struct Ctap2BioEnrollmentParams {
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x01)]
     template_id: Option<ByteBuf>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x02)]
     template_friendly_name: Option<String>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x03)]
     timeout_milliseconds: Option<u64>,
 }
 
 #[derive(Debug, Default, Clone, DeserializeIndexed)]
-#[serde_indexed(offset = 1)]
 pub struct Ctap2BioEnrollmentResponse {
     // modality (0x01) 	Unsigned Integer 	Optional 	The user verification modality.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x01)]
     pub modality: Option<Ctap2BioEnrollmentModality>,
 
     // fingerprintKind (0x02) 	Unsigned Integer 	Optional 	Indicates the type of fingerprint sensor. For touch type sensor, its value is 1. For swipe type sensor its value is 2.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x02)]
     pub fingerprint_kind: Option<Ctap2BioEnrollmentFingerprintKind>,
 
     // maxCaptureSamplesRequiredForEnroll (0x03) 	Unsigned Integer 	Optional 	Indicates the maximum good samples required for enrollment.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x03)]
     pub max_capture_samples_required_for_enroll: Option<u64>,
 
     // templateId (0x04) 	Byte String 	Optional 	Template Identifier.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x04)]
     pub template_id: Option<ByteBuf>,
 
     // lastEnrollSampleStatus (0x05) 	Unsigned Integer 	Optional 	Last enrollment sample status.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x05)]
     pub last_enroll_sample_status: Option<Ctap2LastEnrollmentSampleStatus>,
 
     // remainingSamples (0x06) 	Unsigned Integer 	Optional 	Number of more sample required for enrollment to complete
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x06)]
     pub remaining_samples: Option<u64>,
 
     // templateInfos (0x07) 	CBOR ARRAY 	Optional 	Array of templateInfo’s
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x07)]
     pub template_infos: Option<Vec<Ctap2BioEnrollmentTemplateId>>,
 
     // maxTemplateFriendlyName (0x08) 	Unsigned Integer 	Optional 	Indicates the maximum number of bytes the authenticator will accept as a templateFriendlyName.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x08)]
     pub max_template_friendly_name: Option<u64>,
 }
 
 #[derive(Debug, Clone, DeserializeIndexed)]
-#[serde_indexed(offset = 1)]
 pub struct Ctap2BioEnrollmentTemplateId {
     // templateId (0x01) 	Byte String 	Required 	Template Identifier.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x01)]
     pub template_id: Option<ByteBuf>,
 
     // templateFriendlyName (0x02) 	String 	Optional 	Template Friendly Name.
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(index = 0x02)]
     pub template_friendly_name: Option<String>,
 }
 
@@ -262,9 +278,3 @@ impl Ctap2BioEnrollmentRequest {
         }
     }
 }
-
-// Required by serde_indexed, as serde(skip) isn't supported yet:
-//   https://github.com/trussed-dev/serde-indexed/pull/14
-fn always_skip_bool(_v: &bool) -> bool {
-    true
-}