ui(credentails): loading key
This commit is contained in:
Binary file not shown.
@@ -0,0 +1,107 @@
|
||||
use std::{
|
||||
sync::Arc,
|
||||
rc::Rc, cell::RefCell
|
||||
};
|
||||
|
||||
use alfis::Keystore;
|
||||
use crate::{Mutex, Context, ui::KeyData};
|
||||
use log::{error, info, warn};
|
||||
|
||||
use gtk::{
|
||||
prelude::*,
|
||||
ApplicationWindow,
|
||||
Button,
|
||||
Label,
|
||||
Box,
|
||||
Orientation,
|
||||
Entry,
|
||||
FileDialog
|
||||
};
|
||||
|
||||
|
||||
pub fn menu_credentials(window: &ApplicationWindow, parent: >k::Box, context: &Arc<Mutex<Context>>) {
|
||||
let key_data = Rc::new(RefCell::from(KeyData{hash: String::new(), path: String::new(), public: String::new()}));
|
||||
let keys = Box::new(Orientation::Horizontal, 8);
|
||||
keys.set_hexpand(true);
|
||||
parent.append(&keys);
|
||||
|
||||
let key_hash = Entry::builder()
|
||||
.placeholder_text("No key loaded")
|
||||
.editable(false)
|
||||
.tooltip_text("If you load or mine a keypair the public key will be displayed here")
|
||||
.hexpand(true)
|
||||
.focusable(false)
|
||||
.build();
|
||||
keys.append(&key_hash);
|
||||
|
||||
let load_btn = Button::with_label("Load key");
|
||||
|
||||
let window = window.clone();
|
||||
let context = context.clone();
|
||||
load_btn.connect_clicked(move |_| {
|
||||
open_file(&window, &key_hash, &context, key_data.clone());
|
||||
});
|
||||
keys.append(&load_btn);
|
||||
|
||||
let save_btn = Button::builder()
|
||||
.label("Save key")
|
||||
.sensitive(false)
|
||||
.build();
|
||||
keys.append(&save_btn);
|
||||
|
||||
let mine_btn = Button::with_label("Mine new key");
|
||||
mine_btn.add_css_class("suggested-action");
|
||||
keys.append(&mine_btn);
|
||||
|
||||
parent.append(&Label::new(Some("To mine domains you need a strong pair of signing keys and a pair of ecryption keys.")));
|
||||
}
|
||||
|
||||
fn open_file(window: &ApplicationWindow, key_hash: &Entry ,context: &Arc<Mutex<Context>>, keydata: Rc<RefCell<KeyData>>) {
|
||||
let filter = gtk::FileFilter::new();
|
||||
filter.add_pattern("*.key");
|
||||
filter.add_pattern("*.toml");
|
||||
filter.set_name(Some("Key files"));
|
||||
|
||||
let fc = FileDialog::builder()
|
||||
.title("Select key")
|
||||
.default_filter(&filter)
|
||||
.build();
|
||||
|
||||
let context = context.clone();
|
||||
let key_hash = key_hash.clone();
|
||||
fc.open(Some(window), None::<gtk::gio::Cancellable>.as_ref(), move |result| {
|
||||
match result {
|
||||
Ok(file) => {
|
||||
match Keystore::from_file(file.path().unwrap().to_str().unwrap(), "") {
|
||||
None => {
|
||||
error!("Error loading keystore '{}'!", &file.path().unwrap().to_str().unwrap());
|
||||
// show_warning(web_view, "Error loading key!<br>Key cannot be loaded or its difficulty is not enough."); # TODO: display warnings
|
||||
// event_fail(web_view, &format!("Error loading key from \\'{}\\'!", &file_name));
|
||||
}
|
||||
Some(keystore) => {
|
||||
info!("Loaded keystore with keys: {:?}, {:?}", &keystore.get_public(), &keystore.get_encryption_public());
|
||||
|
||||
let path = keystore.get_path().to_owned();
|
||||
let public = keystore.get_public().to_string();
|
||||
let hash = keystore.get_hash().to_string();
|
||||
let _ = &key_hash.set_text(public.as_str());
|
||||
|
||||
let key_data = KeyData { path, public, hash };
|
||||
*keydata.borrow_mut() = key_data;
|
||||
|
||||
if !context.lock().unwrap().select_key_by_public(&keystore.get_public()) {
|
||||
context.lock().unwrap().add_keystore(keystore);
|
||||
} else {
|
||||
warn!("This key is already loaded!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
if !e.matches(gtk::gio::IOErrorEnum::Cancelled) {
|
||||
error!("Error selecting file: {}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
+3
-106
@@ -1,4 +1,6 @@
|
||||
#[warn(unused_imports)]
|
||||
mod credentails;
|
||||
|
||||
use alfis::{
|
||||
blockchain::{
|
||||
transaction::DomainData,
|
||||
@@ -13,7 +15,6 @@ use alfis::{
|
||||
keystore, Block, Bytes, Context, Keystore, Transaction
|
||||
};
|
||||
|
||||
|
||||
use std::{
|
||||
sync::{Arc, Mutex, MutexGuard},
|
||||
thread,
|
||||
@@ -35,8 +36,6 @@ use gtk::{
|
||||
FileDialog
|
||||
};
|
||||
|
||||
// use glib::{Sender, Receiver, MainContext, PRIORITY_DEFAULT};
|
||||
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct KeyData {
|
||||
@@ -44,12 +43,8 @@ pub struct KeyData {
|
||||
pub public: String,
|
||||
pub hash: String,
|
||||
}
|
||||
// static mut KEY_DATA: KeyData = KeyData { path: String::new(), public: String::new(), hash: String::new() };
|
||||
// let (sender, receiver) = MainContext::channel(PRIORITY_DEFAULT);
|
||||
|
||||
|
||||
// pub use run_ui;
|
||||
|
||||
#[warn(unused_variables)]
|
||||
pub fn run_ui(context: Arc<Mutex<Context>>, miner: Arc<Mutex<Miner>>) -> glib::ExitCode {
|
||||
let application = adw::Application::builder()
|
||||
@@ -64,119 +59,21 @@ pub fn run_ui(context: Arc<Mutex<Context>>, miner: Arc<Mutex<Miner>>) -> glib::E
|
||||
.default_width(1023)
|
||||
.default_height(720)
|
||||
.resizable(false)
|
||||
// .show_menubar(true)
|
||||
.build();
|
||||
let ab = HeaderBar::new();
|
||||
// ab.pack_start(&Label::new(Some("Application name")));
|
||||
window.set_titlebar(Some(&ab));
|
||||
|
||||
let nb = Notebook::new();
|
||||
window.set_child(Some(&nb));
|
||||
|
||||
let main = Box::new(Orientation::Vertical, 5);
|
||||
// main.set_hexpand(true);
|
||||
menu_credentials(&window, &main, &context);
|
||||
credentails::menu_credentials(&window, &main, &context);
|
||||
|
||||
|
||||
nb.append_page(&main, Some(&Label::new(Some("Credentials"))));
|
||||
|
||||
|
||||
// window.set_child(Some(&main));
|
||||
window.present();
|
||||
});
|
||||
|
||||
application.run()
|
||||
}
|
||||
|
||||
fn menu_credentials(window: &ApplicationWindow, parent: >k::Box, context: &Arc<Mutex<Context>>) {
|
||||
let key_data = Rc::new(RefCell::from(KeyData{hash: String::new(), path: String::new(), public: String::new()}));
|
||||
let keys = Box::new(Orientation::Horizontal, 8);
|
||||
keys.set_hexpand(true);
|
||||
parent.append(&keys);
|
||||
|
||||
let key_hash = Entry::builder()
|
||||
.placeholder_text("No key loaded")
|
||||
.editable(false)
|
||||
.tooltip_text("If you load or mine a keypair the public key will be displayed here")
|
||||
.hexpand(true)
|
||||
.focusable(false)
|
||||
.build();
|
||||
keys.append(&key_hash);
|
||||
|
||||
let load_btn = Button::with_label("Load key");
|
||||
|
||||
let window = window.clone();
|
||||
let context = context.clone();
|
||||
load_btn.connect_clicked(move |_| {
|
||||
open_file(&window, &context, key_data.clone());
|
||||
key_hash.set_text(key_data.borrow().public.as_str());
|
||||
});
|
||||
keys.append(&load_btn);
|
||||
|
||||
let save_btn = Button::builder()
|
||||
.label("Save key")
|
||||
.sensitive(false)
|
||||
.build();
|
||||
keys.append(&save_btn);
|
||||
|
||||
let mine_btn = Button::with_label("Mine new key");
|
||||
mine_btn.add_css_class("suggested-action");
|
||||
keys.append(&mine_btn);
|
||||
|
||||
parent.append(&Label::new(Some("To mine domains you need a strong pair of signing keys and a pair of ecryption keys.")));
|
||||
}
|
||||
|
||||
fn open_file(window: &ApplicationWindow, context: &Arc<Mutex<Context>>, keydata: Rc<RefCell<KeyData>>) {
|
||||
let filter = gtk::FileFilter::new();
|
||||
filter.add_pattern("*.key");
|
||||
filter.add_pattern("*.toml");
|
||||
filter.set_name(Some("Key files"));
|
||||
|
||||
let fc = FileDialog::builder()
|
||||
.title("Select key")
|
||||
.default_filter(&filter)
|
||||
.build();
|
||||
|
||||
// let window = window.clone();
|
||||
let context = context.clone();
|
||||
fc.open(Some(window), None::<gtk::gio::Cancellable>.as_ref(), move |result| {
|
||||
match result {
|
||||
Ok(file) => {
|
||||
match Keystore::from_file(file.path().unwrap().to_str().unwrap(), "") {
|
||||
None => {
|
||||
// todo!("Setup error messages");
|
||||
/*error*/eprintln!("Error loading keystore '{}'!", &file.path().unwrap().to_str().unwrap());
|
||||
// show_warning(web_view, "Error loading key!<br>Key cannot be loaded or its difficulty is not enough.");
|
||||
// event_fail(web_view, &format!("Error loading key from \\'{}\\'!", &file_name));
|
||||
}
|
||||
Some(keystore) => {
|
||||
// todo!("Setup info messages");
|
||||
// info!("Loaded keystore with keys: {:?}, {:?}", &keystore.get_public(), &keystore.get_encryption_public());
|
||||
let path = keystore.get_path().to_owned();
|
||||
let public = keystore.get_public().to_string();
|
||||
let hash = keystore.get_hash().to_string();
|
||||
eprintln!("Key: {}, {}, {}", path, public, hash);
|
||||
// post(Event::KeyLoaded { path, public, hash });
|
||||
|
||||
let key_data = KeyData { path, public, hash };
|
||||
keydata.replace(key_data);
|
||||
// let (sender, _) = MainContext:: ::channel(PRIORITY_DEFAULT);
|
||||
// sender.send(key_data).expect("Failed to send key data to UI");
|
||||
|
||||
if !context.lock().unwrap().select_key_by_public(&keystore.get_public()) {
|
||||
context.lock().unwrap().add_keystore(keystore);
|
||||
} else {
|
||||
todo!();
|
||||
// warn!("This key is already loaded!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
if !e.matches(gtk::gio::IOErrorEnum::Cancelled) {
|
||||
eprintln!("Error selecting file: {}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user