Added a ssh key selector for profiles
This commit is contained in:
1 parent
aa4d0d8e61
commit
c5932990be
1 file changed
+193
-20
+193
-20
@@ -371,6 +371,7 @@ struct Profile {
|
|||||||
auth: AuthMethod,
|
auth: AuthMethod,
|
||||||
password: String,
|
password: String,
|
||||||
start_path: String,
|
start_path: String,
|
||||||
|
private_key: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Editable state of the "add profile" dialog.
|
/// Editable state of the "add profile" dialog.
|
||||||
@@ -387,6 +388,7 @@ struct ProfileDraft {
|
|||||||
password: String,
|
password: String,
|
||||||
password_visible: bool,
|
password_visible: bool,
|
||||||
start_path: String,
|
start_path: String,
|
||||||
|
private_key: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ProfileDraft {
|
impl ProfileDraft {
|
||||||
@@ -403,6 +405,7 @@ impl ProfileDraft {
|
|||||||
password: String::new(),
|
password: String::new(),
|
||||||
password_visible: false,
|
password_visible: false,
|
||||||
start_path: default_start_path(),
|
start_path: default_start_path(),
|
||||||
|
private_key: String::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -434,19 +437,33 @@ impl std::fmt::Display for FolderChoice {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// In-app directory browser state.
|
/// Which profile field a path picker is filling.
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
enum PickerTarget {
|
||||||
|
StartPath,
|
||||||
|
PrivateKey,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// In-app path browser state. In folder mode only directories are listed and
|
||||||
|
/// the current directory can be chosen; in file mode files are listed too.
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
struct DirPicker {
|
struct DirPicker {
|
||||||
path: PathBuf,
|
path: PathBuf,
|
||||||
entries: Vec<PathBuf>,
|
entries: Vec<PathBuf>,
|
||||||
|
selected: Option<PathBuf>,
|
||||||
|
files: bool,
|
||||||
|
target: PickerTarget,
|
||||||
error: Option<String>,
|
error: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DirPicker {
|
impl DirPicker {
|
||||||
fn open(path: PathBuf) -> Self {
|
fn open(path: PathBuf, files: bool, target: PickerTarget) -> Self {
|
||||||
let mut picker = Self {
|
let mut picker = Self {
|
||||||
path,
|
path,
|
||||||
entries: Vec::new(),
|
entries: Vec::new(),
|
||||||
|
selected: None,
|
||||||
|
files,
|
||||||
|
target,
|
||||||
error: None,
|
error: None,
|
||||||
};
|
};
|
||||||
picker.reload();
|
picker.reload();
|
||||||
@@ -456,17 +473,28 @@ impl DirPicker {
|
|||||||
fn reload(&mut self) {
|
fn reload(&mut self) {
|
||||||
match std::fs::read_dir(&self.path) {
|
match std::fs::read_dir(&self.path) {
|
||||||
Ok(read) => {
|
Ok(read) => {
|
||||||
let mut entries: Vec<PathBuf> = read
|
let mut directories = Vec::new();
|
||||||
.filter_map(|entry| entry.ok())
|
let mut files = Vec::new();
|
||||||
.map(|entry| entry.path())
|
|
||||||
.filter(|path| path.is_dir())
|
for entry in read.filter_map(|entry| entry.ok()) {
|
||||||
.collect();
|
let path = entry.path();
|
||||||
entries.sort();
|
if path.is_dir() {
|
||||||
self.entries = entries;
|
directories.push(path);
|
||||||
|
} else if self.files {
|
||||||
|
files.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
directories.sort();
|
||||||
|
files.sort();
|
||||||
|
self.entries = directories;
|
||||||
|
self.entries.extend(files);
|
||||||
|
self.selected = None;
|
||||||
self.error = None;
|
self.error = None;
|
||||||
}
|
}
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
self.entries.clear();
|
self.entries.clear();
|
||||||
|
self.selected = None;
|
||||||
self.error = Some(error.to_string());
|
self.error = Some(error.to_string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -476,6 +504,10 @@ impl DirPicker {
|
|||||||
self.path = path;
|
self.path = path;
|
||||||
self.reload();
|
self.reload();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn can_confirm(&self) -> bool {
|
||||||
|
!self.files || self.selected.is_some()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn home_dir() -> PathBuf {
|
fn home_dir() -> PathBuf {
|
||||||
@@ -674,8 +706,11 @@ enum Message {
|
|||||||
ProfilePasswordChanged(String),
|
ProfilePasswordChanged(String),
|
||||||
TogglePasswordVisibility,
|
TogglePasswordVisibility,
|
||||||
ProfileStartPathChanged(String),
|
ProfileStartPathChanged(String),
|
||||||
|
ProfilePrivateKeyChanged(String),
|
||||||
OpenDirectoryPicker,
|
OpenDirectoryPicker,
|
||||||
|
OpenPrivateKeyPicker,
|
||||||
DirPickerEnter(PathBuf),
|
DirPickerEnter(PathBuf),
|
||||||
|
DirPickerSelect(PathBuf),
|
||||||
DirPickerUp,
|
DirPickerUp,
|
||||||
ConfirmDirectoryPicker,
|
ConfirmDirectoryPicker,
|
||||||
CancelDirectoryPicker,
|
CancelDirectoryPicker,
|
||||||
@@ -852,6 +887,11 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
|
|||||||
draft.start_path = value;
|
draft.start_path = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Message::ProfilePrivateKeyChanged(value) => {
|
||||||
|
if let Some(draft) = state.profile_dialog.as_mut() {
|
||||||
|
draft.private_key = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
Message::OpenDirectoryPicker => {
|
Message::OpenDirectoryPicker => {
|
||||||
let path = state
|
let path = state
|
||||||
.profile_dialog
|
.profile_dialog
|
||||||
@@ -860,13 +900,37 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
|
|||||||
.filter(|path| path.is_dir())
|
.filter(|path| path.is_dir())
|
||||||
.unwrap_or_else(home_dir);
|
.unwrap_or_else(home_dir);
|
||||||
|
|
||||||
state.dir_picker = Some(DirPicker::open(path));
|
state.dir_picker = Some(DirPicker::open(path, false, PickerTarget::StartPath));
|
||||||
|
}
|
||||||
|
Message::OpenPrivateKeyPicker => {
|
||||||
|
let typed = state
|
||||||
|
.profile_dialog
|
||||||
|
.as_ref()
|
||||||
|
.map(|draft| resolve_start_path(&draft.private_key))
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
let directory = if typed.is_dir() {
|
||||||
|
typed
|
||||||
|
} else {
|
||||||
|
typed
|
||||||
|
.parent()
|
||||||
|
.filter(|path| path.is_dir())
|
||||||
|
.map(PathBuf::from)
|
||||||
|
.unwrap_or_else(home_dir)
|
||||||
|
};
|
||||||
|
|
||||||
|
state.dir_picker = Some(DirPicker::open(directory, true, PickerTarget::PrivateKey));
|
||||||
}
|
}
|
||||||
Message::DirPickerEnter(path) => {
|
Message::DirPickerEnter(path) => {
|
||||||
if let Some(picker) = state.dir_picker.as_mut() {
|
if let Some(picker) = state.dir_picker.as_mut() {
|
||||||
picker.navigate(path);
|
picker.navigate(path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Message::DirPickerSelect(path) => {
|
||||||
|
if let Some(picker) = state.dir_picker.as_mut() {
|
||||||
|
picker.selected = Some(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
Message::DirPickerUp => {
|
Message::DirPickerUp => {
|
||||||
if let Some(picker) = state.dir_picker.as_mut() {
|
if let Some(picker) = state.dir_picker.as_mut() {
|
||||||
if let Some(parent) = picker.path.parent().map(PathBuf::from) {
|
if let Some(parent) = picker.path.parent().map(PathBuf::from) {
|
||||||
@@ -876,8 +940,17 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
|
|||||||
}
|
}
|
||||||
Message::ConfirmDirectoryPicker => {
|
Message::ConfirmDirectoryPicker => {
|
||||||
if let Some(picker) = state.dir_picker.take() {
|
if let Some(picker) = state.dir_picker.take() {
|
||||||
if let Some(draft) = state.profile_dialog.as_mut() {
|
let value = match picker.target {
|
||||||
draft.start_path = picker.path.to_string_lossy().into_owned();
|
PickerTarget::StartPath => Some(picker.path.clone()),
|
||||||
|
PickerTarget::PrivateKey => picker.selected.clone(),
|
||||||
|
};
|
||||||
|
|
||||||
|
if let (Some(value), Some(draft)) = (value, state.profile_dialog.as_mut()) {
|
||||||
|
let value = value.to_string_lossy().into_owned();
|
||||||
|
match picker.target {
|
||||||
|
PickerTarget::StartPath => draft.start_path = value,
|
||||||
|
PickerTarget::PrivateKey => draft.private_key = value,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -906,6 +979,7 @@ fn update(state: &mut Moorly, message: Message) -> Task<Message> {
|
|||||||
auth: draft.auth,
|
auth: draft.auth,
|
||||||
password: draft.password.clone(),
|
password: draft.password.clone(),
|
||||||
start_path: draft.start_path.clone(),
|
start_path: draft.start_path.clone(),
|
||||||
|
private_key: draft.private_key.clone(),
|
||||||
});
|
});
|
||||||
folder.expanded = true;
|
folder.expanded = true;
|
||||||
state.selected = Some(Selection::Profile {
|
state.selected = Some(Selection::Profile {
|
||||||
@@ -1481,7 +1555,7 @@ fn profiles_panel(state: &Moorly) -> Element<'_, Message> {
|
|||||||
layers.into()
|
layers.into()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Folder browser used by the Terminal "Start path" field.
|
/// Folder/file browser used by the Terminal start path and SSH private key.
|
||||||
fn directory_picker_view(picker: &DirPicker) -> Element<'_, Message> {
|
fn directory_picker_view(picker: &DirPicker) -> Element<'_, Message> {
|
||||||
let mut entries = column![].width(Length::Fill);
|
let mut entries = column![].width(Length::Fill);
|
||||||
|
|
||||||
@@ -1496,21 +1570,32 @@ fn directory_picker_view(picker: &DirPicker) -> Element<'_, Message> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for path in &picker.entries {
|
for path in &picker.entries {
|
||||||
|
let is_dir = path.is_dir();
|
||||||
let name = path
|
let name = path
|
||||||
.file_name()
|
.file_name()
|
||||||
.map(|name| name.to_string_lossy().into_owned())
|
.map(|name| name.to_string_lossy().into_owned())
|
||||||
.unwrap_or_else(|| path.display().to_string());
|
.unwrap_or_else(|| path.display().to_string());
|
||||||
|
|
||||||
|
let glyph = if is_dir { "📁" } else { "📄" };
|
||||||
|
let message = if is_dir {
|
||||||
|
Message::DirPickerEnter(path.clone())
|
||||||
|
} else {
|
||||||
|
Message::DirPickerSelect(path.clone())
|
||||||
|
};
|
||||||
|
let selected = picker.selected.as_ref() == Some(path);
|
||||||
|
|
||||||
entries = entries.push(
|
entries = entries.push(
|
||||||
button(
|
button(
|
||||||
row![text("📁").size(14), text(name)]
|
row![text(glyph).size(14), text(name)]
|
||||||
.spacing(8)
|
.spacing(8)
|
||||||
.align_y(Alignment::Center),
|
.align_y(Alignment::Center),
|
||||||
)
|
)
|
||||||
.on_press(Message::DirPickerEnter(path.clone()))
|
.on_press(message)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.padding([6, 8])
|
.padding([6, 8])
|
||||||
.style(button::text),
|
.style(move |theme, status| {
|
||||||
|
theme::selectable_row(theme, status, selected)
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1519,14 +1604,24 @@ fn directory_picker_view(picker: &DirPicker) -> Element<'_, Message> {
|
|||||||
.height(240)
|
.height(240)
|
||||||
.style(theme::settings_frame);
|
.style(theme::settings_frame);
|
||||||
|
|
||||||
|
let title = if picker.files {
|
||||||
|
"Select private key"
|
||||||
|
} else {
|
||||||
|
"Select folder"
|
||||||
|
};
|
||||||
|
|
||||||
let mut content = column![
|
let mut content = column![
|
||||||
text("Select folder").size(16),
|
text(title).size(16),
|
||||||
text(picker.path.display().to_string()).size(12),
|
text(picker.path.display().to_string()).size(12),
|
||||||
listing,
|
listing,
|
||||||
]
|
]
|
||||||
.spacing(10)
|
.spacing(10)
|
||||||
.width(Length::Fill);
|
.width(Length::Fill);
|
||||||
|
|
||||||
|
if let Some(selected) = &picker.selected {
|
||||||
|
content = content.push(text(selected.display().to_string()).size(12));
|
||||||
|
}
|
||||||
|
|
||||||
if let Some(error) = &picker.error {
|
if let Some(error) = &picker.error {
|
||||||
content = content.push(text(error).size(12).color(theme::DANGER));
|
content = content.push(text(error).size(12).color(theme::DANGER));
|
||||||
}
|
}
|
||||||
@@ -1538,7 +1633,7 @@ fn directory_picker_view(picker: &DirPicker) -> Element<'_, Message> {
|
|||||||
.on_press(Message::CancelDirectoryPicker)
|
.on_press(Message::CancelDirectoryPicker)
|
||||||
.style(theme::danger_option),
|
.style(theme::danger_option),
|
||||||
button("Select")
|
button("Select")
|
||||||
.on_press(Message::ConfirmDirectoryPicker)
|
.on_press_maybe(picker.can_confirm().then_some(Message::ConfirmDirectoryPicker))
|
||||||
.style(theme::positive_option),
|
.style(theme::positive_option),
|
||||||
]
|
]
|
||||||
.spacing(8),
|
.spacing(8),
|
||||||
@@ -1669,7 +1764,9 @@ fn profile_kind_view(draft: &ProfileDraft) -> Element<'_, Message> {
|
|||||||
button("...")
|
button("...")
|
||||||
.on_press(Message::OpenDirectoryPicker)
|
.on_press(Message::OpenDirectoryPicker)
|
||||||
.padding([2, 6])
|
.padding([2, 6])
|
||||||
.style(button::text),
|
.style(|theme, status| {
|
||||||
|
theme::selectable_row(theme, status, false)
|
||||||
|
}),
|
||||||
)
|
)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
@@ -1760,6 +1857,10 @@ fn profile_kind_view(draft: &ProfileDraft) -> Element<'_, Message> {
|
|||||||
content = content.push(password_field(draft));
|
content = content.push(password_field(draft));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if draft.auth == AuthMethod::Key {
|
||||||
|
content = content.push(private_key_field(draft));
|
||||||
|
}
|
||||||
|
|
||||||
content.into()
|
content.into()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1825,6 +1926,41 @@ fn password_field(draft: &ProfileDraft) -> Element<'_, Message> {
|
|||||||
.into()
|
.into()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Private key label and file field with a browse button.
|
||||||
|
fn private_key_field(draft: &ProfileDraft) -> Element<'_, Message> {
|
||||||
|
let field = text_input("Private key", &draft.private_key)
|
||||||
|
.on_input(Message::ProfilePrivateKeyChanged)
|
||||||
|
.padding(Padding {
|
||||||
|
top: 6.0,
|
||||||
|
right: 40.0,
|
||||||
|
bottom: 6.0,
|
||||||
|
left: 8.0,
|
||||||
|
})
|
||||||
|
.style(theme::filter_field)
|
||||||
|
.width(Length::Fill);
|
||||||
|
|
||||||
|
let browse = container(
|
||||||
|
button("...")
|
||||||
|
.on_press(Message::OpenPrivateKeyPicker)
|
||||||
|
.padding([2, 6])
|
||||||
|
.style(|theme, status| {
|
||||||
|
theme::selectable_row(theme, status, false)
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.width(Length::Fill)
|
||||||
|
.height(Length::Fill)
|
||||||
|
.align_x(Alignment::End)
|
||||||
|
.align_y(Alignment::Center)
|
||||||
|
.padding(Padding::ZERO.right(6.0));
|
||||||
|
|
||||||
|
column![
|
||||||
|
text("Private Key").size(12),
|
||||||
|
stack![field, browse].width(Length::Fill),
|
||||||
|
]
|
||||||
|
.spacing(4)
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
/// One folder heading followed by its profiles. Clicking the heading toggles
|
/// One folder heading followed by its profiles. Clicking the heading toggles
|
||||||
/// the profile list; clicking a row selects it.
|
/// the profile list; clicking a row selects it.
|
||||||
fn profile_folder_row(
|
fn profile_folder_row(
|
||||||
@@ -2653,13 +2789,50 @@ mod tests {
|
|||||||
let child = root.join("child");
|
let child = root.join("child");
|
||||||
std::fs::create_dir_all(&child).unwrap();
|
std::fs::create_dir_all(&child).unwrap();
|
||||||
|
|
||||||
let picker = super::DirPicker::open(root.clone());
|
let picker = super::DirPicker::open(
|
||||||
|
root.clone(),
|
||||||
|
false,
|
||||||
|
super::PickerTarget::StartPath,
|
||||||
|
);
|
||||||
assert_eq!(picker.entries, vec![child]);
|
assert_eq!(picker.entries, vec![child]);
|
||||||
assert!(picker.error.is_none());
|
assert!(picker.error.is_none());
|
||||||
|
|
||||||
std::fs::remove_dir_all(&root).unwrap();
|
std::fs::remove_dir_all(&root).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn private_key_picker_selects_a_file() {
|
||||||
|
let stamp = std::time::SystemTime::now()
|
||||||
|
.duration_since(std::time::UNIX_EPOCH)
|
||||||
|
.unwrap()
|
||||||
|
.as_nanos();
|
||||||
|
let root = std::env::temp_dir().join(format!("moorly-key-test-{stamp}"));
|
||||||
|
std::fs::create_dir_all(&root).unwrap();
|
||||||
|
let key = root.join("id_test");
|
||||||
|
std::fs::write(&key, b"key").unwrap();
|
||||||
|
|
||||||
|
let mut picker =
|
||||||
|
super::DirPicker::open(root.clone(), true, super::PickerTarget::PrivateKey);
|
||||||
|
assert_eq!(picker.entries, vec![key.clone()]);
|
||||||
|
assert!(!picker.can_confirm());
|
||||||
|
|
||||||
|
picker.selected = Some(key.clone());
|
||||||
|
assert!(picker.can_confirm());
|
||||||
|
|
||||||
|
let mut state = state();
|
||||||
|
state.profile_dialog = Some(super::ProfileDraft::new(0));
|
||||||
|
state.dir_picker = Some(picker);
|
||||||
|
let _ = update(&mut state, Message::ConfirmDirectoryPicker);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
state.profile_dialog.as_ref().unwrap().private_key,
|
||||||
|
key.to_string_lossy()
|
||||||
|
);
|
||||||
|
assert!(state.dir_picker.is_none());
|
||||||
|
|
||||||
|
std::fs::remove_dir_all(&root).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn adding_a_folder_selects_it() {
|
fn adding_a_folder_selects_it() {
|
||||||
let mut state = state();
|
let mut state = state();
|
||||||
|
|||||||
Reference in new issue
Block a user