ryzokuken/cosmoline
ryzokuken
/
cosmoline
2
2
Fork 1
Code Issues 5 Pull Requests 1 Projects 1 Releases Activity

src: move SSBKeypair to keypair.rs

This commit is contained in:
Ujjwal Sharma 2021-03-25 11:33:41 +05:30
parent ba1a5226d9
commit f2cfe7a056
Signed by: ryzokuken
GPG Key ID: 460B292812C67D9F
2 changed files with 73 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/keypair.rs Normal file
View File

@ -0,0 +1,70 @@
use ed25519_dalek::{Keypair, PublicKey, SecretKey};
use json::{object, JsonValue};
use rand::rngs::OsRng;
use regex::Regex;
use std::fs::File;
use std::path::PathBuf;
use std::io::prelude::*;
pub trait SSBKeypair {
fn to_json(&self) -> JsonValue;
fn from_json(obj: JsonValue) -> Self;
fn read_or_generate(path: PathBuf) -> Self;
}
impl SSBKeypair for Keypair {
fn to_json(&self) -> JsonValue {
let pubstring = base64::encode(self.public.to_bytes());
let privstring = base64::encode([self.secret.to_bytes(), self.public.to_bytes()].concat());
object! {
curve: "ed25519",
public: format!("{}.ed25519", pubstring),
private: format!("{}.ed25519", privstring),
id: format!("@{}.ed25519", pubstring)
}
}
fn from_json(obj: JsonValue) -> Self {
if obj["curve"].as_str().unwrap() != "ed25519" {
panic!("wrong curve");
}
let pubkey = obj["public"]
.as_str()
.unwrap()
.strip_suffix(".ed25519")
.unwrap();
let pubkey = base64::decode(pubkey).unwrap();
let pubkey = PublicKey::from_bytes(pubkey.as_slice()).unwrap();
let privkey = obj["private"]
.as_str()
.unwrap()
.strip_suffix(".ed25519")
.unwrap();
let privkey = base64::decode(privkey).unwrap();
let privkey = SecretKey::from_bytes(&privkey[00..32]).unwrap();
Keypair {
public: pubkey,
secret: privkey,
}
}
fn read_or_generate(path: PathBuf) -> Self {
if path.exists() {
let mut secret_file = File::open(path).unwrap();
let mut secret = String::new();
secret_file.read_to_string(&mut secret).unwrap();
let re = Regex::new(r"\s*#[^\n]*").unwrap();
let secret = re.replace_all(secret.as_str(), "");
SSBKeypair::from_json(json::parse(&secret).unwrap())
} else {
let mut csprng = OsRng {};
Keypair::generate(&mut csprng)
// TODO: write this keypair to a fresh secret file
}
}
}

66
src/main.rs
View File

@ -1,74 +1,14 @@
use clap::{load_yaml, App};
use ed25519_dalek::{Keypair, PublicKey, SecretKey};
use json::{object, JsonValue};
use rand::rngs::OsRng;
use regex::Regex;
use ed25519_dalek::Keypair;
use std::fs::File;
use std::path::PathBuf;
use std::io::prelude::*;
trait SSBKeypair {
fn to_json(&self) -> JsonValue;
fn from_json(obj: JsonValue) -> Self;
fn read_or_generate(path: PathBuf) -> Self;
}
mod keypair;
impl SSBKeypair for Keypair {
fn to_json(&self) -> JsonValue {
let pubstring = base64::encode(self.public.to_bytes());
let privstring = base64::encode([self.secret.to_bytes(), self.public.to_bytes()].concat());
object! {
curve: "ed25519",
public: format!("{}.ed25519", pubstring),
private: format!("{}.ed25519", privstring),
id: format!("@{}.ed25519", pubstring)
}
}
fn from_json(obj: JsonValue) -> Self {
if obj["curve"].as_str().unwrap() != "ed25519" {
panic!("wrong curve");
}
let pubkey = obj["public"]
.as_str()
.unwrap()
.strip_suffix(".ed25519")
.unwrap();
let pubkey = base64::decode(pubkey).unwrap();
let pubkey = PublicKey::from_bytes(pubkey.as_slice()).unwrap();
let privkey = obj["private"]
.as_str()
.unwrap()
.strip_suffix(".ed25519")
.unwrap();
let privkey = base64::decode(privkey).unwrap();
let privkey = SecretKey::from_bytes(&privkey[00..32]).unwrap();
Keypair {
public: pubkey,
secret: privkey,
}
}
fn read_or_generate(path: PathBuf) -> Self {
if path.exists() {
let mut secret_file = File::open(path).unwrap();
let mut secret = String::new();
secret_file.read_to_string(&mut secret).unwrap();
let re = Regex::new(r"\s*#[^\n]*").unwrap();
let secret = re.replace_all(secret.as_str(), "");
SSBKeypair::from_json(json::parse(&secret).unwrap())
} else {
let mut csprng = OsRng {};
Keypair::generate(&mut csprng)
// TODO: write this keypair to a fresh secret file
}
}
}
use keypair::SSBKeypair;
type Config = toml::map::Map<String, toml::Value>;