Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter out usb stick during install (#1974)

Browse Source 
* filter out usb stick during install

* remove duplicate error kind

* clean out newline
This commit is contained in:
Aiden McClelland
2022-11-26 15:10:39 -07:00
parent 2336e36314
commit 96f77a6275
6 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/net/cert_resolver.rs
View File

@@ -147,21 +147,21 @@ impl EmbassyCertResolver {
let private_keys = package_cert_data
.0
.private_key_to_der()
.map_err(|err| Error::new(eyre!("err {}", err), crate::ErrorKind::BytesError))?;
.map_err(|err| Error::new(eyre!("{}", err), crate::ErrorKind::OpenSsl))?;
let mut full_rustls_certs = Vec::new();
for cert in x509_cert_chain.iter() {
let cert =
Certificate(cert.to_der().map_err(|err| {
Error::new(eyre!("err: {}", err), crate::ErrorKind::BytesError)
})?);
let cert = Certificate(
cert.to_der()
.map_err(|err| Error::new(eyre!("{}", err), crate::ErrorKind::OpenSsl))?,
);
full_rustls_certs.push(cert);
}
let pre_sign_key = PrivateKey(private_keys);
let actual_sign_key = any_supported_type(&pre_sign_key)
.map_err(|err| Error::new(eyre!("{}", err), crate::ErrorKind::SignError))?;
.map_err(|err| Error::new(eyre!("{}", err), crate::ErrorKind::OpenSsl))?;
let cert_key = CertifiedKey::new(full_rustls_certs, actual_sign_key);

7
backend/src/net/net_utils.rs
View File

@@ -15,7 +15,7 @@ pub fn host_addr_fqdn(req: &Request<Body>) -> Result<ResourceFqdn, Error> {
Some(host) => {
let host_str = host
.to_str()
.map_err(|e| Error::new(eyre!("{}", e), crate::ErrorKind::AsciiError))?
.map_err(|e| Error::new(eyre!("{}", e), crate::ErrorKind::Ascii))?
.to_string();
let host_uri: ResourceFqdn = host_str.split(':').next().unwrap().parse()?;
@@ -23,7 +23,10 @@ pub fn host_addr_fqdn(req: &Request<Body>) -> Result<ResourceFqdn, Error> {
Ok(host_uri)
}
None => Err(Error::new(eyre!("No Host"), crate::ErrorKind::NoHost)),
None => Err(Error::new(
eyre!("No Host header"),
crate::ErrorKind::MissingHeader,
)),
}
}

4
backend/src/net/proxy_controller.rs
View File

@@ -346,13 +346,13 @@ impl ProxyControllerInner {
removed_server.shutdown.send(()).map_err(|_| {
Error::new(
eyre!("Hyper server did not quit properly"),
crate::ErrorKind::JoinError,
crate::ErrorKind::Unknown,
)
})?;
removed_server
.handle
.await
.with_kind(crate::ErrorKind::JoinError)?;
.with_kind(crate::ErrorKind::Unknown)?;
self.docker_interfaces.remove(&package.clone());
self.docker_iface_lookups
.remove(&(package.clone(), interface_id));