kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename require_ to ensure

Browse Source
This commit is contained in:
Fabian Kaczmarczyck
2021-02-05 14:52:38 +01:00
parent a54b217116
commit 604f084815
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ctap/mod.rs
View File

@@ -638,7 +638,7 @@ where
} }
self.pin_protocol_v1 self.pin_protocol_v1
.has_permission(PinPermission::MakeCredential)?; .has_permission(PinPermission::MakeCredential)?;
self.pin_protocol_v1.require_rp_id_permission(&rp_id)?; self.pin_protocol_v1.ensure_rp_id_permission(&rp_id)?;
UP_FLAG | UV_FLAG | AT_FLAG | ed_flag UP_FLAG | UV_FLAG | AT_FLAG | ed_flag
} }
None => { None => {
@@ -923,7 +923,7 @@ where
} }
self.pin_protocol_v1 self.pin_protocol_v1
.has_permission(PinPermission::GetAssertion)?; .has_permission(PinPermission::GetAssertion)?;
self.pin_protocol_v1.require_rp_id_permission(&rp_id)?; self.pin_protocol_v1.ensure_rp_id_permission(&rp_id)?;
UV_FLAG UV_FLAG
} }
None => { None => {

10
src/ctap/pin_protocol_v1.rs
View File

@@ -543,7 +543,7 @@ impl PinProtocolV1 {
/// Check if the passed RP ID is associated with the token permission. /// Check if the passed RP ID is associated with the token permission.
/// ///
/// If no RP ID is associated, associate the passed RP ID as a side effect. /// If no RP ID is associated, associate the passed RP ID as a side effect.
pub fn require_rp_id_permission(&mut self, rp_id: &str) -> Result<(), Ctap2StatusCode> { pub fn ensure_rp_id_permission(&mut self, rp_id: &str) -> Result<(), Ctap2StatusCode> {
match &self.permissions_rp_id { match &self.permissions_rp_id {
Some(p) if rp_id != p => Err(Ctap2StatusCode::CTAP2_ERR_PIN_AUTH_INVALID), Some(p) if rp_id != p => Err(Ctap2StatusCode::CTAP2_ERR_PIN_AUTH_INVALID),
None => { None => {
@@ -1230,11 +1230,11 @@ mod test {
} }
#[test] #[test]
fn test_require_rp_id_permission() { fn test_ensure_rp_id_permission() {
let mut rng = ThreadRng256 {}; let mut rng = ThreadRng256 {};
let mut pin_protocol_v1 = PinProtocolV1::new(&mut rng); let mut pin_protocol_v1 = PinProtocolV1::new(&mut rng);
assert_eq!( assert_eq!(
pin_protocol_v1.require_rp_id_permission("example.com"), pin_protocol_v1.ensure_rp_id_permission("example.com"),
Ok(()) Ok(())
); );
assert_eq!( assert_eq!(
@@ -1242,11 +1242,11 @@ mod test {
Some(String::from("example.com")) Some(String::from("example.com"))
); );
assert_eq!( assert_eq!(
pin_protocol_v1.require_rp_id_permission("example.com"), pin_protocol_v1.ensure_rp_id_permission("example.com"),
Ok(()) Ok(())
); );
assert_eq!( assert_eq!(
pin_protocol_v1.require_rp_id_permission("counter-example.com"), pin_protocol_v1.ensure_rp_id_permission("counter-example.com"),
Err(Ctap2StatusCode::CTAP2_ERR_PIN_AUTH_INVALID) Err(Ctap2StatusCode::CTAP2_ERR_PIN_AUTH_INVALID)
); );
} }