From 9326ef3957f19dd47f3188e911a23973315f2f6f Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Sat, 18 Nov 2023 17:26:04 -0700 Subject: [PATCH 1/2] set content disposition for cert --- core/startos/src/db/model.rs | 2 +- core/startos/src/init.rs | 6 +++--- core/startos/src/net/keys.rs | 2 +- core/startos/src/net/static_server.rs | 10 ++++++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs index bce8886caf..344d5abb37 100644 --- a/core/startos/src/db/model.rs +++ b/core/startos/src/db/model.rs @@ -22,7 +22,7 @@ use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr}; use crate::prelude::*; use crate::s9pk::manifest::{Manifest, PackageId}; use crate::status::Status; -use crate::util::cpupower::{get_preferred_governor, Governor}; +use crate::util::cpupower::{Governor}; use crate::util::Version; use crate::version::{Current, VersionT}; use crate::{ARCH, PLATFORM}; diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs index 5818147707..4b057be007 100644 --- a/core/startos/src/init.rs +++ b/core/startos/src/init.rs @@ -4,7 +4,7 @@ use std::path::Path; use std::time::{Duration, SystemTime}; use color_eyre::eyre::eyre; -use helpers::NonDetachingJoinHandle; + use models::ResultExt; use rand::random; use sqlx::{Pool, Postgres}; @@ -18,9 +18,9 @@ use crate::disk::mount::util::unmount; use crate::install::PKG_ARCHIVE_DIR; use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH; use crate::prelude::*; -use crate::sound::BEP; + use crate::util::cpupower::{ - current_governor, get_available_governors, get_preferred_governor, set_governor, + get_available_governors, get_preferred_governor, set_governor, }; use crate::util::docker::{create_bridge_network, CONTAINER_DATADIR, CONTAINER_TOOL}; use crate::util::Invoke; diff --git a/core/startos/src/net/keys.rs b/core/startos/src/net/keys.rs index a64e3a1874..504bd276d3 100644 --- a/core/startos/src/net/keys.rs +++ b/core/startos/src/net/keys.rs @@ -280,7 +280,7 @@ pub fn test_keygen() { key.openssl_key_nistp256(); } -fn display_requires_reboot(arg: RequiresReboot, matches: &ArgMatches) { +fn display_requires_reboot(arg: RequiresReboot, _matches: &ArgMatches) { if arg.0 { println!("Server must be restarted for changes to take effect"); } diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs index c4dca85f2f..166ddeb51c 100644 --- a/core/startos/src/net/static_server.rs +++ b/core/startos/src/net/static_server.rs @@ -23,6 +23,7 @@ use tokio_util::io::ReaderStream; use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext}; use crate::core::rpc_continuations::RequestGuid; use crate::db::subscribe; +use crate::hostname::Hostname; use crate::install::PKG_PUBLIC_DIR; use crate::middleware::auth::{auth as auth_middleware, HasValidSession}; use crate::middleware::cors::cors; @@ -339,7 +340,8 @@ async fn main_embassy_ui(req: Request, ctx: RpcContext) -> Result { - cert_send(&ctx.account.read().await.root_ca_cert) + let account = ctx.account.read().await; + cert_send(&account.root_ca_cert, &account.hostname) } (&Method::GET, _) => { let uri_path = UiMode::Main.path( @@ -405,7 +407,7 @@ fn bad_request() -> Response { .unwrap() } -fn cert_send(cert: &X509) -> Result, Error> { +fn cert_send(cert: &X509, hostname: &Hostname) -> Result, Error> { let pem = cert.to_pem()?; Response::builder() .status(StatusCode::OK) @@ -419,6 +421,10 @@ fn cert_send(cert: &X509) -> Result, Error> { ) .header(http::header::CONTENT_TYPE, "application/x-pem-file") .header(http::header::CONTENT_LENGTH, pem.len()) + .header( + http::header::CONTENT_DISPOSITION, + format!("attachment; filename={}.crt", &hostname.0), + ) .body(Body::from(pem)) .with_kind(ErrorKind::Network) } From 16274e31adee7024a9a4af0899cfd9555dcf9d10 Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Mon, 20 Nov 2023 11:52:31 -0700 Subject: [PATCH 2/2] * update content type for cert * remove unnecessary frontend download attr --- core/startos/src/net/static_server.rs | 2 +- .../ui/src/app/pages/login/ca-wizard/ca-wizard.component.html | 3 --- web/projects/ui/src/app/pages/server-routes/lan/lan.page.html | 4 ++-- web/projects/ui/src/app/pages/server-routes/lan/lan.page.ts | 4 ---- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs index 166ddeb51c..761566a2c4 100644 --- a/core/startos/src/net/static_server.rs +++ b/core/startos/src/net/static_server.rs @@ -419,7 +419,7 @@ fn cert_send(cert: &X509, hostname: &Hostname) -> Result, Error> ) .to_lowercase(), ) - .header(http::header::CONTENT_TYPE, "application/x-pem-file") + .header(http::header::CONTENT_TYPE, "application/x-x509-ca-cert") .header(http::header::CONTENT_LENGTH, pem.len()) .header( http::header::CONTENT_DISPOSITION, diff --git a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html index a76cdab34d..a1ab7ffdbb 100644 --- a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html +++ b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html @@ -100,7 +100,4 @@

Root CA Trusted!

diff --git a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html index ed811d63de..7374936fff 100644 --- a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html +++ b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html @@ -26,7 +26,7 @@

- +

Download Root CA

@@ -35,5 +35,5 @@

Download Root CA

- + diff --git a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.ts b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.ts index bcb0a968ff..328524d302 100644 --- a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.ts +++ b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.ts @@ -10,10 +10,6 @@ import { DataModel } from 'src/app/services/patch-db/data-model' changeDetection: ChangeDetectionStrategy.OnPush, }) export class LANPage { - readonly crtName$ = this.patch - .watch$('server-info', 'lan-address') - .pipe(map(addr => `${new URL(addr).hostname}.crt`)) - constructor(private readonly patch: PatchDB) {} installCert(): void {