mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-01 21:13:09 +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>
152 lines
4.3 KiB
Rust
152 lines
4.3 KiB
Rust
use std::collections::HashSet;
|
|
use std::str::FromStr;
|
|
|
|
use clap::builder::ValueParserFactory;
|
|
use itertools::Itertools;
|
|
use models::FromStrParser;
|
|
use serde::{Deserialize, Serialize};
|
|
use ts_rs::TS;
|
|
use url::Url;
|
|
|
|
use crate::prelude::*;
|
|
use crate::sign::commitment::Digestable;
|
|
use crate::sign::{AnySignature, AnyVerifyingKey, SignatureScheme};
|
|
|
|
#[derive(Debug, Deserialize, Serialize, HasModel, TS)]
|
|
#[serde(rename_all = "camelCase")]
|
|
#[model = "Model<Self>"]
|
|
#[ts(export)]
|
|
pub struct SignerInfo {
|
|
pub name: String,
|
|
pub contact: Vec<ContactInfo>,
|
|
pub keys: HashSet<AnyVerifyingKey>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, TS, PartialEq, Eq)]
|
|
#[serde(rename_all = "camelCase")]
|
|
#[ts(export)]
|
|
// TODO: better types
|
|
pub enum ContactInfo {
|
|
Email(String),
|
|
Matrix(String),
|
|
Website(#[ts(type = "string")] Url),
|
|
}
|
|
impl std::fmt::Display for ContactInfo {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
Self::Email(e) => write!(f, "mailto:{e}"),
|
|
Self::Matrix(m) => write!(f, "https://matrix.to/#/{m}"),
|
|
Self::Website(w) => write!(f, "{w}"),
|
|
}
|
|
}
|
|
}
|
|
impl FromStr for ContactInfo {
|
|
type Err = Error;
|
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
Ok(if let Some(s) = s.strip_prefix("mailto:") {
|
|
Self::Email(s.to_owned())
|
|
} else if let Some(s) = s.strip_prefix("https://matrix.to/#/") {
|
|
Self::Matrix(s.to_owned())
|
|
} else {
|
|
Self::Website(s.parse()?)
|
|
})
|
|
}
|
|
}
|
|
impl ValueParserFactory for ContactInfo {
|
|
type Parser = FromStrParser<Self>;
|
|
fn value_parser() -> Self::Parser {
|
|
Self::Parser::new()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize, TS)]
|
|
#[serde(rename_all = "camelCase")]
|
|
#[ts(export)]
|
|
pub enum AcceptSigners {
|
|
#[serde(skip)]
|
|
Accepted,
|
|
Signer(AnyVerifyingKey),
|
|
Any(Vec<AcceptSigners>),
|
|
All(Vec<AcceptSigners>),
|
|
}
|
|
impl AcceptSigners {
|
|
const fn null() -> Self {
|
|
Self::Any(Vec::new())
|
|
}
|
|
pub fn flatten(self) -> Self {
|
|
match self {
|
|
Self::Any(mut s) | Self::All(mut s) if s.len() == 1 => s.swap_remove(0).flatten(),
|
|
s => s,
|
|
}
|
|
}
|
|
pub fn accepted(&self) -> bool {
|
|
match self {
|
|
Self::Accepted => true,
|
|
_ => false,
|
|
}
|
|
}
|
|
pub fn try_accept(self) -> Result<(), Error> {
|
|
if self.accepted() {
|
|
Ok(())
|
|
} else {
|
|
Err(Error::new(
|
|
eyre!("signer(s) not accepted"),
|
|
ErrorKind::InvalidSignature,
|
|
))
|
|
}
|
|
}
|
|
pub fn process_signature(
|
|
&mut self,
|
|
signer: &AnyVerifyingKey,
|
|
commitment: &impl Digestable,
|
|
context: &str,
|
|
signature: &AnySignature,
|
|
) -> Result<(), Error> {
|
|
let mut res = Ok(());
|
|
let new = match std::mem::replace(self, Self::null()) {
|
|
Self::Accepted => Self::Accepted,
|
|
Self::Signer(s) => {
|
|
if &s == signer {
|
|
res = signer
|
|
.scheme()
|
|
.verify_commitment(signer, commitment, context, signature);
|
|
Self::Accepted
|
|
} else {
|
|
Self::Signer(s)
|
|
}
|
|
}
|
|
Self::All(mut s) => {
|
|
res = s
|
|
.iter_mut()
|
|
.map(|s| s.process_signature(signer, commitment, context, signature))
|
|
.collect();
|
|
if s.iter().all(|s| s.accepted()) {
|
|
Self::Accepted
|
|
} else {
|
|
Self::All(s)
|
|
}
|
|
}
|
|
Self::Any(mut s) => {
|
|
match s
|
|
.iter_mut()
|
|
.map(|s| {
|
|
s.process_signature(signer, commitment, context, signature)?;
|
|
Ok(s)
|
|
})
|
|
.filter_ok(|s| s.accepted())
|
|
.next()
|
|
{
|
|
Some(Ok(s)) => std::mem::replace(s, Self::null()),
|
|
Some(Err(e)) => {
|
|
res = Err(e);
|
|
Self::Any(s)
|
|
}
|
|
None => Self::Any(s),
|
|
}
|
|
}
|
|
};
|
|
*self = new;
|
|
res
|
|
}
|
|
}
|