minor cleanup

This commit is contained in:
Nickolai Zeldovich 2022-08-31 15:33:27 -04:00
parent b604b746e9
commit 6e1e2acd28

View file

@ -4,6 +4,15 @@ use protobuf::Message;
include!(concat!(env!("OUT_DIR"), "/protos/mod.rs")); include!(concat!(env!("OUT_DIR"), "/protos/mod.rs"));
fn set_issuer(t: &mut backup::TotpEntry, issuer: String) {
let mut issuer = issuer;
issuer.push_str(":");
if !t.name.starts_with(&issuer) {
issuer.push_str(&t.name);
t.name = issuer
}
}
pub fn otpauth_to_entry(uri: &url::Url) -> Result<backup::TotpEntry, anyhow::Error> { pub fn otpauth_to_entry(uri: &url::Url) -> Result<backup::TotpEntry, anyhow::Error> {
let mut t = backup::TotpEntry::default(); let mut t = backup::TotpEntry::default();
@ -13,17 +22,12 @@ pub fn otpauth_to_entry(uri: &url::Url) -> Result<backup::TotpEntry, anyhow::Err
t.name = uri.path()[1..].to_string(); t.name = uri.path()[1..].to_string();
for (k, v) in uri.query_pairs() { for (k, v) in uri.query_pairs() {
match k.into_owned().as_str() { match k.as_ref() {
"secret" => { "secret" => {
t.shared_secret = v.into_owned(); t.shared_secret = v.to_string();
} }
"issuer" => { "issuer" => {
let mut issuer = v.into_owned(); set_issuer(&mut t, v.to_string());
issuer.push_str(":");
if !t.name.starts_with(&issuer) {
issuer.push_str(&t.name);
t.name = issuer
}
} }
"algorithm" => { "algorithm" => {
t.algorithm = backup::HashAlgorithms::from_str(&v)?; t.algorithm = backup::HashAlgorithms::from_str(&v)?;
@ -69,12 +73,7 @@ fn migration_payload_to_entry(param: otpauth_migration::migration_payload::OtpPa
bail!("ALGORITHM_MD5 not supported") bail!("ALGORITHM_MD5 not supported")
} }
t.name = param.name; t.name = param.name;
let mut issuer = param.issuer; set_issuer(&mut t, param.issuer);
issuer.push_str(":");
if !t.name.starts_with(&issuer) {
issuer.push_str(&t.name);
t.name = issuer
}
t.shared_secret = base32::encode(base32::Alphabet::RFC4648 { padding: false }, &param.secret); t.shared_secret = base32::encode(base32::Alphabet::RFC4648 { padding: false }, &param.secret);
Ok(t) Ok(t)
} }
@ -89,7 +88,7 @@ pub fn otpauth_migration_to_entries(uri: &url::Url) -> Result<Vec<backup::TotpEn
let mut entries = Vec::new(); let mut entries = Vec::new();
for (k, v) in uri.query_pairs() { for (k, v) in uri.query_pairs() {
match k.into_owned().as_str() { match k.as_ref() {
"data" => { "data" => {
let data = base64::decode(&v)?; let data = base64::decode(&v)?;
let payload = otpauth_migration::MigrationPayload::parse_from_bytes(&data)?; let payload = otpauth_migration::MigrationPayload::parse_from_bytes(&data)?;