sync pddb after any credential change state

help prevent data loss in case of power outage/crash
This commit is contained in:
bunnie 2022-06-11 03:08:23 +08:00
parent 3803a580cf
commit 3f791f5979

View file

@ -273,6 +273,8 @@ impl PersistentStore {
} }
_ => return Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), _ => return Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR),
} }
self.pddb.borrow().sync()
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
Ok(()) Ok(())
} }
@ -436,6 +438,8 @@ openssl asn1parse -in opensk_cert.pem -inform pem
let value = serialize_credential(new_credential)?; let value = serialize_credential(new_credential)?;
cred.write(&value) cred.write(&value)
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?; .or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
self.pddb.borrow().sync()
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
Ok(()) Ok(())
} }
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR) _ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR)
@ -525,6 +529,8 @@ openssl asn1parse -in opensk_cert.pem -inform pem
gsc.seek(SeekFrom::Start(0)).ok(); // make sure we're writing to the beginning position gsc.seek(SeekFrom::Start(0)).ok(); // make sure we're writing to the beginning position
gsc.write(&INITIAL_SIGNATURE_COUNTER.to_ne_bytes()) gsc.write(&INITIAL_SIGNATURE_COUNTER.to_ne_bytes())
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?; .or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
self.pddb.borrow().sync()
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
Ok(INITIAL_SIGNATURE_COUNTER) Ok(INITIAL_SIGNATURE_COUNTER)
}, },
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), _ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR),
@ -548,6 +554,8 @@ openssl asn1parse -in opensk_cert.pem -inform pem
Ok(mut gsc) => { Ok(mut gsc) => {
gsc.write(&new_value.to_ne_bytes()) gsc.write(&new_value.to_ne_bytes())
.map(|_|()) .map(|_|())
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
self.pddb.borrow().sync()
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR)) .or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))
} }
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), _ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR),
@ -647,7 +655,11 @@ openssl asn1parse -in opensk_cert.pem -inform pem
) { ) {
Ok(mut ph) => { Ok(mut ph) => {
match ph.write(pin_hash) { match ph.write(pin_hash) {
Ok(PIN_AUTH_LENGTH) => Ok(()), Ok(PIN_AUTH_LENGTH) => {
self.pddb.borrow().sync()
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
Ok(())
},
Ok(l) => { Ok(l) => {
log::error!("set_pin_hash incorrect length: {}", l); log::error!("set_pin_hash incorrect length: {}", l);
Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR) Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR)
@ -697,6 +709,8 @@ openssl asn1parse -in opensk_cert.pem -inform pem
Ok(mut pr) => { Ok(mut pr) => {
pr.write(&[new_value]) pr.write(&[new_value])
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?; .or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
self.pddb.borrow().sync()
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
} }
_ => return Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), _ => return Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR),
} }
@ -857,6 +871,8 @@ openssl asn1parse -in opensk_cert.pem -inform pem
Ok(mut apk) => { Ok(mut apk) => {
apk.write(attestation_private_key) apk.write(attestation_private_key)
.map(|_|()) .map(|_|())
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
self.pddb.borrow().sync()
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR)) .or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))
} }
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR) _ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR)
@ -899,6 +915,8 @@ openssl asn1parse -in opensk_cert.pem -inform pem
Ok(mut acert) => { Ok(mut acert) => {
acert.write(attestation_certificate) acert.write(attestation_certificate)
.map(|_|()) .map(|_|())
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
self.pddb.borrow().sync()
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR)) .or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))
} }
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR) _ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR)
@ -942,6 +960,8 @@ openssl asn1parse -in opensk_cert.pem -inform pem
Ok(mut guid) => { Ok(mut guid) => {
guid.write(aaguid) guid.write(aaguid)
.map(|_|()) .map(|_|())
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))?;
self.pddb.borrow().sync()
.or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR)) .or(Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR))
} }
_ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR), _ => Err(Ctap2StatusCode::CTAP2_ERR_VENDOR_INTERNAL_ERROR),