mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 10:21:52 +00:00
* add support for inbound proxies * backend changes * fix file type * proxy -> tunnel, implement backend apis * wip start-tunneld * add domains and gateways, remove routers, fix docs links * dont show hidden actions * show and test dns * edit instead of chnage acme and change gateway * refactor: domains page * refactor: gateways page * domains and acme refactor * certificate authorities * refactor public/private gateways * fix fe types * domains mostly finished * refactor: add file control to form service * add ip util to sdk * domains api + migration * start service interface page, WIP * different options for clearnet domains * refactor: styles for interfaces page * minor * better placeholder for no addresses * start sorting addresses * best address logic * comments * fix unnecessary export * MVP of service interface page * domains preferred * fix: address comments * only translations left * wip: start-tunnel & fix build * forms for adding domain, rework things based on new ideas * fix: dns testing * public domain, max width, descriptions for dns * nix StartOS domains, implement public and private domains at interface scope * restart tor instead of reset * better icon for restart tor * dns * fix sort functions for public and private domains * with todos * update types * clean up tech debt, bump dependencies * revert to ts-rs v9 * fix all types * fix dns form * add missing translations * it builds * fix: comments (#3009) * fix: comments * undo default --------- Co-authored-by: Matt Hill <mattnine@protonmail.com> * fix: refactor legacy components (#3010) * fix: comments * fix: refactor legacy components * remove default again --------- Co-authored-by: Matt Hill <mattnine@protonmail.com> * more translations * wip * fix deadlock * coukd work * simple renaming * placeholder for empty service interfaces table * honor hidden form values * remove logs * reason instead of description * fix dns * misc fixes * implement toggling gateways for service interface * fix showing dns records * move status column in service list * remove unnecessary truthy check * refactor: refactor forms components and remove legacy Taiga UI package (#3012) * handle wh file uploads * wip: debugging tor * socks5 proxy working * refactor: fix multiple comments (#3013) * refactor: fix multiple comments * styling changes, add documentation to sidebar * translations for dns page * refactor: subtle colors * rearrange service page --------- Co-authored-by: Matt Hill <mattnine@protonmail.com> * fix file_stream and remove non-terminating test * clean up logs * support for sccache * fix gha sccache * more marketplace translations * install wizard clarity * stub hostnameInfo in migration * fix address info after setup, fix styling on SI page, new 040 release notes * remove tor logs from os * misc fixes * reset tor still not functioning... * update ts * minor styling and wording * chore: some fixes (#3015) * fix gateway renames * different handling for public domains * styling fixes * whole navbar should not be clickable on service show page * timeout getState request * remove links from changelog * misc fixes from pairing * use custom name for gateway in more places * fix dns parsing * closes #3003 * closes #2999 * chore: some fixes (#3017) * small copy change * revert hardcoded error for testing * dont require port forward if gateway is public * use old wan ip when not available * fix .const hanging on undefined * fix test * fix doc test * fix renames * update deps * allow specifying dependency metadata directly * temporarily make dependencies not cliackable in marketplace listings * fix socks bind * fix test --------- Co-authored-by: Aiden McClelland <me@drbonez.dev> Co-authored-by: waterplea <alexander@inkin.ru>
320 lines
8.6 KiB
Rust
320 lines
8.6 KiB
Rust
use std::collections::BTreeMap;
|
|
use std::path::Path;
|
|
|
|
use clap::Parser;
|
|
use clap::builder::ValueParserFactory;
|
|
use imbl_value::InternedString;
|
|
use models::FromStrParser;
|
|
use rpc_toolkit::{Context, Empty, HandlerExt, ParentHandler, from_fn_async};
|
|
use serde::{Deserialize, Serialize};
|
|
use tokio::fs::OpenOptions;
|
|
use tokio::process::Command;
|
|
use tracing::instrument;
|
|
use ts_rs::TS;
|
|
|
|
use crate::context::{CliContext, RpcContext};
|
|
use crate::hostname::Hostname;
|
|
use crate::prelude::*;
|
|
use crate::util::Invoke;
|
|
use crate::util::io::create_file;
|
|
use crate::util::serde::{HandlerExtSerde, Pem, WithIoFormat, display_serializable};
|
|
|
|
pub const SSH_DIR: &str = "/home/start9/.ssh";
|
|
|
|
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
|
pub struct SshKeys(BTreeMap<InternedString, WithTimeData<SshPubKey>>);
|
|
impl SshKeys {
|
|
pub fn new() -> Self {
|
|
Self(BTreeMap::new())
|
|
}
|
|
}
|
|
|
|
impl From<BTreeMap<InternedString, WithTimeData<SshPubKey>>> for SshKeys {
|
|
fn from(map: BTreeMap<InternedString, WithTimeData<SshPubKey>>) -> Self {
|
|
Self(map)
|
|
}
|
|
}
|
|
impl Map for SshKeys {
|
|
type Key = InternedString;
|
|
type Value = WithTimeData<SshPubKey>;
|
|
fn key_str(key: &Self::Key) -> Result<impl AsRef<str>, Error> {
|
|
Ok(key)
|
|
}
|
|
fn key_string(key: &Self::Key) -> Result<InternedString, Error> {
|
|
Ok(key.clone())
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, TS)]
|
|
#[ts(type = "string")]
|
|
pub struct SshPubKey(
|
|
#[serde(serialize_with = "crate::util::serde::serialize_display")]
|
|
#[serde(deserialize_with = "crate::util::serde::deserialize_from_str")]
|
|
pub openssh_keys::PublicKey,
|
|
);
|
|
impl ValueParserFactory for SshPubKey {
|
|
type Parser = FromStrParser<Self>;
|
|
fn value_parser() -> Self::Parser {
|
|
FromStrParser::new()
|
|
}
|
|
}
|
|
|
|
#[derive(serde::Serialize, serde::Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct SshKeyResponse {
|
|
pub alg: String,
|
|
pub fingerprint: InternedString,
|
|
pub hostname: String,
|
|
pub created_at: String,
|
|
}
|
|
impl std::fmt::Display for SshKeyResponse {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
|
write!(
|
|
f,
|
|
"{} {} {} {}",
|
|
self.created_at, self.alg, self.fingerprint, self.hostname
|
|
)
|
|
}
|
|
}
|
|
|
|
impl std::str::FromStr for SshPubKey {
|
|
type Err = Error;
|
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
s.parse()
|
|
.map(|pk| SshPubKey(pk))
|
|
.with_kind(ErrorKind::ParseSshKey)
|
|
}
|
|
}
|
|
|
|
// #[command(subcommands(add, delete, list,))]
|
|
pub fn ssh<C: Context>() -> ParentHandler<C> {
|
|
ParentHandler::new()
|
|
.subcommand(
|
|
"add",
|
|
from_fn_async(add)
|
|
.no_display()
|
|
.with_about("Add ssh key")
|
|
.with_call_remote::<CliContext>(),
|
|
)
|
|
.subcommand(
|
|
"remove",
|
|
from_fn_async(remove)
|
|
.no_display()
|
|
.with_about("Remove ssh key")
|
|
.with_call_remote::<CliContext>(),
|
|
)
|
|
.subcommand(
|
|
"list",
|
|
from_fn_async(list)
|
|
.with_display_serializable()
|
|
.with_custom_display_fn(|handle, result| {
|
|
display_all_ssh_keys(handle.params, result)
|
|
})
|
|
.with_about("List ssh keys")
|
|
.with_call_remote::<CliContext>(),
|
|
)
|
|
}
|
|
|
|
#[derive(Deserialize, Serialize, Parser, TS)]
|
|
#[serde(rename_all = "camelCase")]
|
|
#[command(rename_all = "kebab-case")]
|
|
pub struct AddParams {
|
|
key: SshPubKey,
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result<SshKeyResponse, Error> {
|
|
let mut key = WithTimeData::new(key);
|
|
let fingerprint = InternedString::intern(key.0.fingerprint_md5());
|
|
let (keys, res) = ctx
|
|
.db
|
|
.mutate(move |m| {
|
|
m.as_private_mut()
|
|
.as_ssh_pubkeys_mut()
|
|
.insert(&fingerprint, &key)?;
|
|
|
|
Ok((
|
|
m.as_private().as_ssh_pubkeys().de()?,
|
|
SshKeyResponse {
|
|
alg: key.0.keytype().to_owned(),
|
|
fingerprint,
|
|
hostname: key.0.comment.take().unwrap_or_default(),
|
|
created_at: key.created_at.to_rfc3339(),
|
|
},
|
|
))
|
|
})
|
|
.await
|
|
.result?;
|
|
sync_pubkeys(&keys, SSH_DIR).await?;
|
|
Ok(res)
|
|
}
|
|
|
|
#[derive(Deserialize, Serialize, Parser, TS)]
|
|
#[serde(rename_all = "camelCase")]
|
|
#[command(rename_all = "kebab-case")]
|
|
pub struct DeleteParams {
|
|
#[ts(type = "string")]
|
|
fingerprint: InternedString,
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn remove(
|
|
ctx: RpcContext,
|
|
DeleteParams { fingerprint }: DeleteParams,
|
|
) -> Result<(), Error> {
|
|
let keys = ctx
|
|
.db
|
|
.mutate(|m| {
|
|
let keys_ref = m.as_private_mut().as_ssh_pubkeys_mut();
|
|
if keys_ref.remove(&fingerprint)?.is_some() {
|
|
keys_ref.de()
|
|
} else {
|
|
Err(Error::new(eyre!("SSH Key Not Found"), ErrorKind::NotFound))
|
|
}
|
|
})
|
|
.await
|
|
.result?;
|
|
sync_pubkeys(&keys, SSH_DIR).await
|
|
}
|
|
|
|
fn display_all_ssh_keys(
|
|
params: WithIoFormat<Empty>,
|
|
result: Vec<SshKeyResponse>,
|
|
) -> Result<(), Error> {
|
|
use prettytable::*;
|
|
|
|
if let Some(format) = params.format {
|
|
return display_serializable(format, params);
|
|
}
|
|
|
|
let mut table = Table::new();
|
|
table.add_row(row![bc =>
|
|
"CREATED AT",
|
|
"ALGORITHM",
|
|
"FINGERPRINT",
|
|
"HOSTNAME",
|
|
]);
|
|
for key in result {
|
|
let row = row![
|
|
&format!("{}", key.created_at),
|
|
&key.alg,
|
|
&key.fingerprint,
|
|
&key.hostname,
|
|
];
|
|
table.add_row(row);
|
|
}
|
|
table.print_tty(false)?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn list(ctx: RpcContext) -> Result<Vec<SshKeyResponse>, Error> {
|
|
ctx.db
|
|
.peek()
|
|
.await
|
|
.into_private()
|
|
.into_ssh_pubkeys()
|
|
.into_entries()?
|
|
.into_iter()
|
|
.map(|(fingerprint, key)| {
|
|
let mut key = key.de()?;
|
|
Ok(SshKeyResponse {
|
|
alg: key.0.keytype().to_owned(),
|
|
fingerprint,
|
|
hostname: key.0.comment.take().unwrap_or_default(),
|
|
created_at: key.created_at.to_rfc3339(),
|
|
})
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn sync_keys<P: AsRef<Path>>(
|
|
hostname: &Hostname,
|
|
privkey: &Pem<ssh_key::PrivateKey>,
|
|
pubkeys: &SshKeys,
|
|
ssh_dir: P,
|
|
) -> Result<(), Error> {
|
|
use tokio::io::AsyncWriteExt;
|
|
|
|
let ssh_dir = ssh_dir.as_ref();
|
|
if tokio::fs::metadata(ssh_dir).await.is_err() {
|
|
tokio::fs::create_dir_all(ssh_dir).await?;
|
|
}
|
|
|
|
let id_alg = if privkey.0.algorithm().is_ed25519() {
|
|
"id_ed25519"
|
|
} else if privkey.0.algorithm().is_ecdsa() {
|
|
"id_ecdsa"
|
|
} else if privkey.0.algorithm().is_rsa() {
|
|
"id_rsa"
|
|
} else {
|
|
"id_unknown"
|
|
};
|
|
|
|
let privkey_path = ssh_dir.join(id_alg);
|
|
let mut f = OpenOptions::new()
|
|
.create(true)
|
|
.write(true)
|
|
.mode(0o600)
|
|
.open(&privkey_path)
|
|
.await
|
|
.with_ctx(|_| {
|
|
(
|
|
ErrorKind::Filesystem,
|
|
lazy_format!("create {privkey_path:?}"),
|
|
)
|
|
})?;
|
|
f.write_all(privkey.to_string().as_bytes()).await?;
|
|
f.write_all(b"\n").await?;
|
|
f.sync_all().await?;
|
|
let mut f = create_file(ssh_dir.join(id_alg).with_extension("pub")).await?;
|
|
f.write_all(
|
|
(privkey
|
|
.0
|
|
.public_key()
|
|
.to_openssh()
|
|
.with_kind(ErrorKind::OpenSsh)?
|
|
+ " start9@"
|
|
+ &*hostname.0)
|
|
.as_bytes(),
|
|
)
|
|
.await?;
|
|
f.write_all(b"\n").await?;
|
|
f.sync_all().await?;
|
|
|
|
let mut f = create_file(ssh_dir.join("authorized_keys")).await?;
|
|
for key in pubkeys.0.values() {
|
|
f.write_all(key.0.to_key_format().as_bytes()).await?;
|
|
f.write_all(b"\n").await?;
|
|
}
|
|
|
|
Command::new("chown")
|
|
.arg("-R")
|
|
.arg("start9:startos")
|
|
.arg(ssh_dir)
|
|
.invoke(ErrorKind::Filesystem)
|
|
.await?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn sync_pubkeys<P: AsRef<Path>>(pubkeys: &SshKeys, ssh_dir: P) -> Result<(), Error> {
|
|
use tokio::io::AsyncWriteExt;
|
|
|
|
let ssh_dir = ssh_dir.as_ref();
|
|
if tokio::fs::metadata(ssh_dir).await.is_err() {
|
|
tokio::fs::create_dir_all(ssh_dir).await?;
|
|
}
|
|
|
|
let mut f = create_file(ssh_dir.join("authorized_keys")).await?;
|
|
for key in pubkeys.0.values() {
|
|
f.write_all(key.0.to_key_format().as_bytes()).await?;
|
|
f.write_all(b"\n").await?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|