testnet/dtrfs
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow injection of hostname via API

Browse Source
This commit is contained in:
ghe0 2025-03-21 23:05:23 +02:00
parent de94e74ab6
commit 3d90a7b39b
Signed by: ghe0
GPG Key ID: 451028EE56A0FBB4
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dtrfs_api/src/main.rs
View File

@ -84,6 +84,7 @@ 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,
@ -95,7 +96,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) { match os::encrypt_and_install_os(&form.url, &form.sha, &form.keyfile, &form.hostname) {
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:?}")),
} }

2
dtrfs_api/src/os.rs
View File

@ -15,6 +15,7 @@ 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)?;
@ -24,6 +25,7 @@ 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() {

12
scripts/install_os.sh
View File

@ -7,11 +7,16 @@
exit 1 exit 1
} }
[[ -z "$INSTALL_URL" ]] && { [[ -z "$INSTALL_SHA" ]] && {
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
@ -55,9 +60,8 @@ 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
hostname=$(cat /proc/cmdline | grep -oE 'detee_name=[0-9a-z\_\.\-]+' | cut -d '=' -f2) echo "=== Setting up guest hostname as $VM_HOSTNAME"
echo "=== Setting up guest hostname as $hostname" echo $VM_HOSTNAME > /mnt/etc/hostname
[[ -n "$hostname" ]] && echo $hostname > /mnt/etc/hostname
echo "=== Generating SSH public keys" echo "=== Generating SSH public keys"
echo "root:x:0:0:root:/root:/bin/sh" > /etc/passwd echo "root:x:0:0:root:/root:/bin/sh" > /etc/passwd