mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-01 04:53:40 +00:00
* wip: static-server errors * wip: fix wifi * wip: Fix the service_effects * wip: Fix cors in the middleware * wip(chore): Auth clean up the lint. * wip(fix): Vhost * wip: continue manager refactor Co-authored-by: J H <Blu-J@users.noreply.github.com> * wip: service manager refactor * wip: Some fixes * wip(fix): Fix the lib.rs * wip * wip(fix): Logs * wip: bins * wip(innspect): Add in the inspect * wip: config * wip(fix): Diagnostic * wip(fix): Dependencies * wip: context * wip(fix) Sorta auth * wip: warnings * wip(fix): registry/admin * wip(fix) marketplace * wip(fix) Some more converted and fixed with the linter and config * wip: Working on the static server * wip(fix)static server * wip: Remove some asynnc * wip: Something about the request and regular rpc * wip: gut install Co-authored-by: J H <Blu-J@users.noreply.github.com> * wip: Convert the static server into the new system * wip delete file * test * wip(fix) vhost does not need the with safe defaults * wip: Adding in the wifi * wip: Fix the developer and the verify * wip: new install flow Co-authored-by: J H <Blu-J@users.noreply.github.com> * fix middleware * wip * wip: Fix the auth * wip * continue service refactor * feature: Service get_config * feat: Action * wip: Fighting the great fight against the borrow checker * wip: Remove an error in a file that I just need to deel with later * chore: Add in some more lifetime stuff to the services * wip: Install fix on lifetime * cleanup * wip: Deal with the borrow later * more cleanup * resolve borrowchecker errors * wip(feat): add in the handler for the socket, for now * wip(feat): Update the service_effect_handler::action * chore: Add in the changes to make sure the from_service goes to context * chore: Change the * refactor service map * fix references to service map * fill out restore * wip: Before I work on the store stuff * fix backup module * handle some warnings * feat: add in the ui components on the rust side * feature: Update the procedures * chore: Update the js side of the main and a few of the others * chore: Update the rpc listener to match the persistant container * wip: Working on updating some things to have a better name * wip(feat): Try and get the rpc to return the correct shape? * lxc wip * wip(feat): Try and get the rpc to return the correct shape? * build for container runtime wip * remove container-init * fix build * fix error * chore: Update to work I suppose * lxc wip * remove docker module and feature * download alpine squashfs automatically * overlays effect Co-authored-by: Jade <Blu-J@users.noreply.github.com> * chore: Add the overlay effect * feat: Add the mounter in the main * chore: Convert to use the mounts, still need to work with the sandbox * install fixes * fix ssl * fixes from testing * implement tmpfile for upload * wip * misc fixes * cleanup * cleanup * better progress reporting * progress for sideload * return real guid * add devmode script * fix lxc rootfs path * fix percentage bar * fix progress bar styling * fix build for unstable * tweaks * label progress * tweaks * update progress more often * make symlink in rpc_client * make socket dir * fix parent path * add start-cli to container * add echo and gitInfo commands * wip: Add the init + errors * chore: Add in the exit effect for the system * chore: Change the type to null for failure to parse * move sigterm timeout to stopping status * update order * chore: Update the return type * remove dbg * change the map error * chore: Update the thing to capture id * chore add some life changes * chore: Update the loging * chore: Update the package to run module * us From for RpcError * chore: Update to use import instead * chore: update * chore: Use require for the backup * fix a default * update the type that is wrong * chore: Update the type of the manifest * chore: Update to make null * only symlink if not exists * get rid of double result * better debug info for ErrorCollection * chore: Update effects * chore: fix * mount assets and volumes * add exec instead of spawn * fix mounting in image * fix overlay mounts Co-authored-by: Jade <Blu-J@users.noreply.github.com> * misc fixes * feat: Fix two * fix: systemForEmbassy main * chore: Fix small part of main loop * chore: Modify the bundle * merge * fixMain loop" * move tsc to makefile * chore: Update the return types of the health check * fix client * chore: Convert the todo to use tsmatches * add in the fixes for the seen and create the hack to allow demo * chore: Update to include the systemForStartOs * chore UPdate to the latest types from the expected outout * fixes * fix typo * Don't emit if failure on tsc * wip Co-authored-by: Jade <Blu-J@users.noreply.github.com> * add s9pk api * add inspection * add inspect manifest * newline after display serializable * fix squashfs in image name * edit manifest Co-authored-by: Jade <Blu-J@users.noreply.github.com> * wait for response on repl * ignore sig for now * ignore sig for now * re-enable sig verification * fix * wip * env and chroot * add profiling logs * set uid & gid in squashfs to 100000 * set uid of sqfs to 100000 * fix mksquashfs args * add env to compat * fix * re-add docker feature flag * fix docker output format being stupid * here be dragons * chore: Add in the cross compiling for something * fix npm link * extract logs from container on exit * chore: Update for testing * add log capture to drop trait * chore: add in the modifications that I make * chore: Update small things for no updates * chore: Update the types of something * chore: Make main not complain * idmapped mounts * idmapped volumes * re-enable kiosk * chore: Add in some logging for the new system * bring in start-sdk * remove avahi * chore: Update the deps * switch to musl * chore: Update the version of prettier * chore: Organize' * chore: Update some of the headers back to the standard of fetch * fix musl build * fix idmapped mounts * fix cross build * use cross compiler for correct arch * feat: Add in the faked ssl stuff for the effects * @dr_bonez Did a solution here * chore: Something that DrBonez * chore: up * wip: We have a working server!!! * wip * uninstall * wip * tes --------- Co-authored-by: J H <dragondef@gmail.com> Co-authored-by: J H <Blu-J@users.noreply.github.com> Co-authored-by: J H <2364004+Blu-J@users.noreply.github.com>
237 lines
7.0 KiB
Rust
237 lines
7.0 KiB
Rust
use std::path::Path;
|
|
|
|
use chrono::Utc;
|
|
use clap::builder::ValueParserFactory;
|
|
use clap::Parser;
|
|
use color_eyre::eyre::eyre;
|
|
use rpc_toolkit::{command, from_fn_async, AnyContext, Empty, HandlerExt, ParentHandler};
|
|
use serde::{Deserialize, Serialize};
|
|
use sqlx::{Pool, Postgres};
|
|
use tracing::instrument;
|
|
|
|
use crate::context::{CliContext, RpcContext};
|
|
use crate::util::clap::FromStrParser;
|
|
use crate::util::serde::{display_serializable, HandlerExtSerde, WithIoFormat};
|
|
use crate::{Error, ErrorKind};
|
|
|
|
static SSH_AUTHORIZED_KEYS_FILE: &str = "/home/start9/.ssh/authorized_keys";
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
pub struct PubKey(
|
|
#[serde(serialize_with = "crate::util::serde::serialize_display")]
|
|
#[serde(deserialize_with = "crate::util::serde::deserialize_from_str")]
|
|
openssh_keys::PublicKey,
|
|
);
|
|
impl ValueParserFactory for PubKey {
|
|
type Parser = FromStrParser<Self>;
|
|
fn value_parser() -> Self::Parser {
|
|
FromStrParser::new()
|
|
}
|
|
}
|
|
|
|
#[derive(serde::Serialize, serde::Deserialize)]
|
|
#[serde(rename_all = "kebab-case")]
|
|
pub struct SshKeyResponse {
|
|
pub alg: String,
|
|
pub fingerprint: String,
|
|
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 PubKey {
|
|
type Err = Error;
|
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
s.parse().map(|pk| PubKey(pk)).map_err(|e| Error {
|
|
source: e.into(),
|
|
kind: crate::ErrorKind::ParseSshKey,
|
|
revision: None,
|
|
})
|
|
}
|
|
}
|
|
|
|
// #[command(subcommands(add, delete, list,))]
|
|
pub fn ssh() -> ParentHandler {
|
|
ParentHandler::new()
|
|
.subcommand(
|
|
"add",
|
|
from_fn_async(add)
|
|
.no_display()
|
|
.with_remote_cli::<CliContext>(),
|
|
)
|
|
.subcommand(
|
|
"delete",
|
|
from_fn_async(delete)
|
|
.no_display()
|
|
.with_remote_cli::<CliContext>(),
|
|
)
|
|
.subcommand(
|
|
"list",
|
|
from_fn_async(list)
|
|
.with_display_serializable()
|
|
.with_custom_display_fn::<AnyContext, _>(|handle, result| {
|
|
Ok(display_all_ssh_keys(handle.params, result))
|
|
})
|
|
.with_remote_cli::<CliContext>(),
|
|
)
|
|
}
|
|
|
|
#[derive(Deserialize, Serialize, Parser)]
|
|
#[serde(rename_all = "kebab-case")]
|
|
#[command(rename_all = "kebab-case")]
|
|
pub struct AddParams {
|
|
key: PubKey,
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn add(ctx: RpcContext, AddParams { key }: AddParams) -> Result<SshKeyResponse, Error> {
|
|
let pool = &ctx.secret_store;
|
|
// check fingerprint for duplicates
|
|
let fp = key.0.fingerprint_md5();
|
|
match sqlx::query!("SELECT * FROM ssh_keys WHERE fingerprint = $1", fp)
|
|
.fetch_optional(pool)
|
|
.await?
|
|
{
|
|
None => {
|
|
// if no duplicates, insert into DB
|
|
let raw_key = format!("{}", key.0);
|
|
let created_at = Utc::now().to_rfc3339();
|
|
sqlx::query!(
|
|
"INSERT INTO ssh_keys (fingerprint, openssh_pubkey, created_at) VALUES ($1, $2, $3)",
|
|
fp,
|
|
raw_key,
|
|
created_at
|
|
)
|
|
.execute(pool)
|
|
.await?;
|
|
// insert into live key file, for now we actually do a wholesale replacement of the keys file, for maximum
|
|
// consistency
|
|
sync_keys_from_db(pool, Path::new(SSH_AUTHORIZED_KEYS_FILE)).await?;
|
|
Ok(SshKeyResponse {
|
|
alg: key.0.keytype().to_owned(),
|
|
fingerprint: fp,
|
|
hostname: key.0.comment.unwrap_or(String::new()).to_owned(),
|
|
created_at,
|
|
})
|
|
}
|
|
Some(_) => Err(Error::new(eyre!("Duplicate ssh key"), ErrorKind::Duplicate)),
|
|
}
|
|
}
|
|
|
|
#[derive(Deserialize, Serialize, Parser)]
|
|
#[serde(rename_all = "kebab-case")]
|
|
#[command(rename_all = "kebab-case")]
|
|
pub struct DeleteParams {
|
|
fingerprint: String,
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn delete(
|
|
ctx: RpcContext,
|
|
DeleteParams { fingerprint }: DeleteParams,
|
|
) -> Result<(), Error> {
|
|
let pool = &ctx.secret_store;
|
|
// check if fingerprint is in DB
|
|
// if in DB, remove it from DB
|
|
let n = sqlx::query!("DELETE FROM ssh_keys WHERE fingerprint = $1", fingerprint)
|
|
.execute(pool)
|
|
.await?
|
|
.rows_affected();
|
|
// if not in DB, Err404
|
|
if n == 0 {
|
|
Err(Error {
|
|
source: color_eyre::eyre::eyre!("SSH Key Not Found"),
|
|
kind: crate::error::ErrorKind::NotFound,
|
|
revision: None,
|
|
})
|
|
} else {
|
|
// AND overlay key file
|
|
sync_keys_from_db(pool, Path::new(SSH_AUTHORIZED_KEYS_FILE)).await?;
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
fn display_all_ssh_keys(params: WithIoFormat<Empty>, result: Vec<SshKeyResponse>) {
|
|
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).unwrap();
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn list(ctx: RpcContext, _: Empty) -> Result<Vec<SshKeyResponse>, Error> {
|
|
let pool = &ctx.secret_store;
|
|
// list keys in DB and return them
|
|
let entries = sqlx::query!("SELECT fingerprint, openssh_pubkey, created_at FROM ssh_keys")
|
|
.fetch_all(pool)
|
|
.await?;
|
|
Ok(entries
|
|
.into_iter()
|
|
.map(|r| {
|
|
let k = PubKey(r.openssh_pubkey.parse().unwrap()).0;
|
|
let alg = k.keytype().to_owned();
|
|
let fingerprint = k.fingerprint_md5();
|
|
let hostname = k.comment.unwrap_or("".to_owned());
|
|
let created_at = r.created_at;
|
|
SshKeyResponse {
|
|
alg,
|
|
fingerprint,
|
|
hostname,
|
|
created_at,
|
|
}
|
|
})
|
|
.collect())
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn sync_keys_from_db<P: AsRef<Path>>(
|
|
pool: &Pool<Postgres>,
|
|
dest: P,
|
|
) -> Result<(), Error> {
|
|
let dest = dest.as_ref();
|
|
let keys = sqlx::query!("SELECT openssh_pubkey FROM ssh_keys")
|
|
.fetch_all(pool)
|
|
.await?;
|
|
let contents: String = keys
|
|
.into_iter()
|
|
.map(|k| format!("{}\n", k.openssh_pubkey))
|
|
.collect();
|
|
let ssh_dir = dest.parent().ok_or_else(|| {
|
|
Error::new(
|
|
eyre!("SSH Key File cannot be \"/\""),
|
|
crate::ErrorKind::Filesystem,
|
|
)
|
|
})?;
|
|
if tokio::fs::metadata(ssh_dir).await.is_err() {
|
|
tokio::fs::create_dir_all(ssh_dir).await?;
|
|
}
|
|
std::fs::write(dest, contents).map_err(|e| e.into())
|
|
}
|