{"header":{"message":"Implement testing for identity management","description":"Adds some basic test cases & infrastructure for testing `pijul identity`. Hopefully the testing infrastructure can be adapted with (relative) ease to support other commands, not just `pijul identity`.","timestamp":"2022-08-16T09:06:08.86288364Z","authors":[{}]},"hash":"FOCBVLOUXYA7ZCUZA2CU3JU2QGF3ZOXW6EAVL5KZINN43GXNL7CQC","authors":[{"login":"finchie","key":"6WCsL9cxQoPBLLwR1PUvmFBJi6wGTGFAxcxMovPQCwTZ"}],"deps":{"hashes":[["FOCBVLOUXYA7ZCUZA2CU3JU2QGF3ZOXW6EAVL5KZINN43GXNL7CQC","Implement testing for identity management"],["AA",null],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."]],"deps":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC"],"known":[]},"hunks":[{"FileAdd":{"meta":{"basename":"tests","metadata":576},"context":[{"change":2,"pos":21407}],"contents":[]}},{"FileAdd":{"meta":{"basename":"identity.rs","metadata":0},"context":[{"change":0,"pos":17}],"contents":[{"Add":"#![deny(clippy::all)]"},{"Add":"#![warn(clippy::pedantic)]"},{"Add":"#![warn(clippy::nursery)]"},{"Add":"#![warn(clippy::cargo)]"},{"Add":""},{"Add":"mod common;"},{"Add":""},{"Add":"use anyhow::Error;"},{"Add":"use common::identity::{default, prompt, Identity, SubCommand};"},{"Add":"use common::{Interaction, InteractionType, SecondAttempt};"},{"Add":""},{"Add":"fn default_id_name() -> Interaction {"},{"Add":" Interaction::new("},{"Add":" prompt::ID_NAME,"},{"Add":" InteractionType::Input(default::ID_NAME.to_string()),"},{"Add":" )"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn new_minimal() -> Result<(), Error> {"},{"Add":" let identity = Identity::new("},{"Add":" \"new_minimal\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" identity.run(&SubCommand::New, Vec::new())?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn new_full() -> Result<(), Error> {"},{"Add":" let identity = Identity::new("},{"Add":" \"new_full\","},{"Add":" default_id_name(),"},{"Add":" Some(default::FULL_NAME.to_string()),"},{"Add":" Some(Interaction::new("},{"Add":" prompt::EMAIL,"},{"Add":" InteractionType::Input(default::EMAIL.to_string()),"},{"Add":" )),"},{"Add":" Some(Interaction::new("},{"Add":" prompt::EXPIRY_DATE,"},{"Add":" InteractionType::Input(default::EXPIRY.to_string()),"},{"Add":" )),"},{"Add":" Some(Interaction::new("},{"Add":" prompt::LOGIN,"},{"Add":" InteractionType::Input(default::LOGIN.to_string()),"},{"Add":" )),"},{"Add":" Some(Interaction::new("},{"Add":" prompt::ORIGIN,"},{"Add":" InteractionType::Input(default::ORIGIN.to_string()),"},{"Add":" )),"},{"Add":" Some(Interaction::new("},{"Add":" prompt::PASSWORD,"},{"Add":" InteractionType::Password {"},{"Add":" input: default::PASSWORD.to_string(),"},{"Add":" confirm: Some(prompt::PASSWORD_REPROMPT.to_string()),"},{"Add":" },"},{"Add":" )),"},{"Add":" )?;"},{"Add":""},{"Add":" identity.run(&SubCommand::New, Vec::new())?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn new_email() -> Result<(), Error> {"},{"Add":" let identity = Identity::new("},{"Add":" \"new_email\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" Some("},{"Add":" Interaction::new("},{"Add":" prompt::EMAIL,"},{"Add":" InteractionType::Input(String::from(\"BAD-EMAIL\")),"},{"Add":" )"},{"Add":" .with_second_attempt(SecondAttempt::new("},{"Add":" InteractionType::Input(default::EMAIL.to_string()),"},{"Add":" \"Invalid email address\","},{"Add":" )?)?,"},{"Add":" ),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" identity.run(&SubCommand::New, Vec::new())?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn new_expiry() -> Result<(), Error> {"},{"Add":" let identity = Identity::new("},{"Add":" \"new_expiry\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" Some("},{"Add":" Interaction::new("},{"Add":" prompt::EXPIRY_DATE,"},{"Add":" InteractionType::Input(String::from(\"BAD-EXPIRY\")),"},{"Add":" )"},{"Add":" .with_second_attempt(SecondAttempt::new("},{"Add":" InteractionType::Input(default::EXPIRY.to_string()),"},{"Add":" \"Invalid date\","},{"Add":" )?)?,"},{"Add":" ),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" identity.run(&SubCommand::New, Vec::new())?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn new_login() -> Result<(), Error> {"},{"Add":" let identity = Identity::new("},{"Add":" \"new_login\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" Some(Interaction::new("},{"Add":" prompt::LOGIN,"},{"Add":" InteractionType::Input(default::LOGIN.to_string()),"},{"Add":" )),"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" identity.run(&SubCommand::New, Vec::new())?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn new_origin() -> Result<(), Error> {"},{"Add":" let identity = Identity::new("},{"Add":" \"new_origin\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" Some(Interaction::new("},{"Add":" prompt::ORIGIN,"},{"Add":" InteractionType::Input(default::ORIGIN.to_string()),"},{"Add":" )),"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" identity.run(&SubCommand::New, Vec::new())?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn new_password() -> Result<(), Error> {"},{"Add":" let identity = Identity::new("},{"Add":" \"new_password\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" Some("},{"Add":" Interaction::new("},{"Add":" prompt::PASSWORD,"},{"Add":" InteractionType::Password {"},{"Add":" input: default::PASSWORD.to_string(),"},{"Add":" confirm: Some(prompt::PASSWORD_REPROMPT.to_string()),"},{"Add":" },"},{"Add":" )"},{"Add":" .with_second_attempt(SecondAttempt::new("},{"Add":" InteractionType::Password {"},{"Add":" input: \"Good-Password\".to_string(),"},{"Add":" confirm: Some(prompt::PASSWORD_REPROMPT.to_string()),"},{"Add":" },"},{"Add":" \"Password mismatch\","},{"Add":" )?)?,"},{"Add":" ),"},{"Add":" )?;"},{"Add":""},{"Add":" identity.run(&SubCommand::New, Vec::new())?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn edit_full() -> Result<(), Error> {"},{"Add":" let old_identity = Identity::new("},{"Add":" \"edit_full\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" let new_identity = Identity::new("},{"Add":" \"edit_full\","},{"Add":" Interaction::new("},{"Add":" prompt::ID_NAME,"},{"Add":" InteractionType::Input(String::from(\"new_id_name\")),"},{"Add":" ),"},{"Add":" Some(default::FULL_NAME.to_string()),"},{"Add":" Some("},{"Add":" Interaction::new("},{"Add":" prompt::EMAIL,"},{"Add":" InteractionType::Input(String::from(\"BAD_EMAIL\")),"},{"Add":" )"},{"Add":" .with_second_attempt(SecondAttempt::new("},{"Add":" InteractionType::Input(default::EMAIL.to_string()),"},{"Add":" \"Invalid email address\","},{"Add":" )?)?,"},{"Add":" ),"},{"Add":" Some("},{"Add":" Interaction::new("},{"Add":" prompt::EXPIRY_DATE,"},{"Add":" InteractionType::Input(String::from(\"BAD-EXPIRY\")),"},{"Add":" )"},{"Add":" .with_second_attempt(SecondAttempt::new("},{"Add":" InteractionType::Input(default::EXPIRY.to_string()),"},{"Add":" \"Invalid date\","},{"Add":" )?)?,"},{"Add":" ),"},{"Add":" Some(Interaction::new("},{"Add":" prompt::LOGIN,"},{"Add":" InteractionType::Input(default::LOGIN.to_string()),"},{"Add":" )),"},{"Add":" Some(Interaction::new("},{"Add":" prompt::ORIGIN,"},{"Add":" InteractionType::Input(default::ORIGIN.to_string()),"},{"Add":" )),"},{"Add":" Some("},{"Add":" Interaction::new("},{"Add":" prompt::PASSWORD,"},{"Add":" InteractionType::Password {"},{"Add":" input: default::PASSWORD.to_string(),"},{"Add":" confirm: Some(prompt::PASSWORD_REPROMPT.to_string()),"},{"Add":" },"},{"Add":" )"},{"Add":" .with_second_attempt(SecondAttempt::new("},{"Add":" InteractionType::Password {"},{"Add":" input: \"Good-Password\".to_string(),"},{"Add":" confirm: Some(prompt::PASSWORD_REPROMPT.to_string()),"},{"Add":" },"},{"Add":" \"Password mismatch\","},{"Add":" )?)?,"},{"Add":" ),"},{"Add":" )?;"},{"Add":""},{"Add":" new_identity.run("},{"Add":" &SubCommand::Edit(old_identity.id_name.valid_input().as_string()),"},{"Add":" vec![old_identity],"},{"Add":" )?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn edit_id_name() -> Result<(), Error> {"},{"Add":" let old_identity = Identity::new("},{"Add":" \"edit_id_name\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" let new_identity = Identity::new("},{"Add":" \"edit_id_name\","},{"Add":" Interaction::new("},{"Add":" prompt::ID_NAME,"},{"Add":" InteractionType::Input(String::from(\"new_id_name\")),"},{"Add":" ),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" new_identity.run("},{"Add":" &SubCommand::Edit(old_identity.id_name.valid_input().as_string()),"},{"Add":" vec![old_identity],"},{"Add":" )?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn edit_email() -> Result<(), Error> {"},{"Add":" let old_identity = Identity::new("},{"Add":" \"edit_email\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" let new_identity = Identity::new("},{"Add":" \"edit_email\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" Some("},{"Add":" Interaction::new("},{"Add":" prompt::EMAIL,"},{"Add":" InteractionType::Input(String::from(\"BAD_EMAIL\")),"},{"Add":" )"},{"Add":" .with_second_attempt(SecondAttempt::new("},{"Add":" InteractionType::Input(default::EMAIL.to_string()),"},{"Add":" \"Invalid email address\","},{"Add":" )?)?,"},{"Add":" ),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" new_identity.run("},{"Add":" &SubCommand::Edit(old_identity.id_name.valid_input().as_string()),"},{"Add":" vec![old_identity],"},{"Add":" )?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn edit_expiry() -> Result<(), Error> {"},{"Add":" let old_identity = Identity::new("},{"Add":" \"edit_expiry\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" let new_identity = Identity::new("},{"Add":" \"edit_expiry\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" Some("},{"Add":" Interaction::new("},{"Add":" prompt::EXPIRY_DATE,"},{"Add":" InteractionType::Input(String::from(\"BAD-EXPIRY\")),"},{"Add":" )"},{"Add":" .with_second_attempt(SecondAttempt::new("},{"Add":" InteractionType::Input(default::EXPIRY.to_string()),"},{"Add":" \"Invalid date\","},{"Add":" )?)?,"},{"Add":" ),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" new_identity.run("},{"Add":" &SubCommand::Edit(old_identity.id_name.valid_input().as_string()),"},{"Add":" vec![old_identity],"},{"Add":" )?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn edit_password() -> Result<(), Error> {"},{"Add":" let old_identity = Identity::new("},{"Add":" \"edit_password\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" let new_identity = Identity::new("},{"Add":" \"edit_password\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" Some("},{"Add":" Interaction::new("},{"Add":" prompt::PASSWORD,"},{"Add":" InteractionType::Password {"},{"Add":" input: default::PASSWORD.to_string(),"},{"Add":" confirm: Some(prompt::PASSWORD_REPROMPT.to_string()),"},{"Add":" },"},{"Add":" )"},{"Add":" .with_second_attempt(SecondAttempt::new("},{"Add":" InteractionType::Password {"},{"Add":" input: \"Good-Password\".to_string(),"},{"Add":" confirm: Some(prompt::PASSWORD_REPROMPT.to_string()),"},{"Add":" },"},{"Add":" \"Password mismatch\","},{"Add":" )?)?,"},{"Add":" ),"},{"Add":" )?;"},{"Add":""},{"Add":" new_identity.run("},{"Add":" &SubCommand::Edit(old_identity.id_name.valid_input().as_string()),"},{"Add":" vec![old_identity],"},{"Add":" )?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn remove() -> Result<(), Error> {"},{"Add":" let identity = Identity::new("},{"Add":" \"new_minimal\","},{"Add":" default_id_name(),"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" None,"},{"Add":" )?;"},{"Add":""},{"Add":" identity.run(&SubCommand::Remove, vec![identity.clone()])?;"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"common","metadata":576},"context":[{"change":0,"pos":17}],"contents":[]}},{"FileAdd":{"meta":{"basename":"mod.rs","metadata":0},"context":[{"change":0,"pos":10806}],"contents":[{"Add":"#![deny(clippy::all)]"},{"Add":"#![warn(clippy::pedantic)]"},{"Add":"#![warn(clippy::nursery)]"},{"Add":"#![warn(clippy::cargo)]"},{"Add":""},{"Add":"pub mod identity;"},{"Add":""},{"Add":"use std::io::{Read, Write};"},{"Add":""},{"Add":"use anyhow::{bail, Error};"},{"Add":"use expectrl::{"},{"Add":" process::{unix::UnixProcess, NonBlocking},"},{"Add":" ControlCode, Regex, Session,"},{"Add":"};"},{"Add":""},{"Add":"#[derive(Clone, Debug)]"},{"Add":"pub enum InteractionType {"},{"Add":" Confirm(bool),"},{"Add":" Input(String),"},{"Add":" Password {"},{"Add":" input: String,"},{"Add":" confirm: Option,"},{"Add":" },"},{"Add":"}"},{"Add":""},{"Add":"impl InteractionType {"},{"Add":" pub fn as_string(&self) -> String {"},{"Add":" match self {"},{"Add":" Self::Confirm(confirm) => {"},{"Add":" if *confirm {"},{"Add":" String::from('y')"},{"Add":" } else {"},{"Add":" String::from('n')"},{"Add":" }"},{"Add":" }"},{"Add":" Self::Input(input) | Self::Password { input, .. } => input.clone(),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, Debug)]"},{"Add":"pub struct SecondAttempt {"},{"Add":" input: InteractionType,"},{"Add":" error_message: String,"},{"Add":"}"},{"Add":""},{"Add":"impl SecondAttempt {"},{"Add":" pub fn new>(input: InteractionType, error_msg: S) -> Result {"},{"Add":" let error_message: String = error_msg.into();"},{"Add":" if matches!(input, InteractionType::Confirm(_)) && !error_message.is_empty() {"},{"Add":" bail!(\"Cannot have error message for confirm propmt\");"},{"Add":" }"},{"Add":""},{"Add":" Ok(Self {"},{"Add":" input,"},{"Add":" error_message,"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, Debug)]"},{"Add":"pub struct Interaction {"},{"Add":" prompt_message: String,"},{"Add":" input: InteractionType,"},{"Add":" second_attempt: Option,"},{"Add":"}"},{"Add":""},{"Add":"impl Interaction {"},{"Add":" pub fn new>(prompt_message: S, input: InteractionType) -> Self {"},{"Add":" Self {"},{"Add":" prompt_message: prompt_message.into(),"},{"Add":" input,"},{"Add":" second_attempt: None,"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn with_second_attempt(mut self, second_attempt: SecondAttempt) -> Result {"},{"Add":" if let Some(second_attempt) = self.second_attempt.clone() {"},{"Add":" let interaction_type = second_attempt.input;"},{"Add":" if !matches!(&self.input, interaction_type) {"},{"Add":" bail!(\"Cannot have non-matching second input!\");"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" self.second_attempt = Some(second_attempt);"},{"Add":" Ok(self)"},{"Add":" }"},{"Add":""},{"Add":" pub fn get_input(&self, valid: bool) -> String {"},{"Add":" if let Some(invalid) = self.invalid_input() && !valid {"},{"Add":" invalid.as_string()"},{"Add":" } else {"},{"Add":" self.valid_input().as_string()"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn invalid_input(&self) -> Option {"},{"Add":" if self.second_attempt.is_some() {"},{"Add":" Some(self.input.clone())"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn valid_input(&self) -> InteractionType {"},{"Add":" if let Some(second_input) = &self.second_attempt {"},{"Add":" second_input.input.clone()"},{"Add":" } else {"},{"Add":" self.input.clone()"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn interact("},{"Add":" &self,"},{"Add":" session: &mut Session,"},{"Add":" ) -> Result<(), Error> {"},{"Add":" // Wait for the text to come in"},{"Add":" println!(\"Expecting prompt message: {}\", self.prompt_message);"},{"Add":" session.expect(&self.prompt_message)?;"},{"Add":""},{"Add":" match &self.input {"},{"Add":" InteractionType::Confirm(confirm) => {"},{"Add":" println!(\"Sending confirmation: {confirm}\");"},{"Add":" session.send(&self.input.as_string())?;"},{"Add":" }"},{"Add":" InteractionType::Input(_) => {"},{"Add":" if let Some(invalid_input) = self.invalid_input() {"},{"Add":" clear_prompt(session)?;"},{"Add":""},{"Add":" println!(\"Sending invalid input: {}\", invalid_input.as_string());"},{"Add":" session.send(invalid_input.as_string())?;"},{"Add":" session.send_control(ControlCode::CarriageReturn)?;"},{"Add":""},{"Add":" let error_message = self.second_attempt.clone().unwrap().error_message;"},{"Add":" println!(\"Expecting error message: {error_message}\");"},{"Add":" session.expect(error_message)?;"},{"Add":" }"},{"Add":""},{"Add":" clear_prompt(session)?;"},{"Add":" let valid_input = self.valid_input().as_string();"},{"Add":" println!(\"Sending valid input: {}\", valid_input);"},{"Add":" session.send(valid_input)?;"},{"Add":" session.send_control(ControlCode::CarriageReturn)?;"},{"Add":" }"},{"Add":" InteractionType::Password { confirm, .. } => {"},{"Add":" let valid_password = self.valid_input().as_string();"},{"Add":" println!(\"Sending valid password: {valid_password}\");"},{"Add":" session.send(&valid_password)?;"},{"Add":" session.send_control(ControlCode::CarriageReturn)?;"},{"Add":""},{"Add":" // If there is a second attempt, send the invalid password"},{"Add":" if let Some(second_attempt) = self.invalid_input() {"},{"Add":" let confirm_prompt = confirm.as_ref().unwrap();"},{"Add":" println!(\"Expecting password re-prompt: {confirm_prompt}\");"},{"Add":" session.expect(confirm_prompt)?;"},{"Add":""},{"Add":" let invalid_password = second_attempt.as_string();"},{"Add":" println!(\"Sending invalid password: {invalid_password}\");"},{"Add":""},{"Add":" session.send(&invalid_password)?;"},{"Add":" session.send_control(ControlCode::CarriageReturn)?;"},{"Add":""},{"Add":" let error_message = self.second_attempt.clone().unwrap().error_message;"},{"Add":" println!(\"Expecting error message: {error_message}\");"},{"Add":" session.expect(&error_message)?;"},{"Add":" }"},{"Add":""},{"Add":" // Sometimes the password needs to be confirmed"},{"Add":" if let Some(confirm_prompt) = confirm {"},{"Add":" // In the case of invalid input, we have to send twice"},{"Add":" if self.invalid_input().is_some() {"},{"Add":" println!(\"Expecting prompt message: {}\", self.prompt_message);"},{"Add":" session.expect(&self.prompt_message)?;"},{"Add":""},{"Add":" println!(\"Sending valid password: {valid_password}\");"},{"Add":" session.send(&valid_password)?;"},{"Add":" session.send_control(ControlCode::CarriageReturn)?;"},{"Add":" }"},{"Add":""},{"Add":" println!(\"Expecting password re-prompt: {confirm_prompt}\");"},{"Add":" session.expect(confirm_prompt)?;"},{"Add":""},{"Add":" println!(\"Re-sending valid password: {valid_password}\");"},{"Add":" session.send(&valid_password)?;"},{"Add":" session.send_control(ControlCode::CarriageReturn)?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn clear_prompt("},{"Add":" session: &mut Session,"},{"Add":") -> Result<(), Error> {"},{"Add":" println!(\"Clearing prompt\");"},{"Add":""},{"Add":" // Use regex to find where the prompt ends"},{"Add":" let prompt_regex = r\":.*\";"},{"Add":" let captures = session.expect(Regex(prompt_regex))?;"},{"Add":" let matches = captures.matches();"},{"Add":""},{"Add":" // Clear default text by sending backspaces"},{"Add":" for _ in 0..matches.last().unwrap().len() {"},{"Add":" session.send_control(ControlCode::Backspace)?;"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"identity.rs","metadata":0},"context":[{"change":0,"pos":10806}],"contents":[{"Add":"use std::{"},{"Add":" ffi::OsStr,"},{"Add":" io::Read,"},{"Add":" path::{Path, PathBuf},"},{"Add":" process::Command,"},{"Add":"};"},{"Add":""},{"Add":"use anyhow::Error;"},{"Add":"use expectrl::{Session, WaitStatus};"},{"Add":""},{"Add":"use super::{Interaction, InteractionType};"},{"Add":""},{"Add":"pub mod default {"},{"Add":" pub const ID_NAME: &str = \"my_identity\";"},{"Add":" pub const FULL_NAME: &str = \"Firstname Lastname\";"},{"Add":" pub const EMAIL: &str = \"person@example.com\";"},{"Add":" pub const EXPIRY: &str = \"2056-01-01\";"},{"Add":" pub const LOGIN: &str = \"my_username\";"},{"Add":" pub const ORIGIN: &str = \"ssh.pijul.com\";"},{"Add":" pub const PASSWORD: &str = \"correct-horse-battery-staple\";"},{"Add":"}"},{"Add":""},{"Add":"pub mod prompt {"},{"Add":" pub const ID_NAME: &str = \"Unique identity name\";"},{"Add":" pub const FULL_NAME: &str = \"Display name\";"},{"Add":" pub const EMAIL: &str = \"Email (leave blank for none)\";"},{"Add":" pub const EXPIRY_DATE: &str = \"Expiry date (YYYY-MM-DD)\";"},{"Add":" pub const LOGIN: &str = \"Remote username\";"},{"Add":" pub const ORIGIN: &str = \"Remote URL\";"},{"Add":" pub const PASSWORD: &str = \"Secret key password\";"},{"Add":" pub const PASSWORD_REPROMPT: &str = \"Confirm password\";"},{"Add":""},{"Add":" pub mod confirm {"},{"Add":" pub const EXPIRY: &str = \"Do you want this key to expire?\";"},{"Add":" pub const REMOTE: &str = \"Do you want to link this identity to a remote?\";"},{"Add":" pub const ENCRYPTION: &str = \"Do you want to change the encryption?\";"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"const CONFIG_DATA: &str = \"colors = 'never'"},{"Add":"[author]"},{"Add":"login = ''\";"},{"Add":""},{"Add":"#[derive(Clone)]"},{"Add":"pub enum SubCommand {"},{"Add":" New,"},{"Add":" Edit(String),"},{"Add":" Remove,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone)]"},{"Add":"pub struct Identity {"},{"Add":" pub id_name: Interaction,"},{"Add":" pub full_name: Option,"},{"Add":" pub email: Option,"},{"Add":" pub expiry: Option,"},{"Add":" pub login: Option,"},{"Add":" pub origin: Option,"},{"Add":" pub password: Option,"},{"Add":" config_path: PathBuf,"},{"Add":"}"},{"Add":""},{"Add":"impl Identity {"},{"Add":" pub fn new>("},{"Add":" path_name: P,"},{"Add":" id_name: Interaction,"},{"Add":" full_name: Option,"},{"Add":" email: Option,"},{"Add":" expiry: Option,"},{"Add":" login: Option,"},{"Add":" remote: Option,"},{"Add":" password: Option,"},{"Add":" ) -> Result {"},{"Add":" let config_path = std::path::PathBuf::from(env!(\"CARGO_TARGET_TMPDIR\")).join(path_name);"},{"Add":""},{"Add":" let identity = Self {"},{"Add":" id_name,"},{"Add":" full_name,"},{"Add":" email,"},{"Add":" expiry,"},{"Add":" login,"},{"Add":" origin: remote,"},{"Add":" password,"},{"Add":" config_path,"},{"Add":" };"},{"Add":" identity.reset_fs(Vec::new().as_slice())?;"},{"Add":""},{"Add":" Ok(identity)"},{"Add":" }"},{"Add":""},{"Add":" pub fn reset_fs(&self, existing_identities: &[Identity]) -> Result<(), Error> {"},{"Add":" let mut config_path = self.config_path.clone();"},{"Add":" config_path.push(\"identities\");"},{"Add":" if config_path.exists() {"},{"Add":" std::fs::remove_dir_all(&config_path)?;"},{"Add":" }"},{"Add":""},{"Add":" std::fs::create_dir_all(&config_path)?;"},{"Add":" config_path.pop();"},{"Add":""},{"Add":" config_path.push(\"config.toml\");"},{"Add":" std::fs::write(&config_path, CONFIG_DATA)?;"},{"Add":" config_path.pop();"},{"Add":""},{"Add":" // Create every identity that should exist"},{"Add":" for existing_id in existing_identities {"},{"Add":" assert_eq!(existing_id.config_path, config_path);"},{"Add":""},{"Add":" println!("},{"Add":" \"Creating existing identity with name: {}\","},{"Add":" existing_id.id_name.valid_input().as_string()"},{"Add":" );"},{"Add":" existing_id.run_cli_edit("},{"Add":" generate_command(&config_path, &SubCommand::New),"},{"Add":" true,"},{"Add":" &SubCommand::New,"},{"Add":" )?;"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn verify(&self) -> Result<(), Error> {"},{"Add":" let identity_path = self"},{"Add":" .config_path"},{"Add":" .join(\"identities\")"},{"Add":" .join(&self.id_name.valid_input().as_string())"},{"Add":" .join(\"identity.toml\");"},{"Add":""},{"Add":" // Parse the generated TOML and verify"},{"Add":" let identity_data = std::fs::read_to_string(identity_path)?;"},{"Add":" let toml_data = identity_data.parse::().unwrap();"},{"Add":""},{"Add":" self.full_name.as_ref().map_or_else("},{"Add":" || {"},{"Add":" if let Some(full_name) = toml_data.get(\"name\") {"},{"Add":" assert_eq!(full_name.as_str().unwrap(), whoami::realname());"},{"Add":" }"},{"Add":" },"},{"Add":" |full_name| {"},{"Add":" assert_eq!("},{"Add":" full_name.as_str(),"},{"Add":" toml_data.get(\"name\").unwrap().as_str().unwrap()"},{"Add":" );"},{"Add":" },"},{"Add":" );"},{"Add":""},{"Add":" self.email.as_ref().map_or_else("},{"Add":" || {"},{"Add":" assert!(toml_data.get(\"email\").is_none());"},{"Add":" },"},{"Add":" |email| {"},{"Add":" assert_eq!("},{"Add":" email.valid_input().as_string().as_str(),"},{"Add":" toml_data.get(\"email\").unwrap().as_str().unwrap()"},{"Add":" );"},{"Add":" },"},{"Add":" );"},{"Add":""},{"Add":" self.login.as_ref().map_or_else("},{"Add":" || {"},{"Add":" let default = toml::value::Value::String(String::new());"},{"Add":" let data = toml_data.get(\"login\").unwrap_or(&default).as_str().unwrap();"},{"Add":" assert!(data.is_empty() || data == whoami::username());"},{"Add":" },"},{"Add":" |login| {"},{"Add":" assert_eq!("},{"Add":" login.valid_input().as_string().as_str(),"},{"Add":" toml_data.get(\"login\").unwrap().as_str().unwrap()"},{"Add":" );"},{"Add":" },"},{"Add":" );"},{"Add":""},{"Add":" self.origin.as_ref().map_or_else("},{"Add":" || {"},{"Add":" let default = toml::value::Value::String(String::new());"},{"Add":" let data = toml_data"},{"Add":" .get(\"origin\")"},{"Add":" .unwrap_or(&default)"},{"Add":" .as_str()"},{"Add":" .unwrap();"},{"Add":" assert!(data.is_empty() || data == \"ssh.pijul.com\");"},{"Add":" },"},{"Add":" |origin| {"},{"Add":" assert_eq!("},{"Add":" origin.valid_input().as_string().as_str(),"},{"Add":" toml_data.get(\"origin\").unwrap().as_str().unwrap()"},{"Add":" );"},{"Add":" },"},{"Add":" );"},{"Add":""},{"Add":" if let Some(expiry) = &self.expiry {"},{"Add":" let time_stamp = toml_data"},{"Add":" .get(\"public_key\")"},{"Add":" .unwrap()"},{"Add":" .get(\"expires\")"},{"Add":" .unwrap()"},{"Add":" .as_str()"},{"Add":" .unwrap();"},{"Add":" let parsed_time_stamp ="},{"Add":" dateparser::parse_with_timezone(time_stamp, &chrono::offset::Utc)?;"},{"Add":""},{"Add":" assert_eq!("},{"Add":" expiry.valid_input().as_string(),"},{"Add":" parsed_time_stamp.format(\"%Y-%m-%d\").to_string()"},{"Add":" );"},{"Add":" } else {"},{"Add":" assert!(toml_data"},{"Add":" .get(\"public_key\")"},{"Add":" .unwrap()"},{"Add":" .get(\"expires\")"},{"Add":" .is_none());"},{"Add":" }"},{"Add":""},{"Add":" let mut secret_key_file = std::fs::File::open("},{"Add":" self.config_path"},{"Add":" .join(\"identities\")"},{"Add":" .join(self.id_name.valid_input().as_string())"},{"Add":" .join(\"secret_key.json\"),"},{"Add":" )?;"},{"Add":" let mut secret_key_text = String::new();"},{"Add":" secret_key_file.read_to_string(&mut secret_key_text)?;"},{"Add":" let secret_key: libpijul::key::SecretKey = serde_json::from_str(&secret_key_text)?;"},{"Add":" assert_eq!(secret_key.encryption.is_some(), self.password.is_some());"},{"Add":""},{"Add":" self.password.as_ref().map_or_else("},{"Add":" || {"},{"Add":" secret_key.load(None).unwrap();"},{"Add":" },"},{"Add":" |password| {"},{"Add":" secret_key"},{"Add":" .load(Some(password.valid_input().as_string().as_str()))"},{"Add":" .unwrap();"},{"Add":" },"},{"Add":" );"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub fn run_cli_edit("},{"Add":" &self,"},{"Add":" mut pijul_cmd: Command,"},{"Add":" valid: bool,"},{"Add":" subcmd: &SubCommand,"},{"Add":" ) -> Result {"},{"Add":" pijul_cmd.arg(\"--no-prompt\").arg(\"--name\");"},{"Add":""},{"Add":" match subcmd {"},{"Add":" SubCommand::New => {"},{"Add":" pijul_cmd.arg(self.id_name.get_input(valid));"},{"Add":" }"},{"Add":" SubCommand::Edit(old_name) => {"},{"Add":" pijul_cmd"},{"Add":" .arg(&old_name)"},{"Add":" .arg(\"--new-name\")"},{"Add":" .arg(self.id_name.get_input(valid));"},{"Add":" }"},{"Add":" SubCommand::Remove => {"},{"Add":" panic!(\"Wrong function call!\");"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" if let Some(full_name) = self.full_name.clone() {"},{"Add":" pijul_cmd.arg(\"--display-name\").arg(full_name);"},{"Add":" }"},{"Add":" if let Some(email) = self.email.clone() {"},{"Add":" pijul_cmd.arg(\"--email\").arg(email.get_input(valid));"},{"Add":" }"},{"Add":" if let Some(expiry) = self.expiry.clone() {"},{"Add":" pijul_cmd.arg(\"--expiry\").arg(expiry.get_input(valid));"},{"Add":" }"},{"Add":" if let Some(login) = self.login.clone() {"},{"Add":" pijul_cmd.arg(\"--username\").arg(login.get_input(valid));"},{"Add":" }"},{"Add":" if let Some(origin) = self.origin.clone() {"},{"Add":" pijul_cmd.arg(\"--remote\").arg(origin.get_input(valid));"},{"Add":" }"},{"Add":" if self.password.is_some() {"},{"Add":" pijul_cmd.arg(\"--read-password\");"},{"Add":" }"},{"Add":""},{"Add":" println!("},{"Add":" \"Running pijul with args: {:#?}\","},{"Add":" pijul_cmd"},{"Add":" .get_args()"},{"Add":" .collect::>()"},{"Add":" .join(OsStr::new(\" \"))"},{"Add":" );"},{"Add":""},{"Add":" let mut session = Session::spawn(pijul_cmd)?;"},{"Add":""},{"Add":" if let Some(password) = self.password.clone() && valid {"},{"Add":" password.interact(&mut session)?;"},{"Add":" }"},{"Add":""},{"Add":" Ok(session.wait()?)"},{"Add":" }"},{"Add":""},{"Add":" fn run_interactive_edit(&self, pijul_cmd: Command) -> Result {"},{"Add":" let mut session = Session::spawn(pijul_cmd)?;"},{"Add":" self.id_name.interact(&mut session)?;"},{"Add":""},{"Add":" if let Some(full_name) = self.full_name.clone() {"},{"Add":" Interaction::new(prompt::FULL_NAME, InteractionType::Input(full_name))"},{"Add":" .interact(&mut session)?;"},{"Add":" } else {"},{"Add":" Interaction::new(prompt::FULL_NAME, InteractionType::Input(String::new()))"},{"Add":" .interact(&mut session)?;"},{"Add":" }"},{"Add":""},{"Add":" self.email"},{"Add":" .clone()"},{"Add":" .unwrap_or(Interaction::new("},{"Add":" prompt::EMAIL,"},{"Add":" InteractionType::Input(String::new()),"},{"Add":" ))"},{"Add":" .interact(&mut session)?;"},{"Add":""},{"Add":" Interaction::new("},{"Add":" format!(\"{} (Current expiry: never)\", prompt::confirm::EXPIRY),"},{"Add":" InteractionType::Confirm(self.expiry.is_some()),"},{"Add":" )"},{"Add":" .interact(&mut session)?;"},{"Add":" if let Some(expiry) = self.expiry.clone() {"},{"Add":" expiry.interact(&mut session)?;"},{"Add":" }"},{"Add":""},{"Add":" let remote_data = self.login.is_some() || self.origin.is_some();"},{"Add":" Interaction::new("},{"Add":" prompt::confirm::REMOTE,"},{"Add":" InteractionType::Confirm(remote_data),"},{"Add":" )"},{"Add":" .interact(&mut session)?;"},{"Add":" if remote_data {"},{"Add":" if let Some(login) = self.login.clone() {"},{"Add":" login.interact(&mut session)?;"},{"Add":" } else {"},{"Add":" // Use an empty login"},{"Add":" Interaction::new(prompt::LOGIN, InteractionType::Input(String::new()))"},{"Add":" .interact(&mut session)?;"},{"Add":" }"},{"Add":" if let Some(origin) = self.origin.clone() {"},{"Add":" origin.interact(&mut session)?;"},{"Add":" } else {"},{"Add":" // Use an empty origin"},{"Add":" Interaction::new(prompt::ORIGIN, InteractionType::Input(String::new()))"},{"Add":" .interact(&mut session)?;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Interaction::new("},{"Add":" format!("},{"Add":" \"{} (Current status: not encrypted)\","},{"Add":" prompt::confirm::ENCRYPTION"},{"Add":" ),"},{"Add":" InteractionType::Confirm(self.password.is_some()),"},{"Add":" )"},{"Add":" .interact(&mut session)?;"},{"Add":" if let Some(password) = self.password.clone() {"},{"Add":" password.interact(&mut session)?;"},{"Add":" }"},{"Add":""},{"Add":" Ok(session.wait()?)"},{"Add":" }"},{"Add":""},{"Add":" pub fn run_edit("},{"Add":" &self,"},{"Add":" subcmd: &SubCommand,"},{"Add":" existing_identities: Vec,"},{"Add":" ) -> Result<(), Error> {"},{"Add":" let invalid_interactions = ["},{"Add":" self.id_name.invalid_input(),"},{"Add":" self.email.as_ref().and_then(Interaction::invalid_input),"},{"Add":" self.expiry.as_ref().and_then(Interaction::invalid_input),"},{"Add":" ];"},{"Add":""},{"Add":" // If any of the items have invalid values, we need to test the program correctly errors out"},{"Add":" if invalid_interactions.iter().any(Option::is_some) {"},{"Add":" println!(\"Detected invalid inputs, expecting failure with --no-prompt\");"},{"Add":" self.reset_fs(&existing_identities)?;"},{"Add":" let cli_status ="},{"Add":" self.run_cli_edit(generate_command(&self.config_path, subcmd), false, subcmd)?;"},{"Add":" assert!(!matches!(cli_status, WaitStatus::Exited(_, exitcode::OK)));"},{"Add":" println!(\"Program failed as expected\");"},{"Add":" }"},{"Add":""},{"Add":" self.reset_fs(&existing_identities)?;"},{"Add":" let cli_status ="},{"Add":" self.run_cli_edit(generate_command(&self.config_path, subcmd), true, subcmd)?;"},{"Add":" assert!(matches!(cli_status, WaitStatus::Exited(_, exitcode::OK)));"},{"Add":" self.verify()?;"},{"Add":" println!(\"Successfully ran pijul in CLI mode\");"},{"Add":""},{"Add":" self.reset_fs(&existing_identities)?;"},{"Add":" let interactive_status ="},{"Add":" self.run_interactive_edit(generate_command(&self.config_path, subcmd))?;"},{"Add":" assert!(matches!("},{"Add":" interactive_status,"},{"Add":" WaitStatus::Exited(_, exitcode::OK)"},{"Add":" ));"},{"Add":" self.verify()?;"},{"Add":" println!(\"Successfully ran pijul in interactive mode\");"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub fn run(&self, subcmd: &SubCommand, existing_identities: Vec) -> Result<(), Error> {"},{"Add":" match subcmd {"},{"Add":" SubCommand::New | SubCommand::Edit(_) => {"},{"Add":" self.run_edit(subcmd, existing_identities)?;"},{"Add":" }"},{"Add":" SubCommand::Remove => {"},{"Add":" self.reset_fs(&existing_identities)?;"},{"Add":""},{"Add":" let pijul_cmd = generate_command(&self.config_path, subcmd);"},{"Add":" println!("},{"Add":" \"Running pijul with args: {:#?}\","},{"Add":" pijul_cmd"},{"Add":" .get_args()"},{"Add":" .collect::>()"},{"Add":" .join(OsStr::new(\" \"))"},{"Add":" );"},{"Add":" let mut session = Session::spawn(pijul_cmd)?;"},{"Add":""},{"Add":" Interaction::new(\"Do you wish to continue?\", InteractionType::Confirm(true))"},{"Add":" .interact(&mut session)?;"},{"Add":""},{"Add":" let status = session.wait()?;"},{"Add":" assert!(matches!(status, WaitStatus::Exited(_, exitcode::OK)));"},{"Add":" assert!(!self"},{"Add":" .config_path"},{"Add":" .join(\"identities\")"},{"Add":" .join(&self.id_name.valid_input().as_string())"},{"Add":" .exists());"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn subcommand_name(subcmd: &SubCommand) -> String {"},{"Add":" match subcmd {"},{"Add":" SubCommand::New => String::from(\"new\"),"},{"Add":" SubCommand::Edit(_) => String::from(\"edit\"),"},{"Add":" SubCommand::Remove => String::from(\"remove\"),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn generate_command(config_path: &PathBuf, subcmd: &SubCommand) -> Command {"},{"Add":" let mut pijul_cmd = Command::new(env!(\"CARGO_BIN_EXE_pijul\"));"},{"Add":" pijul_cmd.env(\"PIJUL_CONFIG_DIR\", config_path);"},{"Add":" pijul_cmd.arg(\"identity\");"},{"Add":""},{"Add":" let subcommand = subcommand_name(&subcmd);"},{"Add":" pijul_cmd.arg(&subcommand);"},{"Add":""},{"Add":" if subcommand == \"edit\" || subcommand == \"new\" {"},{"Add":" pijul_cmd.arg(\"--no-link\");"},{"Add":" }"},{"Add":""},{"Add":" pijul_cmd"},{"Add":"}"}]}}],"owner":"irevoire","repo":"pijul","token":"uqCrV0iDMdRqyxS0OZ+YFCHQuEnE22Ah61rDWdmUEXw=","login":null}

…

Dependencies

Change contents