Compare commits
No commits in common. "master" and "v0.2.0" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,5 +1,3 @@
|
|||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
dtrfs.tar
|
dtrfs.tar
|
||||||
build
|
build
|
||||||
tmp
|
tmp
|
||||||
|
24
LICENSE
24
LICENSE
@ -1,24 +0,0 @@
|
|||||||
This is free and unencumbered software released into the public domain.
|
|
||||||
|
|
||||||
Anyone is free to copy, modify, publish, use, compile, sell, or
|
|
||||||
distribute this software, either in source code form or as a compiled
|
|
||||||
binary, for any purpose, commercial or non-commercial, and by any
|
|
||||||
means.
|
|
||||||
|
|
||||||
In jurisdictions that recognize copyright laws, the author or authors
|
|
||||||
of this software dedicate any and all copyright interest in the
|
|
||||||
software to the public domain. We make this dedication for the benefit
|
|
||||||
of the public at large and to the detriment of our heirs and
|
|
||||||
successors. We intend this dedication to be an overt act of
|
|
||||||
relinquishment in perpetuity of all present and future rights to this
|
|
||||||
software under copyright law.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
||||||
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
||||||
OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
|
|
||||||
For more information, please refer to <https://unlicense.org/>
|
|
@ -1,7 +1,3 @@
|
|||||||
<!--
|
|
||||||
SPDX-License-Identifier: Unlicense
|
|
||||||
-->
|
|
||||||
|
|
||||||
## OS template
|
## OS template
|
||||||
|
|
||||||
You will need a working OS template to work with this project.
|
You will need a working OS template to work with this project.
|
||||||
|
29
dtrfs_api/Cargo.lock
generated
29
dtrfs_api/Cargo.lock
generated
@ -1,8 +1,6 @@
|
|||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
# This file is automatically @generated by Cargo.
|
# This file is automatically @generated by Cargo.
|
||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 4
|
version = 3
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "actix-codec"
|
name = "actix-codec"
|
||||||
@ -411,15 +409,6 @@ dependencies = [
|
|||||||
"alloc-stdlib",
|
"alloc-stdlib",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bs58"
|
|
||||||
version = "0.5.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
|
|
||||||
dependencies = [
|
|
||||||
"tinyvec",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "byteorder"
|
name = "byteorder"
|
||||||
version = "1.5.0"
|
version = "1.5.0"
|
||||||
@ -681,7 +670,6 @@ dependencies = [
|
|||||||
"anyhow",
|
"anyhow",
|
||||||
"base64",
|
"base64",
|
||||||
"bincode",
|
"bincode",
|
||||||
"bs58",
|
|
||||||
"ed25519-dalek",
|
"ed25519-dalek",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"regex",
|
"regex",
|
||||||
@ -2093,21 +2081,6 @@ dependencies = [
|
|||||||
"zerovec",
|
"zerovec",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tinyvec"
|
|
||||||
version = "1.8.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
|
|
||||||
dependencies = [
|
|
||||||
"tinyvec_macros",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tinyvec_macros"
|
|
||||||
version = "0.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tls_codec"
|
name = "tls_codec"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
|
@ -1,21 +1,18 @@
|
|||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "dtrfs_api"
|
name = "dtrfs_api"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bs58 = "0.5.1"
|
|
||||||
anyhow = "1.0.93"
|
anyhow = "1.0.93"
|
||||||
|
base64 = "0.22.1"
|
||||||
bincode = "1.3.3"
|
bincode = "1.3.3"
|
||||||
regex = "1.11.1"
|
regex = "1.11.1"
|
||||||
sev = { version = "4.0", default-features = false, features = ['crypto_nossl','snp'] }
|
sev = { version = "4.0", default-features = false, features = ['crypto_nossl','snp'] }
|
||||||
ed25519-dalek = { version = "2.1.1" }
|
ed25519-dalek = { version = "2.1.1", features = ["pem", "pkcs8"] }
|
||||||
lazy_static = "1.5.0"
|
lazy_static = "1.5.0"
|
||||||
actix-web = { version = "4.9.0", features = ["rustls-0_23"] }
|
actix-web = { version = "4.9.0", features = ["rustls-0_23"] }
|
||||||
sha3 = "0.10.8"
|
sha3 = "0.10.8"
|
||||||
rustls = "0.23.18"
|
rustls = "0.23.18"
|
||||||
rustls-pemfile = "2.2.0"
|
rustls-pemfile = "2.2.0"
|
||||||
serde = { version = "1.0.215", features = ["derive"] }
|
serde = { version = "1.0.215", features = ["derive"] }
|
||||||
base64 = "0.22.1"
|
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
reorder_impl_items = true
|
reorder_impl_items = true
|
||||||
use_small_heuristics = "Max"
|
use_small_heuristics = "Max"
|
||||||
merge_imports = true
|
merge_imports = true
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
// SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
mod os;
|
mod os;
|
||||||
mod snp;
|
mod snp;
|
||||||
|
|
||||||
use actix_web::{get, post, web, App, HttpRequest, HttpResponse, HttpServer};
|
use actix_web::{get, post, web, App, HttpRequest, HttpResponse, HttpServer};
|
||||||
use ed25519_dalek::{Signature, Verifier, VerifyingKey};
|
use base64::prelude::{Engine, BASE64_URL_SAFE};
|
||||||
|
use ed25519_dalek::{pkcs8::DecodePublicKey, Signature, Verifier, VerifyingKey};
|
||||||
use lazy_static::lazy_static;
|
use lazy_static::lazy_static;
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use rustls::{pki_types::PrivateKeyDer, ServerConfig};
|
use rustls::{pki_types::PrivateKeyDer, ServerConfig};
|
||||||
@ -46,16 +45,13 @@ fn get_cert_hash() -> [u8; 64] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn verifying_key() -> Result<VerifyingKey, Box<dyn std::error::Error>> {
|
fn verifying_key() -> Result<VerifyingKey, Box<dyn std::error::Error>> {
|
||||||
let re = Regex::new(r"detee_admin=([A-Za-z0-9]+)").unwrap();
|
let re = Regex::new(r"detee_admin=([A-Za-z0-9+/=]+)").unwrap();
|
||||||
let key_str = re.find(&CMDLINE).map(|m| m.as_str()).unwrap_or("");
|
let key_str = re.find(&CMDLINE).map(|m| m.as_str()).unwrap_or("");
|
||||||
let key_str =
|
let key_pem = format!(
|
||||||
key_str.strip_prefix("detee_admin=").ok_or("Could not get admin key from cmdline")?;
|
"-----BEGIN PUBLIC KEY-----\n{}\n-----END PUBLIC KEY-----\n",
|
||||||
Ok(VerifyingKey::from_bytes(
|
key_str.strip_prefix("detee_admin=").ok_or("Could not get admin key from cmdline")?
|
||||||
&bs58::decode(key_str)
|
);
|
||||||
.into_vec()?
|
Ok(VerifyingKey::from_public_key_pem(&key_pem)?)
|
||||||
.try_into()
|
|
||||||
.map_err(|_| bs58::decode::Error::BufferTooSmall)?,
|
|
||||||
)?)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn verify(req: &HttpRequest) -> Result<(), Box<dyn std::error::Error>> {
|
fn verify(req: &HttpRequest) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
@ -64,8 +60,8 @@ fn verify(req: &HttpRequest) -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
.get("ed25519-signature")
|
.get("ed25519-signature")
|
||||||
.ok_or_else(|| "Did not find ed25519-signature header")?;
|
.ok_or_else(|| "Did not find ed25519-signature header")?;
|
||||||
|
|
||||||
let signature = bs58::decode(signature).into_vec()?;
|
let signature: &[u8] = &BASE64_URL_SAFE.decode(signature)?;
|
||||||
let signature = Signature::from_bytes(signature.as_slice().try_into()?);
|
let signature = Signature::from_bytes(signature.try_into()?);
|
||||||
let verifying_key = verifying_key()?;
|
let verifying_key = verifying_key()?;
|
||||||
Ok(verifying_key.verify(CRT_CONTENTS.as_bytes(), &signature)?)
|
Ok(verifying_key.verify(CRT_CONTENTS.as_bytes(), &signature)?)
|
||||||
}
|
}
|
||||||
@ -86,7 +82,6 @@ async fn get_report() -> HttpResponse {
|
|||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct InstallForm {
|
struct InstallForm {
|
||||||
hostname: String,
|
|
||||||
url: String,
|
url: String,
|
||||||
sha: String,
|
sha: String,
|
||||||
keyfile: String,
|
keyfile: String,
|
||||||
@ -98,7 +93,7 @@ async fn post_install_form(req: HttpRequest, form: web::Form<InstallForm>) -> Ht
|
|||||||
if let Err(e) = verify(&req) {
|
if let Err(e) = verify(&req) {
|
||||||
return HttpResponse::BadRequest().body(format!("Signature verification failed: {}", e));
|
return HttpResponse::BadRequest().body(format!("Signature verification failed: {}", e));
|
||||||
};
|
};
|
||||||
match os::encrypt_and_install_os(&form.url, &form.sha, &form.keyfile, &form.hostname) {
|
match os::encrypt_and_install_os(&form.url, &form.sha, &form.keyfile) {
|
||||||
Ok(s) => HttpResponse::Ok().body(s),
|
Ok(s) => HttpResponse::Ok().body(s),
|
||||||
Err(e) => HttpResponse::InternalServerError().body(format!("{e:?}")),
|
Err(e) => HttpResponse::InternalServerError().body(format!("{e:?}")),
|
||||||
}
|
}
|
||||||
@ -137,17 +132,8 @@ struct SSHKeyForm {
|
|||||||
ssh_key: String,
|
ssh_key: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/server_ssh_pubkeys")]
|
#[get("/ssh_key")]
|
||||||
async fn get_server_pubkeys() -> HttpResponse {
|
async fn get_ssh_keys(req: HttpRequest) -> HttpResponse {
|
||||||
match os::get_server_ssh_pubkeys() {
|
|
||||||
Ok(keys) => HttpResponse::Ok().body(keys),
|
|
||||||
Err(e) => HttpResponse::InternalServerError()
|
|
||||||
.body(format!("Could not get pubkeys due to error: {e:?}\nDid you install the OS?")),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[get("/authorized_keys")]
|
|
||||||
async fn get_authorized_keys(req: HttpRequest) -> HttpResponse {
|
|
||||||
if let Err(e) = verify(&req) {
|
if let Err(e) = verify(&req) {
|
||||||
return HttpResponse::BadRequest().body(format!("Signature verification failed: {}", e));
|
return HttpResponse::BadRequest().body(format!("Signature verification failed: {}", e));
|
||||||
};
|
};
|
||||||
@ -157,13 +143,13 @@ async fn get_authorized_keys(req: HttpRequest) -> HttpResponse {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[post("/authorized_keys")]
|
#[post("/ssh_key")]
|
||||||
async fn post_authorized_keys(req: HttpRequest, form: web::Form<SSHKeyForm>) -> HttpResponse {
|
async fn post_ssh_key(req: HttpRequest, form: web::Form<SSHKeyForm>) -> HttpResponse {
|
||||||
if let Err(e) = verify(&req) {
|
if let Err(e) = verify(&req) {
|
||||||
return HttpResponse::BadRequest().body(format!("Signature verification failed: {}", e));
|
return HttpResponse::BadRequest().body(format!("Signature verification failed: {}", e));
|
||||||
};
|
};
|
||||||
let ssh_key = &form.ssh_key;
|
let ssh_key = &form.ssh_key;
|
||||||
match os::add_authorized_key(ssh_key) {
|
match os::add_ssh_key(ssh_key) {
|
||||||
Ok(()) => HttpResponse::Ok().body("Key added to authorized_keys"),
|
Ok(()) => HttpResponse::Ok().body("Key added to authorized_keys"),
|
||||||
Err(e) => HttpResponse::BadRequest().body(format!("{e:?}")),
|
Err(e) => HttpResponse::BadRequest().body(format!("{e:?}")),
|
||||||
}
|
}
|
||||||
@ -197,7 +183,7 @@ async fn main() -> std::io::Result<()> {
|
|||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
println!("Hot decryption successful. Booting OS...");
|
println!("Hot decryption successful. Booting OS...");
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!("Hot decryption failed: {e:?}");
|
println!("Hot decryption failed: {e:?}");
|
||||||
}
|
}
|
||||||
@ -208,13 +194,12 @@ async fn main() -> std::io::Result<()> {
|
|||||||
.service(post_install_form)
|
.service(post_install_form)
|
||||||
.service(post_decrypt_form)
|
.service(post_decrypt_form)
|
||||||
.service(post_process_exit)
|
.service(post_process_exit)
|
||||||
.service(get_server_pubkeys)
|
.service(post_ssh_key)
|
||||||
.service(post_authorized_keys)
|
.service(get_ssh_keys)
|
||||||
.service(get_authorized_keys)
|
|
||||||
.service(get_report)
|
.service(get_report)
|
||||||
.service(homepage)
|
.service(homepage)
|
||||||
})
|
})
|
||||||
.bind_rustls_0_23("[::]:22", config)?
|
.bind_rustls_0_23("[::]:8443", config)?
|
||||||
.run()
|
.run()
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
// SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
use crate::snp::get_derived_key;
|
use crate::snp::get_derived_key;
|
||||||
use anyhow::{anyhow, Result};
|
use anyhow::{anyhow, Result};
|
||||||
use base64::prelude::{Engine, BASE64_URL_SAFE};
|
use base64::prelude::{Engine, BASE64_URL_SAFE};
|
||||||
@ -17,7 +15,6 @@ pub fn encrypt_and_install_os(
|
|||||||
install_url: &str,
|
install_url: &str,
|
||||||
install_sha: &str,
|
install_sha: &str,
|
||||||
keyfile: &str,
|
keyfile: &str,
|
||||||
vm_hostname: &str,
|
|
||||||
) -> Result<String> {
|
) -> Result<String> {
|
||||||
let binary_keyfile = BASE64_URL_SAFE.decode(keyfile)?;
|
let binary_keyfile = BASE64_URL_SAFE.decode(keyfile)?;
|
||||||
std::fs::write(BACKUP_KEYFILE_PATH, binary_keyfile)?;
|
std::fs::write(BACKUP_KEYFILE_PATH, binary_keyfile)?;
|
||||||
@ -27,7 +24,6 @@ pub fn encrypt_and_install_os(
|
|||||||
.env("INSTALL_SHA", install_sha)
|
.env("INSTALL_SHA", install_sha)
|
||||||
.env("SNP_KEY_FILE", SNP_KEYFILE_PATH)
|
.env("SNP_KEY_FILE", SNP_KEYFILE_PATH)
|
||||||
.env("ROOT_KEYFILE", BACKUP_KEYFILE_PATH)
|
.env("ROOT_KEYFILE", BACKUP_KEYFILE_PATH)
|
||||||
.env("VM_HOSTNAME", vm_hostname)
|
|
||||||
.output()?;
|
.output()?;
|
||||||
|
|
||||||
if !install_result.status.success() {
|
if !install_result.status.success() {
|
||||||
@ -106,7 +102,7 @@ pub fn replace_hot_keyfile() -> Result<String> {
|
|||||||
Ok("Succesfully replaced hot keyfile using SNP KDF.".to_string())
|
Ok("Succesfully replaced hot keyfile using SNP KDF.".to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_authorized_key(key: &str) -> Result<()> {
|
pub fn add_ssh_key(key: &str) -> Result<()> {
|
||||||
use std::os::unix::fs::PermissionsExt;
|
use std::os::unix::fs::PermissionsExt;
|
||||||
if !Path::new("/mnt/etc/os-release").try_exists().is_ok_and(|found| found == true) {
|
if !Path::new("/mnt/etc/os-release").try_exists().is_ok_and(|found| found == true) {
|
||||||
return Err(anyhow!(
|
return Err(anyhow!(
|
||||||
@ -146,19 +142,6 @@ pub fn add_authorized_key(key: &str) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_server_ssh_pubkeys() -> Result<String> {
|
|
||||||
let files = vec![
|
|
||||||
"/mnt/etc/ssh/ssh_host_rsa_key.pub",
|
|
||||||
"/mnt/etc/ssh/ssh_host_ecdsa_key.pub",
|
|
||||||
"/mnt/etc/ssh/ssh_host_ed25519_key.pub",
|
|
||||||
];
|
|
||||||
|
|
||||||
Ok(files
|
|
||||||
.iter()
|
|
||||||
.map(|f| std::fs::read_to_string(f))
|
|
||||||
.collect::<Result<String, std::io::Error>>()?)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn list_ssh_keys() -> Result<String> {
|
pub fn list_ssh_keys() -> Result<String> {
|
||||||
Ok(std::fs::read_to_string("/mnt/root/.ssh/authorized_keys")?)
|
Ok(std::fs::read_to_string("/mnt/root/.ssh/authorized_keys")?)
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
// SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use sev::firmware::guest::{AttestationReport, DerivedKey, Firmware, GuestFieldSelect};
|
use sev::firmware::guest::{AttestationReport, DerivedKey, Firmware, GuestFieldSelect};
|
||||||
use base64::prelude::{Engine, BASE64_URL_SAFE};
|
use base64::prelude::{Engine, BASE64_URL_SAFE};
|
||||||
|
@ -3,8 +3,6 @@ asn1_encoder
|
|||||||
async_tx
|
async_tx
|
||||||
async_xor
|
async_xor
|
||||||
atkbd
|
atkbd
|
||||||
bridge
|
|
||||||
br_netfilter
|
|
||||||
cbc
|
cbc
|
||||||
cdrom
|
cdrom
|
||||||
crc16
|
crc16
|
||||||
@ -14,7 +12,6 @@ crc32_pclmul
|
|||||||
crct10dif_pclmul
|
crct10dif_pclmul
|
||||||
cryptd
|
cryptd
|
||||||
crypto_simd
|
crypto_simd
|
||||||
curve25519_x86_64
|
|
||||||
dm_bufio
|
dm_bufio
|
||||||
dm_crypt
|
dm_crypt
|
||||||
dm-integrity
|
dm-integrity
|
||||||
@ -30,53 +27,23 @@ i2c_i801
|
|||||||
i2c_mux
|
i2c_mux
|
||||||
i2c_smbus
|
i2c_smbus
|
||||||
i8042
|
i8042
|
||||||
inet_diag
|
|
||||||
intel_agp
|
intel_agp
|
||||||
intel_gtt
|
intel_gtt
|
||||||
intel_pmc_bxt
|
intel_pmc_bxt
|
||||||
intel_rapl_common
|
intel_rapl_common
|
||||||
intel_rapl_msr
|
intel_rapl_msr
|
||||||
ip6table_filter
|
|
||||||
ip6table_mangle
|
|
||||||
ip6table_nat
|
|
||||||
ip6_tables
|
|
||||||
ip6_udp_tunnel
|
|
||||||
ip_set
|
|
||||||
ip_set_hash_net
|
|
||||||
iptable_filter
|
|
||||||
iptable_mangle
|
|
||||||
iptable_nat
|
|
||||||
iptable_raw
|
|
||||||
ip_tables
|
ip_tables
|
||||||
ipt_REJECT
|
|
||||||
iTCO_vendor_support
|
iTCO_vendor_support
|
||||||
iTCO_wdt
|
iTCO_wdt
|
||||||
jbd2
|
jbd2
|
||||||
libaesgcm
|
|
||||||
libchacha20poly1305
|
|
||||||
libcrc32c
|
|
||||||
libcurve25519_generic
|
|
||||||
libps2
|
libps2
|
||||||
llc
|
|
||||||
loop
|
loop
|
||||||
lpc_ich
|
lpc_ich
|
||||||
mac_hid
|
mac_hid
|
||||||
mbcache
|
mbcache
|
||||||
mousedev
|
mousedev
|
||||||
net_failover
|
net_failover
|
||||||
nf_conntrack
|
|
||||||
nf_conntrack_netlink
|
|
||||||
nf_defrag_ipv4
|
|
||||||
nf_defrag_ipv6
|
|
||||||
nf_nat
|
|
||||||
nfnetlink
|
nfnetlink
|
||||||
nfnetlink_acct
|
|
||||||
nfnetlink_log
|
|
||||||
nf_reject_ipv4
|
|
||||||
nf_tables
|
|
||||||
nft_chain_nat
|
|
||||||
nft_compat
|
|
||||||
overlay
|
|
||||||
parport
|
parport
|
||||||
parport_pc
|
parport_pc
|
||||||
pcspkr
|
pcspkr
|
||||||
@ -94,13 +61,9 @@ sha256
|
|||||||
sha256_ssse3
|
sha256_ssse3
|
||||||
sha512_ssse3
|
sha512_ssse3
|
||||||
sr_mod
|
sr_mod
|
||||||
stp
|
|
||||||
tcp_diag
|
|
||||||
tee
|
tee
|
||||||
trusted
|
trusted
|
||||||
tsm
|
tsm
|
||||||
udp_tunnel
|
|
||||||
veth
|
|
||||||
virtio_blk
|
virtio_blk
|
||||||
virtio_net
|
virtio_net
|
||||||
vivaldi_fmap
|
vivaldi_fmap
|
||||||
@ -109,23 +72,5 @@ vmw_vsock_virtio_transport_common
|
|||||||
vmw_vsock_vmci_transport
|
vmw_vsock_vmci_transport
|
||||||
vsock
|
vsock
|
||||||
vsock_loopback
|
vsock_loopback
|
||||||
vxlan
|
|
||||||
wireguard
|
|
||||||
xfrm_algo
|
|
||||||
xfrm_user
|
|
||||||
xor
|
xor
|
||||||
x_tables
|
x_tables
|
||||||
xt_addrtype
|
|
||||||
xt_comment
|
|
||||||
xt_conntrack
|
|
||||||
xt_limit
|
|
||||||
xt_mark
|
|
||||||
xt_MASQUERADE
|
|
||||||
xt_multiport
|
|
||||||
xt_nat
|
|
||||||
xt_nfacct
|
|
||||||
xt_NFLOG
|
|
||||||
xt_physdev
|
|
||||||
xt_REDIRECT
|
|
||||||
xt_set
|
|
||||||
xt_tcpudp
|
|
||||||
|
@ -1,7 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
|
cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
|
||||||
source creator_exports.sh
|
source creator_exports.sh
|
||||||
source creator_functions.sh
|
source creator_functions.sh
|
||||||
@ -22,9 +19,7 @@ install_binary $(which openssl) && cp -r /etc/ssl "${ROOT}/etc/"
|
|||||||
install_binary $(which cryptsetup)
|
install_binary $(which cryptsetup)
|
||||||
install_binary $(which blkid)
|
install_binary $(which blkid)
|
||||||
install_binary $(which fdisk)
|
install_binary $(which fdisk)
|
||||||
install_binary $(which sysctl)
|
|
||||||
install_binary $(which mkfs.ext4)
|
install_binary $(which mkfs.ext4)
|
||||||
install_binary $(which ssh-keygen)
|
|
||||||
install_binary $(which fsarchiver)
|
install_binary $(which fsarchiver)
|
||||||
install_kmod
|
install_kmod
|
||||||
install_busybox
|
install_busybox
|
||||||
|
@ -1,7 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
||||||
|
|
||||||
# root of the initrd, that will be used to create the cpio archive
|
# root of the initrd, that will be used to create the cpio archive
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
echo_cyan() {
|
echo_cyan() {
|
||||||
echo -e "\033[0;36m$1\033[0m"
|
echo -e "\033[0;36m$1\033[0m"
|
||||||
}
|
}
|
||||||
@ -186,7 +184,6 @@ scan_modules() {
|
|||||||
|
|
||||||
install_dtrfs_api() {
|
install_dtrfs_api() {
|
||||||
local my_location="$(pwd)"
|
local my_location="$(pwd)"
|
||||||
echo_cyan "Building dtrfs_api..."
|
|
||||||
cd ../../dtrfs_api && cargo build --release || {
|
cd ../../dtrfs_api && cargo build --release || {
|
||||||
echo_yellow "Could not build dtrfs_api. Looking for binary at $(pwd)/dtrfs_api"
|
echo_yellow "Could not build dtrfs_api. Looking for binary at $(pwd)/dtrfs_api"
|
||||||
}
|
}
|
||||||
@ -197,7 +194,7 @@ install_dtrfs_api() {
|
|||||||
|
|
||||||
create_archive() {
|
create_archive() {
|
||||||
local archive="detee-$(hostnamectl hostname)-${KERNEL}.cpio.gz"
|
local archive="detee-$(hostnamectl hostname)-${KERNEL}.cpio.gz"
|
||||||
echo_cyan "Creating archive $(pwd)/$archive"
|
echo_cyan "Creating archive build/$archive"
|
||||||
echo $archive > .archive_name
|
echo $archive > .archive_name
|
||||||
my_location="$(pwd)"
|
my_location="$(pwd)"
|
||||||
cd ${ROOT}
|
cd ${ROOT}
|
||||||
|
@ -1,7 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
source /usr/lib/dtrfs/init_functions.sh
|
source /usr/lib/dtrfs/init_functions.sh
|
||||||
|
|
||||||
install_url="/tmp/detee_install_url"
|
install_url="/tmp/detee_install_url"
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
load_modules() {
|
load_modules() {
|
||||||
cat /load_modules.sh | bash
|
cat /load_modules.sh | bash
|
||||||
}
|
}
|
||||||
@ -41,48 +39,27 @@ create_certs() {
|
|||||||
-days 365 -subj "$subject" 2>/dev/null
|
-days 365 -subj "$subject" 2>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_network_device() {
|
# expects kernel param in this format: detee_net=192.168.122.140_24_192.168.122.1_1.1.1.1
|
||||||
local device="$1" settings="$2" ip_addr='' mask='' cidr='' gateway=''
|
setup_network() {
|
||||||
|
local settings='' ip_addr='' mask='' cidr='' gateway='' nameserver=''
|
||||||
|
settings=$(cat /proc/cmdline | grep -oE 'detee_net=[0-9a-z\_\:\.]+' | cut -d '=' -f2)
|
||||||
|
# TODO: replace with exit 0 when you are ready to force a kernel panic
|
||||||
[[ -z "$settings" ]] && return 0
|
[[ -z "$settings" ]] && return 0
|
||||||
ip_addr="$( echo ${settings} | cut -d '_' -f1 )"
|
settings="${settings#detee_net=}"
|
||||||
mask="$( echo ${settings} | cut -d '_' -f2 )"
|
ip_addr="$( echo ${settings} | cut -d'_' -f1 )"
|
||||||
|
mask="$( echo ${settings} | cut -d'_' -f2 )"
|
||||||
cidr="${ip_addr}/${mask}"
|
cidr="${ip_addr}/${mask}"
|
||||||
gateway="$( echo ${settings} | cut -d '_' -f3 )"
|
gateway="$( echo ${settings} | cut -d'_' -f3 )"
|
||||||
|
nameserver="$( echo ${settings} | cut -d'_' -f4 )"
|
||||||
|
|
||||||
ip addr add $cidr dev $device
|
ip addr add $cidr dev eth0
|
||||||
ip link set $device up
|
ip link set eth0 up
|
||||||
sysctl -w net.ipv6.conf.$device.accept_ra=0
|
|
||||||
ip route add default via $gateway
|
ip route add default via $gateway
|
||||||
|
echo nameserver $nameserver > /etc/resolv.conf
|
||||||
sleep 2
|
sleep 2
|
||||||
ping -c 2 $gateway
|
ping -c 2 $gateway
|
||||||
}
|
}
|
||||||
|
|
||||||
# Expects kernel param in this format: detee_net=192.168.122.140_24_192.168.122.1_1.1.1.1
|
|
||||||
# In case the interface name is not specified, it defaults to eth0
|
|
||||||
# Supports manual device, for example: detee_net_eth1
|
|
||||||
# TODO: test if it is required to specify mac instead of device name
|
|
||||||
setup_network() {
|
|
||||||
local device_eth0_cfg='' device_cfg='' device_configs=''
|
|
||||||
sysctl -w net.ipv6.conf.all.accept_ra=0
|
|
||||||
sysctl -w net.ipv6.conf.default.accept_ra=0
|
|
||||||
# handle the default: detee_net=...
|
|
||||||
device_eth0_cfg=$(cat /proc/cmdline | grep -oE "detee_net=[0-9a-f\_\:\.]+" | cut -d '=' -f2)
|
|
||||||
[[ -z "$device_eth0_cfg" ]] || setup_network_device eth0 $device_eth0_cfg
|
|
||||||
|
|
||||||
# handle extra devices: detee_net_eth1=...
|
|
||||||
device_configs=$(cat /proc/cmdline| grep -oE "detee_net_[a-z0-9]*=[0-9a-f\_\:\.]+")
|
|
||||||
while read -r device_cfg; do
|
|
||||||
setup_network_device \
|
|
||||||
$(echo $device_cfg | cut -d '=' -f1 | cut -d '_' -f3) \
|
|
||||||
$(echo $device_cfg | cut -d '=' -f2)
|
|
||||||
done <<< "$( echo "$device_configs" )"
|
|
||||||
|
|
||||||
echo nameserver 1.1.1.1 >> /etc/resolv.conf
|
|
||||||
echo nameserver 1.0.0.1 >> /etc/resolv.conf
|
|
||||||
echo nameserver 2606:4700:4700::1111 >> /etc/resolv.conf
|
|
||||||
echo nameserver 2606:4700:4700::1001 >> /etc/resolv.conf
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# detee_ghu stands for GitHub user and expects format detee_ghu=ghe0
|
# detee_ghu stands for GitHub user and expects format detee_ghu=ghe0
|
||||||
github_ssh_key() {
|
github_ssh_key() {
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
# This script is called by dtrfs_api to install an OS.
|
# This script is called by dtrfs_api to install an OS.
|
||||||
|
|
||||||
[[ -z "$INSTALL_URL" ]] && {
|
[[ -z "$INSTALL_URL" ]] && {
|
||||||
@ -9,16 +7,11 @@
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
[[ -z "$INSTALL_SHA" ]] && {
|
[[ -z "$INSTALL_URL" ]] && {
|
||||||
echo "Did not find INSTALL_SHA env variable".
|
echo "Did not find INSTALL_SHA env variable".
|
||||||
exit 2
|
exit 2
|
||||||
}
|
}
|
||||||
|
|
||||||
[[ -z "$VM_HOSTNAME" ]] && {
|
|
||||||
echo "Did not find VM_HOSTNAME env variable".
|
|
||||||
exit 2
|
|
||||||
}
|
|
||||||
|
|
||||||
[[ -f "$ROOT_KEYFILE" ]] || {
|
[[ -f "$ROOT_KEYFILE" ]] || {
|
||||||
echo "Did not find keyfile at the following location: $ROOT_KEYFILE"
|
echo "Did not find keyfile at the following location: $ROOT_KEYFILE"
|
||||||
exit 3
|
exit 3
|
||||||
@ -62,15 +55,6 @@ fsarchiver restdir /mnt/template.fsa /
|
|||||||
rm /mnt/template.fsa
|
rm /mnt/template.fsa
|
||||||
# TODO: decide for UX if maybe we should allow user to inject fstab
|
# TODO: decide for UX if maybe we should allow user to inject fstab
|
||||||
echo "" > /mnt/etc/fstab
|
echo "" > /mnt/etc/fstab
|
||||||
echo "=== Setting up guest hostname as $VM_HOSTNAME"
|
hostname=$(cat /proc/cmdline | grep -oE 'detee_name=[0-9a-z\_\.\-]+' | cut -d '=' -f2)
|
||||||
echo $VM_HOSTNAME > /mnt/etc/hostname
|
echo "=== Setting up guest hostname as $hostname"
|
||||||
|
[[ -n "$hostname" ]] && echo $hostname > /mnt/etc/hostname
|
||||||
echo "=== Generating SSH public keys"
|
|
||||||
echo "root:x:0:0:root:/root:/bin/sh" > /etc/passwd
|
|
||||||
[[ -f "/mnt/etc/ssh/ssh_host_rsa_key" ]] ||
|
|
||||||
ssh-keygen -t rsa -f /mnt/etc/ssh/ssh_host_rsa_key -N '' > /dev/null
|
|
||||||
[[ -f "/mnt/etc/ssh/ssh_host_ecdsa_key" ]] ||
|
|
||||||
ssh-keygen -t ecdsa -f /mnt/etc/ssh/ssh_host_ecdsa_key -N '' > /dev/null
|
|
||||||
[[ -f "/mnt/etc/ssh/ssh_host_ed25519_key" ]] ||
|
|
||||||
ssh-keygen -t ed25519 -f /mnt/etc/ssh/ssh_host_ed25519_key -N '' > /dev/null
|
|
||||||
echo "=== Done! Download keys from /server_pubkeys"
|
|
||||||
|
@ -1,7 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
|
cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
|
||||||
|
|
||||||
dir="/tmp/dtrfs"
|
dir="/tmp/dtrfs"
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# SPDX-License-Identifier: Unlicense
|
|
||||||
|
|
||||||
kernel_path="/boot/vmlinuz-linux"
|
|
||||||
|
|
||||||
dtrfs_path="$1"
|
|
||||||
dtrfs_name=$(basename $dtrfs_path)
|
|
||||||
dtrfs_sha=$(sha256sum $dtrfs_path | awk '{ print $1 }')
|
|
||||||
kernel_name="vmlinuz-linux-$(uname -r)"
|
|
||||||
kernel_sha=$(sha256sum $kernel_path | awk '{ print $1 }')
|
|
||||||
|
|
||||||
scp $dtrfs_path registry.detee.ltd:/var/www/html/${dtrfs_name}
|
|
||||||
ssh registry.detee.ltd ln -s $dtrfs_name /var/www/html/${dtrfs_sha}
|
|
||||||
|
|
||||||
scp $kernel_path registry.detee.ltd:/var/www/html/${kernel_name}
|
|
||||||
ssh registry.detee.ltd ln -s $kernel_name /var/www/html/${kernel_sha}
|
|
||||||
|
|
||||||
echo "Also add this to detee-cli/src/snp/mod.rs"
|
|
||||||
echo "
|
|
||||||
name: \"dtrfs-$(uname -r)\".to_string(),
|
|
||||||
vendor: \"ghe0\".to_string(),
|
|
||||||
dtrfs_url: \"http://registry.detee.ltd/${dtrfs_name}\".to_string(),
|
|
||||||
dtrfs_sha: \"${dtrfs_sha}\".to_string(),
|
|
||||||
kernel_url: \"http://registry.detee.ltd/${kernel_name}\".to_string(),
|
|
||||||
kernel_sha: \"${kernel_sha}\".to_string()
|
|
||||||
"
|
|
Loading…
Reference in New Issue
Block a user