21 Commits
Author SHA1 Message Date
Dreaded_X 427ec6f61d feat: Reuse compiled regex
Committed / committed (pull_request) Successful in 26s
CI / cargo shear (pull_request) Successful in 5m12s
CI / prek (pull_request) Failing after 6m43s
2026-10-20 03:11:27 +02:00
Dreaded_X 8149ffbc37 feat: Include boot.ipxe script 2026-10-20 02:59:13 +02:00
Dreaded_X 620f36d0bb feat: Added http server that serve the same files 2026-10-20 02:56:39 +02:00
Dreaded_X a5594c768d feat: Make bind ip configurable through cli 2026-10-15 04:46:48 +02:00
Dreaded_X 5a5df6bfc3 feat!: Pass connected to ip to serve callback 2026-10-15 03:43:37 +02:00
Dreaded_X 5552013eeb feat: Bind to address that was connected to 2026-10-15 03:40:20 +02:00
Dreaded_X cc84f13ed7 feat: Use fixed size buffer for receiving packet 2026-10-15 03:32:22 +02:00
Dreaded_X f04e7d80e2 fix: Only connections from localhost are allowed
CI / cargo shear (pull_request) Successful in 7m58s
Audit / cargo audit (push) Successful in 8m1s
CI / prek (pull_request) Failing after 8m34s
Committed / committed (pull_request) Successful in 53s
2026-10-04 05:53:47 +02:00
Dreaded_X 0a72e2e8d9 feat: Added wrapper crate for including ipxe binaries 2026-10-04 05:53:46 +02:00
Dreaded_X b728cd7d22 feat!: Added command to serve config files over tftp
This is a breaking change as the return type of cluster.nodes has
changed, resulting in old templates potentially no longer working.
2026-10-04 05:53:45 +02:00
Dreaded_X 5a54283248 feat: Make tftp serve callback async 2026-10-04 05:53:42 +02:00
Dreaded_X cae78a31a8 refactor: Deduplicate paths 2026-10-04 05:53:18 +02:00
Dreaded_X 88405a1e63 feat: Retain context 2026-10-04 05:53:17 +02:00
Dreaded_X 35aedf1d5b feat: Configs are captured in a string first 2026-10-04 05:53:15 +02:00
Dreaded_X 1ad7a928ae feat: Improve concurrency 2026-10-04 05:53:14 +02:00
Dreaded_X 992615c116 feat: Make application async 2026-10-04 05:53:13 +02:00
Dreaded_X 406fa6259b feat: Added ftfp server implementation 2026-10-04 05:53:09 +02:00
Dreaded_X 57828436f4 chore(deps): Update all dependencies
Committed / committed (pull_request) Successful in 26s
CI / cargo shear (pull_request) Successful in 6m46s
CI / prek (pull_request) Successful in 10m14s
Release-plz / Release-plz Release (push) Successful in 7m19s
Release-plz / Release-plz PR (push) Successful in 12m0s
Audit / cargo audit (push) Successful in 15m6s
CI / prek (push) Successful in 9m32s
CI / cargo shear (push) Successful in 6m20s
Fixes: #26
2026-10-04 03:42:09 +02:00
Dreaded_X 9408c8cb4a fix: Pin committed action
Committed / committed (pull_request) Successful in 25s
CI / cargo shear (pull_request) Successful in 7m10s
CI / prek (pull_request) Successful in 12m5s
CI / cargo shear (push) Successful in 6m24s
CI / prek (push) Successful in 9m41s
Release-plz / Release-plz PR (push) Successful in 6m2s
Release-plz / Release-plz Release (push) Successful in 5m32s
2026-10-04 03:09:52 +02:00
Dreaded_X 4bdc1a1d63 chore: Migrate to rust audit fork
Committed / committed (pull_request) Successful in 25s
CI / cargo shear (pull_request) Successful in 4m21s
CI / prek (pull_request) Successful in 5m24s
CI / cargo shear (push) Successful in 6m22s
Release-plz / Release-plz Release (push) Successful in 6m51s
CI / prek (push) Successful in 7m1s
Release-plz / Release-plz PR (push) Successful in 2m54s
2026-08-27 05:01:57 +02:00
Dreaded_X 4fcce0e40a chore(deps): Upgrade dependencies
CI / cargo shear (pull_request) Successful in 5m4s
Committed / committed (pull_request) Successful in 1m10s
CI / prek (pull_request) Successful in 6m52s
Audit / cargo audit (push) Successful in 5m27s
CI / cargo shear (push) Successful in 5m27s
CI / prek (push) Successful in 5m59s
Release-plz / Release-plz Release (push) Successful in 4m51s
Release-plz / Release-plz PR (push) Successful in 4m55s
2026-08-26 02:51:51 +02:00
30 changed files with 1979 additions and 822 deletions
+2 -1
View File
@@ -7,6 +7,7 @@ on:
- "**/Cargo.lock" - "**/Cargo.lock"
schedule: schedule:
- cron: "0 0 * * *" - cron: "0 0 * * *"
workflow_dispatch:
jobs: jobs:
audit: audit:
@@ -22,6 +23,6 @@ jobs:
- name: Setup rust cache - name: Setup rust cache
uses: Swatinem/rust-cache@v2 uses: Swatinem/rust-cache@v2
- name: Audit check - name: Audit check
uses: rustsec/audit-check@v2.0.0 uses: https://git.huizinga.dev/infra/rust-audit-check@v3.0.0
with: with:
token: ${{ secrets.GITEA_TOKEN }} token: ${{ secrets.GITEA_TOKEN }}
+6 -6
View File
@@ -11,9 +11,9 @@ jobs:
name: committed name: committed
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v6
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: crate-ci/committed@master - uses: crate-ci/committed@v1.1.11
with: with:
commits: "origin/${{ gitea.base_ref }}..HEAD" commits: "origin/${{ gitea.base_ref }}..HEAD"
+3
View File
@@ -0,0 +1,3 @@
[submodule "ipxe/ipxe"]
path = ipxe/ipxe
url = git@github.com:rkubes/ipxe
+1 -1
View File
@@ -76,6 +76,6 @@ repos:
glob: .gitea/workflows/*.yaml glob: .gitea/workflows/*.yaml
- repo: https://github.com/crate-ci/committed - repo: https://github.com/crate-ci/committed
rev: v1.1.8 rev: v1.1.11
hooks: hooks:
- id: committed - id: committed
Generated
+799 -617
View File
File diff suppressed because it is too large Load Diff
+22 -14
View File
@@ -7,30 +7,38 @@ publish = ["infra"]
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
[workspace] [workspace]
members = ["xtask"] members = ["ipxe", "xtask"]
[workspace.dependencies] [workspace.dependencies]
schemars = { version = "1.2.1", features = ["semver1"] } schemars = { version = "1.2.2", features = ["semver1"] }
serde_json = "1.0.149" serde_json = "1.0.151"
[dependencies] [dependencies]
clap = { version = "4.6.0", features = ["derive"] } async-walkdir = "2.2.0"
clap_complete = "4.6.0" byteorder = "1.5.0"
gix-discover = { version = "0.49.0", features = ["sha1"] } clap = { version = "4.6.7", features = ["derive"] }
minijinja = { version = "2.18.0", features = ["json", "loader"] } clap_complete = "4.6.11"
futures = "0.3.34"
gix-discover = { version = "0.56.0", features = ["sha1"] }
minijinja = { version = "2.24.0", features = ["json", "loader"] }
netascii = "0.1.0"
num_enum = "0.7.6"
optional_struct = "0.5.2" optional_struct = "0.5.2"
reqwest = { version = "0.13.2", default-features = false, features = [ regex = "1.13.1"
"blocking", reqwest = { version = "0.13.5", default-features = false, features = [
"stream",
"native-tls", "native-tls",
] } ] }
schemars = { workspace = true } schemars = { workspace = true }
semver = { version = "1.0.27", features = ["serde"] } semver = { version = "1.0.28", features = ["serde"] }
serde = { version = "1.0.228", features = ["derive"] } serde = { version = "1.0.229", features = ["derive"] }
serde_json = { workspace = true } serde_json = { workspace = true }
serde_yaml = "0.9.34" serde_yaml = "0.9.34"
thiserror = "2.0.18" thiserror = "2.0.21"
walkdir = "2.5.0" tokio = { version = "1.52.1", features = ["full"] }
ipxe = { path = "./ipxe" }
axum = { version = "0.8.9", features = ["macros"] }
socket2 = "0.6.5"
socket-pktinfo = "0.4.1"
[lib] [lib]
test = false test = false
+10
View File
@@ -0,0 +1,10 @@
[package]
name = "ipxe"
version = "0.1.0"
edition = "2024"
[build-dependencies]
build-print = "1.0.1"
[dependencies]
include_dir = "0.7.4"
+57
View File
@@ -0,0 +1,57 @@
use std::env;
use std::path::PathBuf;
use std::process::{Command, Stdio};
use build_print::error;
fn main() {
let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
.canonicalize()
.unwrap();
let src_dir = manifest_dir.join("ipxe").join("src");
let mut command = Command::new("make");
command
.stdout(Stdio::piped())
.current_dir(&src_dir)
.env_remove("DEBUG")
.env_remove("PROFILE")
.args([
"-j",
&std::thread::available_parallelism()
.unwrap()
.get()
.to_string(),
])
.arg(format!(
"EMBED={}",
manifest_dir
.join("src")
.join("embed.ipxe")
.to_string_lossy(),
));
let files = ["bin/ipxe.pxe", "bin-x86_64-efi/ipxe.efi"].map(PathBuf::from);
for file in &files {
command.arg(file);
}
let output = command.output().unwrap();
if !output.status.success() {
error!("{}", String::from_utf8_lossy(&output.stderr));
}
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap())
.canonicalize()
.unwrap()
.join("ipxe");
std::fs::remove_dir_all(&out_dir).ok();
for file in &files {
let input = src_dir.join(file);
let output = out_dir.join(file.file_name().unwrap());
std::fs::create_dir_all(output.parent().unwrap()).unwrap();
std::fs::copy(input, output).unwrap();
}
}
Submodule
+1
Submodule ipxe/ipxe added at 8892af68a2
+4
View File
@@ -0,0 +1,4 @@
#!ipxe
dhcp
chain boot.ipxe
+3
View File
@@ -0,0 +1,3 @@
use include_dir::{Dir, include_dir};
pub static IPXE_DIR: Dir<'_> = include_dir!("$OUT_DIR/ipxe");
+1 -1
View File
@@ -1,4 +1,4 @@
[toolchain] [toolchain]
channel = "nightly-2026-03-12" channel = "nightly-2026-10-01"
profile = "default" profile = "default"
components = ["rust-analyzer"] components = ["rust-analyzer"]
+19
View File
@@ -0,0 +1,19 @@
#!ipxe
echo Starting ${serial}
:start
goto node_${serial} || exit
# Default behavior (non install mode) is to exit iPXE script
{% for cluster in clusters%}
{% for _, node in cluster.nodes|items %}
{%- if node.install.serial -%}
# {{ cluster.name }}/{{ node.hostname }}
:node_{{ node.install.serial }}
imgfree
kernel https://pxe.factory.talos.dev/image/{{ node.schematic }}/v{{ cluster.version.talos }}/kernel-{{ node.arch }} {{ node.kernelArgs|join(" ") }} {% if node.install.auto %}talos.config={{httpUrl}}/talos/{{cluster.name}}/{{node.hostname}}.yaml{% endif +%}
initrd https://pxe.factory.talos.dev/image/{{ node.schematic }}/v{{ cluster.version.talos }}/initramfs-{{ node.arch }}.xz
boot
{% endif %}
{% endfor %}
{% endfor %}
+8
View File
@@ -1,3 +1,4 @@
use std::net::IpAddr;
use std::path::PathBuf; use std::path::PathBuf;
use clap::{Args, Parser, Subcommand}; use clap::{Args, Parser, Subcommand};
@@ -49,4 +50,11 @@ pub enum Commands {
Generate, Generate,
/// Generate completions for your current shell /// Generate completions for your current shell
ShellCompletions, ShellCompletions,
/// Serve config files over tftp
Serve {
#[arg(short, long, default_value = "3000")]
port: u16,
#[arg(long, default_value = "0.0.0.0")]
ip: IpAddr,
},
} }
+84 -37
View File
@@ -1,18 +1,22 @@
use std::collections::HashMap;
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command;
use std::str::FromStr; use std::str::FromStr;
use async_walkdir::WalkDir;
use futures::StreamExt;
use futures::stream::FuturesUnordered;
use minijinja::Environment; use minijinja::Environment;
use optional_struct::{Applicable, optional_struct}; use optional_struct::{Applicable, optional_struct};
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use walkdir::WalkDir; use tokio::process::Command;
use crate::environment::PathEnvironment; use crate::environment::PathEnvironment;
use crate::node::{Node, OptionalNodeDeserialize}; use crate::node::{Node, OptionalNodeDeserialize};
use crate::patch::Patches; use crate::patch::Patches;
use crate::{get_configs_path, get_talos_path}; use crate::talosconfig::TalosConfig;
use crate::{get_configs_path, get_talos_path, run_command};
#[optional_struct] #[optional_struct]
#[derive(Debug, Deserialize, JsonSchema, Clone)] #[derive(Debug, Deserialize, JsonSchema, Clone)]
@@ -68,31 +72,35 @@ struct ClusterDeserialize {
base: Base, base: Base,
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize, Clone)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Cluster { pub struct Cluster {
pub(crate) name: String, pub(crate) name: String,
pub(crate) version: Version, pub(crate) version: Version,
nodes: Vec<Node>, nodes: HashMap<String, Node>,
cluster_env: ClusterEnv, cluster_env: ClusterEnv,
pub(crate) control_plane_ip: Ipv4Addr, pub(crate) control_plane_ip: Ipv4Addr,
pub(crate) secrets_file: PathBuf, pub(crate) secrets_file: PathBuf,
} }
impl Cluster { impl Cluster {
pub(crate) fn get(cluster_name: &str, env: &Environment) -> Self { pub(crate) async fn get(cluster_name: &str, env: &Environment<'static>) -> Self {
let path = get_talos_path().join("clusters").join("default.yaml"); let path = get_talos_path().join("clusters").join("default.yaml");
let default: OptionalClusterDeserialize = if path.exists() { let default: OptionalClusterDeserialize = if path.exists() {
let content = std::fs::read_to_string(path).unwrap(); let content = tokio::fs::read_to_string(path).await.unwrap();
serde_yaml::from_str(&content).unwrap()
// The deserialization makes a blocking web request
tokio::task::spawn_blocking(move || serde_yaml::from_str(&content).unwrap())
.await
.unwrap()
} else { } else {
Default::default() Default::default()
}; };
let mut path = get_talos_path().join("clusters").join(cluster_name); let mut path = get_talos_path().join("clusters").join(cluster_name);
path.add_extension("yaml"); path.add_extension("yaml");
let content = std::fs::read_to_string(path).unwrap(); let content = tokio::fs::read_to_string(path).await.unwrap();
let mut cluster: OptionalClusterDeserialize = serde_yaml::from_str(&content).unwrap(); let mut cluster: OptionalClusterDeserialize = serde_yaml::from_str(&content).unwrap();
@@ -114,28 +122,32 @@ impl Cluster {
let cluster = Self { let cluster = Self {
name: cluster_name.into(), name: cluster_name.into(),
version: cluster.version, version: cluster.version,
nodes: vec![], nodes: Default::default(),
cluster_env: cluster.cluster_env, cluster_env: cluster.cluster_env,
control_plane_ip: cluster.control_plane_ip, control_plane_ip: cluster.control_plane_ip,
secrets_file, secrets_file,
}; };
let nodes = nodes let nodes = nodes.iter().map(|name| async {
.iter() let node = Node::get(name, env, &cluster, &default, &base).await;
.map(|name| Node::get(name, env, &cluster, &default, &base)) (node.hostname().to_owned(), node)
.collect(); });
let nodes = FuturesUnordered::from_iter(nodes).collect().await;
Self { nodes, ..cluster } Self { nodes, ..cluster }
} }
pub fn get_all() -> Vec<Cluster> { pub async fn get_all() -> HashMap<String, Cluster> {
let env = PathEnvironment::new_patches(); let env = PathEnvironment::new_patches();
WalkDir::new(get_talos_path().join("clusters")) let names: Vec<_> = WalkDir::new(get_talos_path().join("clusters"))
.into_iter() .filter_map(|e| async { e.ok() })
.filter_map(|e| e.ok()) .filter(|e| {
.filter(|e| e.metadata().unwrap().is_file()) let e = e.clone();
.filter_map(|e| { async move { e.metadata().await.unwrap().is_file() }
})
.filter_map(|e| async move {
let mut path = PathBuf::from_str(&e.file_name().to_string_lossy()).unwrap(); let mut path = PathBuf::from_str(&e.file_name().to_string_lossy()).unwrap();
path.set_extension(""); path.set_extension("");
@@ -145,18 +157,35 @@ impl Cluster {
return None; return None;
} }
Some(Cluster::get(&name, &env)) Some(name)
}) })
.collect() .collect()
.await;
// Get the clusters concurrently
FuturesUnordered::from_iter(names.iter().map(|name| {
let env = env.clone();
let name = name.clone();
async move {
let cluster = Cluster::get(&name, &env).await;
(name, cluster)
}
}))
.collect()
.await
} }
pub fn nodes(&self) -> &[Node] { pub fn nodes(&self) -> impl Iterator<Item = &Node> {
&self.nodes self.nodes.values()
} }
pub fn talosctl_gen_config_command(&self) -> Command { pub fn node(&self, node: &str) -> Option<&Node> {
let path = get_configs_path().join(&self.name).join("talosconfig"); self.nodes.get(node)
}
pub async fn talosconfig(&self) -> String {
let mut command = Command::new("talosctl"); let mut command = Command::new("talosctl");
command.args([ command.args([
"gen", "gen",
@@ -168,41 +197,59 @@ impl Cluster {
"--output-types", "--output-types",
"talosconfig", "talosconfig",
"-o", "-o",
path.to_str().expect("Path should be valid utf-8"), "-",
]); ]);
command run_command(command).await
} }
pub fn talosctl_add_endpoint_command(&self) -> Command { pub fn talosconfig_path(&self) -> PathBuf {
let path = get_configs_path().join(&self.name).join("talosconfig"); get_configs_path().join(&self.name).join("talosconfig")
}
async fn talosconfig_add_endpoint(&self) {
let mut command = Command::new("talosctl"); let mut command = Command::new("talosctl");
command.args([ command.args([
"config", "config",
"--talosconfig", "--talosconfig",
path.to_str().expect("Path should be valid utf-8"), self.talosconfig_path()
.to_str()
.expect("Path should be valid utf-8"),
"endpoint", "endpoint",
&self.control_plane_ip.to_string(), &self.control_plane_ip.to_string(),
]); ]);
command run_command(command).await;
} }
pub fn talosctl_merge_command(&self) -> Command { pub async fn talosconfig_write(&self) {
let cluster_path = get_configs_path().join(&self.name).join("talosconfig"); let config = self.talosconfig().await;
let path = get_configs_path().join("talosconfig");
let path = self.talosconfig_path();
tokio::fs::create_dir_all(path.parent().expect("talosconfig should have parent"))
.await
.unwrap();
tokio::fs::write(path, config).await.unwrap();
self.talosconfig_add_endpoint().await
}
pub async fn talosconfig_merge(&self) {
let mut command = Command::new("talosctl"); let mut command = Command::new("talosctl");
command.args([ command.args([
"config", "config",
"--talosconfig", "--talosconfig",
path.to_str().expect("Path should be valid utf-8"), TalosConfig::merged_path()
.to_str()
.expect("Path should be valid utf-8"),
"merge", "merge",
cluster_path.to_str().expect("Path should be valid utf-8"), self.talosconfig_path()
.to_str()
.expect("Path should be valid utf-8"),
]); ]);
command run_command(command).await;
} }
} }
+60 -59
View File
@@ -2,15 +2,17 @@ use std::net::Ipv4Addr;
use std::ops::Deref; use std::ops::Deref;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use async_walkdir::WalkDir;
use futures::{Stream, StreamExt};
use minijinja::value::ViaDeserialize; use minijinja::value::ViaDeserialize;
use minijinja::{AutoEscape, Environment, path_loader}; use minijinja::{AutoEscape, Environment, path_loader};
use walkdir::WalkDir;
use crate::{get_configs_path, get_talos_path}; use crate::{get_configs_path, get_talos_path};
/// Transparent wrapper around minijinja::Environment that loads templates from a path and /// Transparent wrapper around minijinja::Environment that loads templates from a path and
/// configures better defaults. It also implements IntoIter, making it possible to iterate over all /// configures better defaults. It also implements IntoIter, making it possible to iterate over all
/// the templates. /// the templates.
#[derive(Clone)]
pub struct PathEnvironment<'a> { pub struct PathEnvironment<'a> {
env: Environment<'a>, env: Environment<'a>,
path: PathBuf, path: PathBuf,
@@ -23,46 +25,50 @@ fn apply_netmask(
Ok((*ip & *netmask).to_string()) Ok((*ip & *netmask).to_string())
} }
pub fn configure_environment(env: &mut Environment) {
// Configure jinja
env.set_trim_blocks(true);
env.set_lstrip_blocks(true);
env.set_undefined_behavior(minijinja::UndefinedBehavior::Strict);
env.set_auto_escape_callback(|_| AutoEscape::None);
// Add filters
env.add_filter("to_prefix", |netmask: ViaDeserialize<Ipv4Addr>| {
let mask = netmask.to_bits();
let prefix = mask.leading_ones();
if mask.checked_shl(prefix).unwrap_or(0) == 0 {
Ok(prefix as u8)
} else {
Err(minijinja::Error::new(
minijinja::ErrorKind::InvalidOperation,
"invalid IP prefix length",
))
}
});
env.add_function("apply_netmask", apply_netmask);
// Helper function for getting the path to kubeconfig files
env.add_filter("kubeconfig", move |names: Vec<String>| {
names
.iter()
.map(|name| {
get_configs_path()
.join(name)
.join("kubeconfig")
.to_string_lossy()
.to_string()
})
.collect::<Vec<_>>()
});
}
impl<'a> PathEnvironment<'a> { impl<'a> PathEnvironment<'a> {
pub fn new(path: &Path) -> Self { pub fn new(path: &Path) -> Self {
let mut env = Environment::new(); let mut env = Environment::new();
// Configure jinja configure_environment(&mut env);
env.set_trim_blocks(true);
env.set_lstrip_blocks(true);
env.set_undefined_behavior(minijinja::UndefinedBehavior::Strict);
env.set_auto_escape_callback(|_| AutoEscape::None);
// Add filters
env.add_filter("to_prefix", |netmask: ViaDeserialize<Ipv4Addr>| {
let mask = netmask.to_bits();
let prefix = mask.leading_ones();
if mask.checked_shl(prefix).unwrap_or(0) == 0 {
Ok(prefix as u8)
} else {
Err(minijinja::Error::new(
minijinja::ErrorKind::InvalidOperation,
"invalid IP prefix length",
))
}
});
env.add_function("apply_netmask", apply_netmask);
// Helper function for getting the path to kubeconfig files
env.add_filter("kubeconfig", move |names: Vec<String>| {
names
.iter()
.map(|name| {
get_configs_path()
.join(name)
.join("kubeconfig")
.to_string_lossy()
.to_string()
})
.collect::<Vec<_>>()
});
// Add path loader // Add path loader
env.set_loader(path_loader(&path)); env.set_loader(path_loader(&path));
@@ -76,6 +82,23 @@ impl<'a> PathEnvironment<'a> {
pub(crate) fn new_patches() -> Self { pub(crate) fn new_patches() -> Self {
Self::new(&get_talos_path().join("patches")) Self::new(&get_talos_path().join("patches"))
} }
pub fn files(&self) -> impl Stream<Item = String> {
// Find all templates in path
WalkDir::new(&self.path)
.filter_map(|e| async { e.ok() })
.filter(|e| {
let e = e.clone();
async move { e.metadata().await.unwrap().is_file() }
})
.map(move |e| {
e.path()
.strip_prefix(&self.path)
.expect("All paths should have prefix")
.to_string_lossy()
.to_string()
})
}
} }
// Make PathEnvironment act like a normal Environment transparently // Make PathEnvironment act like a normal Environment transparently
@@ -86,25 +109,3 @@ impl<'a> Deref for PathEnvironment<'a> {
&self.env &self.env
} }
} }
// Iterate over all the files in the path
impl<'a, 'b> IntoIterator for &'b PathEnvironment<'a> {
type Item = String;
type IntoIter = impl Iterator<Item = Self::Item>;
fn into_iter(self) -> Self::IntoIter {
// Find all templates in path
WalkDir::new(&self.path)
.into_iter()
.filter_map(|e| e.ok())
.filter(|e| e.metadata().unwrap().is_file())
.map(|e| {
e.path()
.strip_prefix(&self.path)
.expect("All paths should have prefix")
.to_string_lossy()
.to_string()
})
}
}
+10
View File
@@ -0,0 +1,10 @@
use crete::tftp::ServerError;
use thiserror::Error;
#[derive(Debug, Error)]
pub enum Error {
#[error("No clusters where found")]
NoClustersFound,
#[error("Server error: {0}")]
ServerError(#[from] ServerError),
}
+58
View File
@@ -0,0 +1,58 @@
use crete::cluster::Cluster;
use crete::environment::configure_environment;
use ipxe::IPXE_DIR;
use minijinja::{Environment, context};
use regex::regex;
// TODO: Make this a proper async function
pub fn get_file(
filename: impl ToString,
http_url: impl ToString,
) -> impl Future<Output = Option<(Vec<u8>, &'static str)>> {
let re = regex!(r"^talos/(?<cluster>.+)/(?<node>.+)\.ya?ml$");
let filename: String = filename.to_string();
let re = re.clone();
async move {
const IPXE_PATTERN: &str = "ipxe/";
if filename == format!("{IPXE_PATTERN}boot.ipxe") {
let mut env = Environment::new();
configure_environment(&mut env);
let template = env
.template_from_str(include_str!("./boot.ipxe"))
.expect("Template should be valid");
let clusters = Cluster::get_all().await;
let content = template
.render(context! {
clusters => clusters.values().collect::<Vec<_>>(),
httpUrl => http_url.to_string()
})
.unwrap();
Some((content.into(), "text/plain; charset=utf-8"))
} else if let Some(filename) = filename.strip_prefix(IPXE_PATTERN) {
Some((
IPXE_DIR.get_file(filename)?.contents().to_owned(),
"application/octet-stream",
))
} else if let Some(caps) = re.captures(&filename) {
let cluster = &caps["cluster"];
let node = &caps["node"];
let clusters = Cluster::get_all().await;
let cluster = clusters.get(cluster)?;
let node = cluster.node(node)?;
let config = node.config(cluster).await;
Some((config.into(), "application/yaml; charset=utf-8"))
} else {
None
}
}
}
+46
View File
@@ -0,0 +1,46 @@
use std::path::PathBuf;
use axum::debug_handler;
use axum::extract::Request;
use axum::http::Uri;
use axum::response::IntoResponse;
use reqwest::{StatusCode, header};
use crate::file::get_file;
#[debug_handler]
pub async fn handler(req: Request) -> impl IntoResponse {
let uri: Uri = req
.headers()
.iter()
.find(|(name, _)| header::HOST.eq(name))
.map(|(_, value)| value)
.expect("Host header should exist")
.to_str()
.expect("Header value should be valid ASCII")
.parse()
.expect("Host should be valid Uri");
let host = uri.host().expect("Uri should have host");
let port = uri.port().map(|port| port.as_u16()).unwrap_or(80);
let Some(path) = req.uri().path().strip_prefix("/") else {
return StatusCode::BAD_REQUEST.into_response();
};
let Some((file, content_type)) = get_file(path, format!("http://{host}:{port}")).await else {
return StatusCode::NOT_FOUND.into_response();
};
let path = PathBuf::from(path);
let filename = path.file_name().unwrap();
let filename = filename.to_str().unwrap();
let content_type = [(header::CONTENT_TYPE, content_type)];
let disposition = [(
header::CONTENT_DISPOSITION,
format!("inline; filename=\"{filename}\""),
)];
(content_type, disposition, file).into_response()
}
+16 -1
View File
@@ -1,13 +1,17 @@
#![feature(impl_trait_in_assoc_type, path_absolute_method)] #![feature(path_absolute_method)]
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::OnceLock; use std::sync::OnceLock;
use tokio::process::Command;
pub mod cluster; pub mod cluster;
pub mod environment; pub mod environment;
pub mod node; pub mod node;
pub mod patch; pub mod patch;
pub mod schematic; pub mod schematic;
pub mod secret; pub mod secret;
pub mod talosconfig;
pub mod tftp;
pub(crate) static REPO_PATH: OnceLock<PathBuf> = OnceLock::new(); pub(crate) static REPO_PATH: OnceLock<PathBuf> = OnceLock::new();
@@ -28,3 +32,14 @@ pub fn get_talos_path() -> PathBuf {
pub fn get_configs_path() -> PathBuf { pub fn get_configs_path() -> PathBuf {
get_repo_path().join("configs") get_repo_path().join("configs")
} }
pub async fn run_command(mut command: Command) -> String {
let output = command.output().await.unwrap();
if !output.stderr.is_empty() {
println!("{}", String::from_utf8_lossy(&output.stderr).trim_end());
}
String::from_utf8_lossy(&output.stdout)
.trim_end()
.to_owned()
}
+77 -43
View File
@@ -1,95 +1,129 @@
mod cli; mod cli;
mod error;
mod file;
mod http;
use std::process::Command; use std::net::SocketAddr;
use std::pin::pin;
use axum::Router;
use axum::routing::get;
use clap::{CommandFactory, Parser}; use clap::{CommandFactory, Parser};
use clap_complete::{Shell, generate as generate_complete}; use clap_complete::{Shell, generate as generate_complete};
use crete::cluster::Cluster; use crete::cluster::Cluster;
use crete::environment::PathEnvironment; use crete::environment::PathEnvironment;
use crete::{get_configs_path, get_repo_path, set_repo_path}; use crete::talosconfig::{get_current_context, set_context};
use crete::{get_configs_path, get_repo_path, set_repo_path, tftp};
use futures::StreamExt;
use futures::future::join_all;
use minijinja::context; use minijinja::context;
use thiserror::Error;
use crate::cli::{Cli, Commands, GlobalOpts}; use crate::cli::{Cli, Commands, GlobalOpts};
use crate::error::Error;
use crate::file::get_file;
use crate::http::handler;
#[derive(Debug, Error)] async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
enum Error { let clusters = Cluster::get_all().await;
#[error("No clusters where found")]
NoClustersFound,
}
fn run_command(mut command: Command) {
let output = command.output().unwrap();
if !output.stdout.is_empty() {
println!("{}", String::from_utf8_lossy(&output.stdout).trim_end());
}
if !output.stderr.is_empty() {
println!("{}", String::from_utf8_lossy(&output.stderr).trim_end());
}
}
fn generate(opts: &GlobalOpts) -> Result<(), Error> {
set_repo_path(&opts.repo);
let clusters = Cluster::get_all();
if clusters.is_empty() { if clusters.is_empty() {
return Err(Error::NoClustersFound); return Err(Error::NoClustersFound);
} }
let path = opts.repo.join("rendered"); let path = opts.repo.join("rendered");
if path.exists() { // We don't really care if this fails, as that likely mean that the directory did not exist
std::fs::remove_dir_all(&path).unwrap(); tokio::fs::remove_dir_all(&path).await.ok();
} tokio::fs::create_dir_all(&path).await.unwrap();
std::fs::create_dir(&path).unwrap();
// Render templates // Render templates
let template_env = PathEnvironment::new(&get_repo_path().join("templates")); let template_env = PathEnvironment::new(&get_repo_path().join("templates"));
for template_name in &template_env {
let mut stream = pin!(template_env.files());
while let Some(template_name) = stream.next().await {
let template = template_env.get_template(&template_name).unwrap(); let template = template_env.get_template(&template_name).unwrap();
let content = template let content = template
.render(context! { .render(context! {
clusters, clusters => clusters.values().collect::<Vec<_>>(),
root => opts.repo root => opts.repo
}) })
.unwrap(); .unwrap();
std::fs::write(path.join(template_name), content).unwrap(); tokio::fs::write(path.join(template_name), content)
.await
.unwrap();
} }
let context = get_current_context().await;
// Remove existing config files and create output directory // Remove existing config files and create output directory
let path = get_configs_path(); let path = get_configs_path();
if path.exists() { tokio::fs::remove_dir_all(&path).await.ok();
std::fs::remove_dir_all(&path).unwrap(); tokio::fs::create_dir_all(&path).await.unwrap();
}
std::fs::create_dir(&path).unwrap();
// Generate config files // Generate config files
for cluster in clusters { join_all(clusters.values().map(|cluster| async move {
for node in cluster.nodes() { join_all(cluster.nodes().map(|node| {
run_command(node.talosctl_gen_config_command(&cluster)); let cluster = cluster.clone();
} async move {
node.config_write(&cluster).await;
}
}))
.await;
run_command(cluster.talosctl_gen_config_command()); // Run these commands in parallel with the the node commands
run_command(cluster.talosctl_add_endpoint_command()); // NOTE: These do need to happen in the correct order
run_command(cluster.talosctl_merge_command()); cluster.talosconfig_write().await;
}))
.await;
// Merge all the cluster talosconfig files into a single file
// Since this all modifies the same output file this has to happen sequentially
for (_, cluster) in clusters {
cluster.talosconfig_merge().await;
}
if let Some(context) = context {
set_context(context).await;
} }
Ok(()) Ok(())
} }
fn main() -> Result<(), Error> { #[tokio::main]
async fn main() -> Result<(), Error> {
let cli = Cli::parse(); let cli = Cli::parse();
set_repo_path(&cli.global_opts.repo);
match cli.command { match cli.command {
Commands::Generate => generate(&cli.global_opts)?, Commands::Generate => generate(&cli.global_opts).await?,
Commands::ShellCompletions => generate_complete( Commands::ShellCompletions => generate_complete(
Shell::from_env().unwrap_or(Shell::Bash), Shell::from_env().unwrap_or(Shell::Bash),
&mut Cli::command(), &mut Cli::command(),
"crete", "crete",
&mut std::io::stdout(), &mut std::io::stdout(),
), ),
Commands::Serve { port, ip } => {
tokio::spawn(async move {
let app = Router::new().fallback_service(get(handler));
let addr: SocketAddr = (ip, port).into();
let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
println!("Http server started on {addr}");
axum::serve(listener, app).await.unwrap();
});
tftp::serve(ip, move |filename, ip| {
let filename = filename.to_owned();
async move {
get_file(filename, format!("http://{ip}:{port}"))
.await
.map(|(file, _)| file)
}
})
.await?;
}
}; };
Ok(()) Ok(())
+32 -12
View File
@@ -1,16 +1,17 @@
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use std::process::Command; use std::path::PathBuf;
use minijinja::Environment; use minijinja::Environment;
use optional_struct::{Applicable, optional_struct}; use optional_struct::{Applicable, optional_struct};
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tokio::process::Command;
use crate::cluster::{Base, Cluster}; use crate::cluster::{Base, Cluster};
use crate::patch::{OptionalPatches, OptionalPatchesString, Patches}; use crate::patch::{OptionalPatches, OptionalPatchesString, Patches};
use crate::schematic::Schematic; use crate::schematic::Schematic;
use crate::secret::Secret; use crate::secret::Secret;
use crate::{get_configs_path, get_talos_path}; use crate::{get_configs_path, get_talos_path, run_command};
#[derive(Debug, Serialize, Deserialize, JsonSchema, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Serialize, Deserialize, JsonSchema, Clone, Copy, PartialEq, Eq)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@@ -90,7 +91,7 @@ pub(crate) struct NodeDeserialize {
sops: Secret, sops: Secret,
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize, Clone)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Node { pub struct Node {
hostname: String, hostname: String,
@@ -106,9 +107,9 @@ pub struct Node {
} }
impl Node { impl Node {
pub(crate) fn get( pub(crate) async fn get(
node_name: &str, node_name: &str,
env: &Environment, env: &Environment<'static>,
cluster: &Cluster, cluster: &Cluster,
default: &OptionalNodeDeserialize, default: &OptionalNodeDeserialize,
base: &Base, base: &Base,
@@ -121,7 +122,7 @@ impl Node {
.to_string(); .to_string();
path.add_extension("yaml"); path.add_extension("yaml");
let content = std::fs::read_to_string(path).unwrap(); let content = tokio::fs::read_to_string(path).await.unwrap();
let node: OptionalNodeDeserialize = serde_yaml::from_str(&content).unwrap(); let node: OptionalNodeDeserialize = serde_yaml::from_str(&content).unwrap();
@@ -172,15 +173,16 @@ impl Node {
}; };
// Render patches // Render patches
let patches = patches.render(env, cluster, &node); let patches = patches.render(env, cluster, &node).await;
Node { patches, ..node } Node { patches, ..node }
} }
pub fn talosctl_gen_config_command(&self, cluster: &Cluster) -> Command { pub fn hostname(&self) -> &str {
let mut path = get_configs_path().join(&cluster.name).join(&self.hostname); &self.hostname
path.add_extension("yaml"); }
pub async fn config(&self, cluster: &Cluster) -> String {
let mut command = Command::new("talosctl"); let mut command = Command::new("talosctl");
command.args([ command.args([
"gen", "gen",
@@ -204,7 +206,7 @@ impl Node {
"--with-docs=false", "--with-docs=false",
"--with-examples=false", "--with-examples=false",
"-o", "-o",
path.to_str().expect("Path should be valid utf-8"), "-",
]); ]);
for patch in &self.patches.all { for patch in &self.patches.all {
@@ -218,7 +220,25 @@ impl Node {
]); ]);
} }
command run_command(command).await
}
pub fn config_path(&self, cluster: &Cluster) -> PathBuf {
let mut path = get_configs_path().join(&cluster.name).join(&self.hostname);
path.add_extension("yaml");
path
}
pub async fn config_write(&self, cluster: &Cluster) {
let config = self.config(cluster).await;
let path = self.config_path(cluster);
tokio::fs::create_dir_all(path.parent().expect("config should have parent"))
.await
.unwrap();
tokio::fs::write(path, config).await.unwrap();
} }
} }
+29 -20
View File
@@ -16,27 +16,36 @@ pub(crate) struct Patches<T> {
pub(crate) type OptionalPatchesString = OptionalPatches<String>; pub(crate) type OptionalPatchesString = OptionalPatches<String>;
fn render( async fn render(
patches: Vec<String>, patches: Vec<String>,
env: &Environment, env: &Environment<'static>,
cluster: &Cluster, cluster: &Cluster,
node: &Node, node: &Node,
) -> Vec<serde_yaml::Value> { ) -> Vec<serde_yaml::Value> {
patches let env = env.clone();
.into_iter() let cluster = cluster.clone();
.map(|name| { let node = node.clone();
let content = env
.get_template(&name)
.unwrap()
.render(context! {
node,
cluster
})
.unwrap();
serde_yaml::from_str(&content).unwrap() // Minijinja will still have blocking I/O internally
}) tokio::task::spawn_blocking(move || {
.collect() patches
.into_iter()
.map(move |name| {
let content = env
.get_template(&name)
.unwrap()
.render(context! {
node,
cluster
})
.unwrap();
serde_yaml::from_str(&content).unwrap()
})
.collect()
})
.await
.unwrap()
} }
impl Patches<String> { impl Patches<String> {
@@ -50,15 +59,15 @@ impl Patches<String> {
} }
} }
pub(crate) fn render( pub(crate) async fn render(
self, self,
env: &Environment, env: &Environment<'static>,
cluster: &Cluster, cluster: &Cluster,
node: &Node, node: &Node,
) -> Patches<serde_yaml::Value> { ) -> Patches<serde_yaml::Value> {
Patches { Patches {
all: render(self.all.clone(), env, cluster, node), all: render(self.all.clone(), env, cluster, node).await,
control_plane: render(self.control_plane.clone(), env, cluster, node), control_plane: render(self.control_plane.clone(), env, cluster, node).await,
} }
} }
} }
+20 -9
View File
@@ -1,5 +1,6 @@
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::{Deserialize, Deserializer, Serialize}; use serde::{Deserialize, Deserializer, Serialize};
use tokio::runtime::Handle;
use crate::get_talos_path; use crate::get_talos_path;
@@ -11,7 +12,7 @@ where
let path = get_talos_path().join("schematics").join(name); let path = get_talos_path().join("schematics").join(name);
let content = std::fs::read_to_string(path).unwrap().trim().to_owned(); let content = std::fs::read_to_string(path).unwrap().trim().to_owned();
let client = reqwest::blocking::ClientBuilder::new() let client = reqwest::ClientBuilder::new()
.user_agent(format!( .user_agent(format!(
"{}/{}", "{}/{}",
std::env!("CARGO_PKG_NAME"), std::env!("CARGO_PKG_NAME"),
@@ -20,19 +21,29 @@ where
.build() .build()
.unwrap(); .unwrap();
let res = client
.post("https://factory.talos.dev/schematics")
.body(content)
.send()
.map_err(serde::de::Error::custom)?;
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
struct Response { struct Response {
id: String, id: String,
} }
let response: Response = serde_json::from_str(&res.text().map_err(serde::de::Error::custom)?) // We can't use async directly inside a custom deserializer, and using the blocking client also
.map_err(serde::de::Error::custom)?; // does not work as it will try to start tokio inside of tokio.
// So we have do this to work around it.
// NOTE: This requires that the deserialization happens inside spawn_blocking
let response = Handle::current().block_on(async {
let res = client
.post("https://factory.talos.dev/schematics")
.body(content)
.send()
.await
.map_err(serde::de::Error::custom)?;
let response: Response =
serde_json::from_str(&res.text().await.map_err(serde::de::Error::custom)?)
.map_err(serde::de::Error::custom)?;
Ok(response)
})?;
Ok(response.id) Ok(response.id)
} }
+40
View File
@@ -0,0 +1,40 @@
use std::path::PathBuf;
use serde::Deserialize;
use tokio::process::Command;
use crate::{get_configs_path, run_command};
#[derive(Debug, Deserialize)]
pub struct TalosConfig {
context: String,
}
impl TalosConfig {
pub fn merged_path() -> PathBuf {
get_configs_path().join("talosconfig")
}
}
pub async fn get_current_context() -> Option<String> {
tokio::fs::read(&TalosConfig::merged_path())
.await
.ok()
.and_then(|config| serde_yaml::from_slice(&config).ok())
.map(|config: TalosConfig| config.context)
}
pub async fn set_context(context: String) {
let mut command = Command::new("talosctl");
command.args([
"config",
"--talosconfig",
TalosConfig::merged_path()
.to_str()
.expect("Path should be valid utf-8"),
"context",
&context,
]);
run_command(command).await;
}
+20
View File
@@ -0,0 +1,20 @@
use std::io;
use std::string::FromUtf8Error;
use thiserror::Error;
#[derive(Debug, Error)]
pub enum Error {
#[error("Invalid op code '{0}'")]
InvalidOpCode(u16),
#[error("Invalid error code '{0}'")]
InvalidErrorCode(u16),
#[error("Invalid mode '{0}'")]
InvalidMode(String),
#[error("String contains invalid characters")]
InvalidString(#[from] FromUtf8Error),
#[error("Unterminated string")]
UnterminatedString,
#[error("Io error: {0}")]
Io(#[from] io::Error),
}
+7
View File
@@ -0,0 +1,7 @@
mod error;
mod packet;
mod server;
pub use error::Error;
pub use packet::Packet;
pub use server::{Error as ServerError, serve};
+355
View File
@@ -0,0 +1,355 @@
use std::io::{BufRead, BufReader, BufWriter, Cursor, Read, Write};
use std::net::SocketAddr;
use byteorder::{NetworkEndian, ReadBytesExt, WriteBytesExt};
use num_enum::{IntoPrimitive, TryFromPrimitive};
use tokio::net::UdpSocket;
use crate::tftp::Error;
// 2 bytes op code + 2 bytes block number + max 512 bytes data
pub(crate) const PACKET_SIZE: usize = 2 + 2 + 512;
fn decode_null_terminated<R>(reader: &mut BufReader<R>) -> Result<String, Error>
where
R: Read + ?Sized,
{
let mut text = Vec::new();
reader.read_until(0, &mut text)?;
// Make sure we ended with a null terminator
match text.pop() {
Some(0) => {}
None | Some(_) => return Err(Error::UnterminatedString),
}
Ok(String::from_utf8(text)?)
}
fn encode_null_terminated<W>(writer: &mut BufWriter<W>, text: impl AsRef<str>) -> Result<(), Error>
where
W: Write + ?Sized,
{
let text = text.as_ref().as_bytes();
writer.write_all(text)?;
// Add null terminator
writer.write_u8(0)?;
Ok(())
}
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Mode {
NetAscii,
Octet,
Mail,
}
impl Mode {
fn decode<R>(reader: &mut BufReader<R>) -> Result<Self, Error>
where
R: Read + ?Sized,
{
let mut mode = decode_null_terminated(reader)?;
mode.make_ascii_lowercase();
let mode = mode;
Ok(match mode.as_str() {
"netascii" => Self::NetAscii,
"octet" => Self::Octet,
"mail" => Self::Mail,
_ => return Err(Error::InvalidMode(mode)),
})
}
fn encode<W>(&self, writer: &mut BufWriter<W>) -> Result<(), Error>
where
W: Write + ?Sized,
{
let mode = match &self {
Mode::NetAscii => "netascii",
Mode::Octet => "octet",
Mode::Mail => "mail",
};
encode_null_terminated(writer, mode)?;
Ok(())
}
}
#[derive(Debug, PartialEq, Eq)]
pub struct Request {
filename: String,
mode: Mode,
}
impl Request {
pub fn filename(&self) -> &str {
&self.filename
}
fn decode<R>(reader: &mut BufReader<R>) -> Result<Self, Error>
where
R: Read + ?Sized,
{
let filename = decode_null_terminated(reader)?;
let mode = Mode::decode(reader)?;
Ok(Self { filename, mode })
}
fn encode<W>(&self, writer: &mut BufWriter<W>) -> Result<(), Error>
where
W: Write + ?Sized,
{
encode_null_terminated(writer, &self.filename)?;
self.mode.encode(writer)?;
Ok(())
}
pub fn mode(&self) -> Mode {
self.mode
}
}
#[derive(Debug)]
pub struct Data {
block: u16,
data: Vec<u8>,
}
impl Data {
fn decode<R>(reader: &mut BufReader<R>) -> Result<Self, Error>
where
R: Read + ?Sized,
{
let block = reader.read_u16::<NetworkEndian>()?;
let mut data = Vec::new();
reader.read_to_end(&mut data)?;
Ok(Self { data, block })
}
fn encode<W>(&self, writer: &mut BufWriter<W>) -> Result<(), Error>
where
W: Write + ?Sized,
{
writer.write_u16::<NetworkEndian>(self.block)?;
writer.write_all(&self.data)?;
Ok(())
}
}
#[derive(Debug)]
pub struct Ack(u16);
impl Ack {
pub fn block(&self) -> u16 {
self.0
}
fn decode<R>(reader: &mut BufReader<R>) -> Result<Self, Error>
where
R: Read + ?Sized,
{
let number = reader.read_u16::<NetworkEndian>()?;
Ok(Self(number))
}
fn encode<W>(&self, writer: &mut BufWriter<W>) -> Result<(), Error>
where
W: Write + ?Sized,
{
writer.write_u16::<NetworkEndian>(self.0)?;
Ok(())
}
}
#[derive(Debug, TryFromPrimitive, IntoPrimitive, Clone, Copy)]
#[repr(u16)]
pub enum ErrorCode {
NotDefined,
FileNotFound,
AccessViolation,
DiskFull,
Illegal,
UnknownTransferId,
FileAlreadyExists,
NoSuchUser,
}
impl ErrorCode {
fn decode<R>(reader: &mut BufReader<R>) -> Result<Self, Error>
where
R: Read + ?Sized,
{
let code = reader.read_u16::<NetworkEndian>()?;
Self::try_from_primitive(code).map_err(|err| Error::InvalidErrorCode(err.number))
}
fn encode<W>(&self, writer: &mut BufWriter<W>) -> Result<(), Error>
where
W: Write + ?Sized,
{
let code: u16 = (*self).into();
writer.write_u16::<NetworkEndian>(code)?;
Ok(())
}
}
#[derive(Debug)]
pub struct ErrorMessage {
code: ErrorCode,
message: String,
}
impl ErrorMessage {
fn decode<R>(reader: &mut BufReader<R>) -> Result<Self, Error>
where
R: Read + ?Sized,
{
let code = ErrorCode::decode(reader)?;
let message = decode_null_terminated(reader)?;
Ok(Self { code, message })
}
fn encode<W>(&self, writer: &mut BufWriter<W>) -> Result<(), Error>
where
W: Write + ?Sized,
{
self.code.encode(writer)?;
encode_null_terminated(writer, &self.message)?;
Ok(())
}
}
#[derive(Debug)]
pub enum Packet {
Read(Request),
Write(Request),
Data(Data),
Ack(Ack),
Error(ErrorMessage),
}
impl Packet {
pub fn data(block: u16, data: &[u8]) -> Self {
Self::Data(Data {
block,
data: data.into(),
})
}
pub fn ack(block: u16) -> Self {
Self::Ack(Ack(block))
}
pub fn error(code: ErrorCode, message: impl Into<String>) -> Self {
Self::Error(ErrorMessage {
code,
message: message.into(),
})
}
fn decode<R>(reader: &mut BufReader<R>) -> Result<Self, Error>
where
R: Read + ?Sized,
{
let op_code = reader.read_u16::<NetworkEndian>()?;
Ok(match op_code {
1 => Self::Read(Request::decode(reader)?),
2 => Self::Write(Request::decode(reader)?),
3 => Self::Data(Data::decode(reader)?),
4 => Self::Ack(Ack::decode(reader)?),
5 => Self::Error(ErrorMessage::decode(reader)?),
_ => return Err(Error::InvalidOpCode(op_code)),
})
}
fn encode<W>(&self, writer: &mut BufWriter<W>) -> Result<(), Error>
where
W: Write + ?Sized,
{
match &self {
Self::Read(inner) => {
writer.write_u16::<NetworkEndian>(1)?;
inner.encode(writer)?;
}
Self::Write(inner) => {
writer.write_u16::<NetworkEndian>(2)?;
inner.encode(writer)?;
}
Self::Data(inner) => {
writer.write_u16::<NetworkEndian>(3)?;
inner.encode(writer)?;
}
Self::Ack(inner) => {
writer.write_u16::<NetworkEndian>(4)?;
inner.encode(writer)?;
}
Self::Error(inner) => {
writer.write_u16::<NetworkEndian>(5)?;
inner.encode(writer)?;
}
};
Ok(())
}
pub async fn recv_from(socket: &UdpSocket) -> Result<(Self, SocketAddr), Error> {
let mut buf = [0u8; PACKET_SIZE];
let (_, src) = socket.recv_from(&mut buf).await?;
let packet = buf.try_into()?;
Ok((packet, src))
}
pub async fn send_to(&self, socket: &UdpSocket, src: &SocketAddr) -> Result<(), Error> {
let buf: Vec<_> = self.try_into()?;
socket.send_to(&buf, src).await?;
Ok(())
}
}
impl TryFrom<&Packet> for Vec<u8> {
type Error = Error;
fn try_from(packet: &Packet) -> Result<Self, Self::Error> {
let mut buf = Vec::with_capacity(PACKET_SIZE);
let mut writer = BufWriter::new(Cursor::new(&mut buf));
packet.encode(&mut writer)?;
// Normally the writer would get dropped after we return, but since it has a mutable
// borrow in buf we have to drop it first.
drop(writer);
Ok(buf)
}
}
impl TryFrom<[u8; PACKET_SIZE]> for Packet {
type Error = Error;
fn try_from(
buf: [u8; PACKET_SIZE],
) -> Result<Self, <Packet as TryFrom<[u8; PACKET_SIZE]>>::Error> {
let mut reader = BufReader::new(Cursor::new(buf));
Packet::decode(&mut reader)
}
}
+188
View File
@@ -0,0 +1,188 @@
use std::io;
use std::net::{IpAddr, SocketAddr};
use std::time::Duration;
use socket_pktinfo::{PktInfo, PktInfoUdpSocket};
use socket2::Domain;
use thiserror::Error;
use tokio::io::unix::AsyncFd;
use tokio::net::UdpSocket;
use crate::tftp::packet::{ErrorCode, Mode, PACKET_SIZE};
use crate::tftp::{self, Packet};
#[derive(Debug, Error)]
pub enum Error {
#[error("{0}")]
Tftp(#[from] tftp::Error),
#[error("Io error: {0}")]
Io(#[from] io::Error),
#[error("Unsupported operation: {0:#?}")]
UnsupportedOperation(Packet),
#[error("File not found: {0}")]
FileNotFound(String),
#[error("Unsupported mode: {0:?}")]
UnsupportedMode(Mode),
#[error("Source changed: {0}")]
SourceChanged(SocketAddr),
#[error("UnexpectedPacket: {0:#?}")]
UnexpectedPacket(Packet),
#[error("Timeout")]
Timeout,
}
pub async fn handle_connection<F, Fut>(
info: PktInfo,
packet: Packet,
callback: F,
) -> Result<(), Error>
where
F: Fn(&str, IpAddr) -> Fut,
Fut: Future<Output = Option<Vec<u8>>>,
{
let src = info.addr_src;
let socket = UdpSocket::bind((info.addr_dst, 0)).await?;
println!(
"{}: Connecting back from {}",
src,
socket.local_addr().expect("Local addr should be set")
);
let Packet::Read(request) = packet else {
Packet::error(ErrorCode::NotDefined, "Operation not supported")
.send_to(&socket, &info.addr_src)
.await?;
return Err(Error::UnsupportedOperation(packet));
};
let filename = request.filename();
println!("{src}: {filename} [{:?}]", request.mode());
let Some(data) = callback(filename, info.addr_dst).await else {
Packet::error(ErrorCode::FileNotFound, "Unknown file")
.send_to(&socket, &src)
.await?;
return Err(Error::FileNotFound(filename.into()));
};
let mode = request.mode();
let data = match mode {
// In case of netascii mode we need to re-encode to escape certain sequences
Mode::NetAscii => netascii::Netascii::from_bytes(data).collect(),
Mode::Octet => data,
_ => {
Packet::error(
ErrorCode::NotDefined,
format!("Mode {mode:?} is not supported"),
)
.send_to(&socket, &src)
.await?;
return Err(Error::UnsupportedMode(mode));
}
};
let mut chunks = data.chunks(512).enumerate();
let mut chunk = chunks.next();
let mut timeout = 0;
loop {
// Send the first chunk
if let Some((index, chunk)) = chunk {
Packet::data((index + 1) as u16, chunk)
.send_to(&socket, &src)
.await?;
}
tokio::select! {
recv = Packet::recv_from(&socket) => {
timeout = 0;
let (packet, new_src) = recv?;
// I think this is might technically be possible and fine, but I don't
// really know how to test it properly so we don't support it.
if new_src != src {
Packet::error(ErrorCode::Illegal, "Source changed")
.send_to(&socket, &src)
.await?;
return Err(Error::SourceChanged(new_src));
}
match packet {
Packet::Ack(ack) => {
// If we receive an ack for the current chunk go to the next one
if let Some((index, _)) = chunk
&& (index + 1) as u16 == ack.block()
{
chunk = chunks.next();
}
if chunk.is_none() {
break;
}
}
_ => {
Packet::error(ErrorCode::Illegal, "Unexpected packet")
.send_to(&socket, &src)
.await?;
return Err(Error::UnexpectedPacket(packet));
}
}
},
_ = tokio::time::sleep(Duration::from_secs(1)) => {
timeout += 1;
if timeout == 5 {
return Err(Error::Timeout);
}
}
}
}
println!("{src}: Transmission complete");
Ok(())
}
pub async fn serve<F, Fut>(ip: IpAddr, callback: F) -> Result<!, Error>
where
F: Fn(&str, IpAddr) -> Fut + Clone + Send + 'static,
Fut: Future<Output = Option<Vec<u8>>> + Send + 'static,
{
let socket = PktInfoUdpSocket::new(Domain::IPV4)?;
socket.set_nonblocking(true)?;
let addr: SocketAddr = (ip, 69).into();
socket.bind(&addr.into())?;
let async_fd = AsyncFd::new(socket)?;
let mut buf = [0u8; PACKET_SIZE];
println!("Tftp server started on {addr}");
loop {
let mut guard = async_fd.readable().await?;
let (packet, info) = match guard.try_io(|inner| inner.get_ref().recv(&mut buf)) {
Ok(Ok((_, info))) => (buf.try_into()?, info),
Ok(Err(e)) => return Err(e)?,
// Socket was not ready
Err(_would_block) => continue,
};
let callback = callback.clone();
let src = info.addr_src;
tokio::spawn({
async move {
if let Err(err) = handle_connection(info, packet, callback).await {
println!("{src}: {err}")
}
}
});
}
}
+1 -1
View File
@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
repo_path = "1.2.4" repo_path = "1.4.1"
schemars = { workspace = true } schemars = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
crete = { path = ".." } crete = { path = ".." }