mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
fix problem with over-zealous validator fields
actually, we just need to check for : on the basis names, not everything else!
This commit is contained in:
parent
e2f7a75f87
commit
318f95d347
1 changed files with 24 additions and 16 deletions
|
|
@ -202,7 +202,7 @@ impl ActionManager {
|
||||||
VaultMode::Password => {
|
VaultMode::Password => {
|
||||||
let description = match self.modals
|
let description = match self.modals
|
||||||
.alert_builder(t!("vault.newitem.name", xous::LANG))
|
.alert_builder(t!("vault.newitem.name", xous::LANG))
|
||||||
.field(None, Some(name_validator))
|
.field(None, Some(password_validator))
|
||||||
.build()
|
.build()
|
||||||
{
|
{
|
||||||
Ok(text) => {
|
Ok(text) => {
|
||||||
|
|
@ -213,7 +213,7 @@ impl ActionManager {
|
||||||
self.tt.sleep_ms(SWAP_DELAY_MS).unwrap();
|
self.tt.sleep_ms(SWAP_DELAY_MS).unwrap();
|
||||||
let username = match self.modals
|
let username = match self.modals
|
||||||
.alert_builder(t!("vault.newitem.username", xous::LANG))
|
.alert_builder(t!("vault.newitem.username", xous::LANG))
|
||||||
.field(None, Some(name_validator))
|
.field(None, Some(password_validator))
|
||||||
.build()
|
.build()
|
||||||
{
|
{
|
||||||
Ok(text) => text.content()[0].content.as_str().unwrap_or("UTF-8 error").to_string(),
|
Ok(text) => text.content()[0].content.as_str().unwrap_or("UTF-8 error").to_string(),
|
||||||
|
|
@ -270,7 +270,7 @@ impl ActionManager {
|
||||||
while !approved {
|
while !approved {
|
||||||
let maybe_password = match self.modals
|
let maybe_password = match self.modals
|
||||||
.alert_builder(t!("vault.newitem.password", xous::LANG))
|
.alert_builder(t!("vault.newitem.password", xous::LANG))
|
||||||
.field(Some(password), Some(name_validator))
|
.field(Some(password), Some(password_validator))
|
||||||
.build()
|
.build()
|
||||||
{
|
{
|
||||||
Ok(text) => {
|
Ok(text) => {
|
||||||
|
|
@ -364,7 +364,7 @@ impl ActionManager {
|
||||||
VaultMode::Totp => {
|
VaultMode::Totp => {
|
||||||
let description = match self.modals
|
let description = match self.modals
|
||||||
.alert_builder(t!("vault.newitem.name", xous::LANG))
|
.alert_builder(t!("vault.newitem.name", xous::LANG))
|
||||||
.field(None, Some(name_validator))
|
.field(None, Some(password_validator))
|
||||||
.build()
|
.build()
|
||||||
{
|
{
|
||||||
Ok(text) => {
|
Ok(text) => {
|
||||||
|
|
@ -519,10 +519,10 @@ impl ActionManager {
|
||||||
if let Some(mut pw) = deserialize_password(data) {
|
if let Some(mut pw) = deserialize_password(data) {
|
||||||
let edit_data = self.modals
|
let edit_data = self.modals
|
||||||
.alert_builder(t!("vault.edit_dialog", xous::LANG))
|
.alert_builder(t!("vault.edit_dialog", xous::LANG))
|
||||||
.field(Some(pw.description), Some(name_validator))
|
.field(Some(pw.description), Some(password_validator))
|
||||||
.field(Some(pw.username), Some(name_validator))
|
.field(Some(pw.username), Some(password_validator))
|
||||||
.field(Some(pw.password), Some(name_validator))
|
.field(Some(pw.password), Some(password_validator))
|
||||||
.field(Some(pw.notes), Some(name_validator))
|
.field(Some(pw.notes), Some(password_validator))
|
||||||
.build().expect("modals error in edit");
|
.build().expect("modals error in edit");
|
||||||
pw.description = edit_data.content()[0].content.as_str().unwrap().to_string();
|
pw.description = edit_data.content()[0].content.as_str().unwrap().to_string();
|
||||||
pw.username = edit_data.content()[1].content.as_str().unwrap().to_string();
|
pw.username = edit_data.content()[1].content.as_str().unwrap().to_string();
|
||||||
|
|
@ -591,8 +591,8 @@ impl ActionManager {
|
||||||
if let Some(mut ai) = crate::fido::deserialize_app_info(data) {
|
if let Some(mut ai) = crate::fido::deserialize_app_info(data) {
|
||||||
let edit_data = self.modals
|
let edit_data = self.modals
|
||||||
.alert_builder(t!("vault.edit_dialog", xous::LANG))
|
.alert_builder(t!("vault.edit_dialog", xous::LANG))
|
||||||
.field(Some(ai.name), Some(name_validator))
|
.field(Some(ai.name), Some(password_validator))
|
||||||
.field(Some(ai.notes), Some(name_validator))
|
.field(Some(ai.notes), Some(password_validator))
|
||||||
.field(Some(hex::encode(ai.id)), None)
|
.field(Some(hex::encode(ai.id)), None)
|
||||||
.build().expect("modals error in edit");
|
.build().expect("modals error in edit");
|
||||||
ai.name = edit_data.content()[0].content.as_str().unwrap().to_string();
|
ai.name = edit_data.content()[0].content.as_str().unwrap().to_string();
|
||||||
|
|
@ -646,12 +646,12 @@ impl ActionManager {
|
||||||
let alg: String = pw.algorithm.into();
|
let alg: String = pw.algorithm.into();
|
||||||
let edit_data = self.modals
|
let edit_data = self.modals
|
||||||
.alert_builder(t!("vault.edit_dialog", xous::LANG))
|
.alert_builder(t!("vault.edit_dialog", xous::LANG))
|
||||||
.field(Some(pw.name), Some(name_validator))
|
.field(Some(pw.name), Some(password_validator))
|
||||||
.field(Some(pw.secret), Some(name_validator))
|
.field(Some(pw.secret), Some(password_validator))
|
||||||
.field(Some(pw.notes), Some(name_validator))
|
.field(Some(pw.notes), Some(password_validator))
|
||||||
.field(Some(pw.timestep.to_string()), Some(name_validator))
|
.field(Some(pw.timestep.to_string()), Some(password_validator))
|
||||||
.field(Some(alg), Some(name_validator))
|
.field(Some(alg), Some(password_validator))
|
||||||
.field(Some(pw.digits.to_string()), Some(name_validator))
|
.field(Some(pw.digits.to_string()), Some(password_validator))
|
||||||
.build().expect("modals error in edit");
|
.build().expect("modals error in edit");
|
||||||
pw.name = edit_data.content()[0].content.as_str().unwrap().to_string();
|
pw.name = edit_data.content()[0].content.as_str().unwrap().to_string();
|
||||||
pw.secret = edit_data.content()[1].content.as_str().unwrap().to_string();
|
pw.secret = edit_data.content()[1].content.as_str().unwrap().to_string();
|
||||||
|
|
@ -1299,6 +1299,14 @@ pub(crate) fn name_validator(input: TextEntryPayload) -> Option<xous_ipc::String
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
pub(crate) fn password_validator(input: TextEntryPayload) -> Option<xous_ipc::String<256>> {
|
||||||
|
let proposed_name = input.as_str();
|
||||||
|
if proposed_name.contains(['\n']) { // the '\n' is reserved as the delimiter to end the name field
|
||||||
|
Some(xous_ipc::String::<256>::from_str(t!("vault.illegal_char", xous::LANG)))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
fn length_validator(input: TextEntryPayload) -> Option<xous_ipc::String<256>> {
|
fn length_validator(input: TextEntryPayload) -> Option<xous_ipc::String<256>> {
|
||||||
let text_str = input.as_str();
|
let text_str = input.as_str();
|
||||||
match text_str.parse::<u32>() {
|
match text_str.parse::<u32>() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue