--wip-- [skip ci]

.gitea/workflows/audit.yaml

@@ -7,7 +7,6 @@ on:
       - "**/Cargo.lock"
   schedule:
     - cron: "0 0 * * *"
-  workflow_dispatch:
 
 jobs:
   audit:
@@ -23,6 +22,6 @@ jobs:
       - name: Setup rust cache
         uses: Swatinem/rust-cache@v2
       - name: Audit check
-        uses: https://git.huizinga.dev/infra/rust-audit-check@v3.0.0
+        uses: rustsec/audit-check@v2.0.0
         with:
           token: ${{ secrets.GITEA_TOKEN }}

Cargo.toml

@@ -14,10 +14,13 @@ schemars = { version = "1.2.1", features = ["semver1"] }
 serde_json = "1.0.149"
 
 [dependencies]
+byteorder = "1.5.0"
 clap = { version = "4.6.0", features = ["derive"] }
 clap_complete = "4.6.0"
-gix-discover = { version = "0.55.0", features = ["sha1"] }
+gix-discover = { version = "0.49.0", features = ["sha1"] }
 minijinja = { version = "2.18.0", features = ["json", "loader"] }
+netascii = "0.1.0"
+num_enum = "0.7.6"
 optional_struct = "0.5.2"
 reqwest = { version = "0.13.2", default-features = false, features = [
   "blocking",
@@ -30,6 +33,7 @@ serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { workspace = true }
 serde_yaml = "0.9.34"
 thiserror = "2.0.18"
+tokio = { version = "1.52.1", features = ["full"] }
 walkdir = "2.5.0"
 
 [lib]

src/cli.rs

@@ -49,4 +49,6 @@ pub enum Commands {
     Generate,
     /// Generate completions for your current shell
     ShellCompletions,
+    /// Test
+    Serve,
 }

src/lib.rs

@@ -8,6 +8,7 @@ pub mod node;
 pub mod patch;
 pub mod schematic;
 pub mod secret;
+pub mod tftp;
 
 pub(crate) static REPO_PATH: OnceLock<PathBuf> = OnceLock::new();
 

src/main.rs

@@ -6,7 +6,8 @@ use clap::{CommandFactory, Parser};
 use clap_complete::{Shell, generate as generate_complete};
 use crete::cluster::Cluster;
 use crete::environment::PathEnvironment;
-use crete::{get_configs_path, get_repo_path, set_repo_path};
+use crete::tftp::ServerError;
+use crete::{get_configs_path, get_repo_path, set_repo_path, tftp};
 use minijinja::context;
 use thiserror::Error;
 
@@ -16,6 +17,8 @@ use crate::cli::{Cli, Commands, GlobalOpts};
 enum Error {
     #[error("No clusters where found")]
     NoClustersFound,
+    #[error("Server error: {0}")]
+    Server(#[from] ServerError),
 }
 
 fn run_command(mut command: Command) {
@@ -79,7 +82,8 @@ fn generate(opts: &GlobalOpts) -> Result<(), Error> {
     Ok(())
 }
 
-fn main() -> Result<(), Error> {
+#[tokio::main]
+async fn main() -> Result<(), Error> {
     let cli = Cli::parse();
 
     match cli.command {
@@ -90,6 +94,14 @@ fn main() -> Result<(), Error> {
             "crete",
             &mut std::io::stdout(),
         ),
+        Commands::Serve => {
+            tftp::serve(|filename| match filename {
+                "ipxe.pxe" => Some(include_bytes!("../bin/ipxe.pxe").into()),
+                "test" => Some(vec![1, 2, 3, 4]),
+                _ => None,
+            })
+            .await?
+        }
     };
 
     Ok(())

src/tftp/error.rs

@@ -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),
+}

src/tftp/mod.rs

@@ -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};

src/tftp/packet.rs

@@ -0,0 +1,353 @@
+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 = Vec::with_capacity(PACKET_SIZE);
+        let (_, src) = socket.recv_buf_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<Vec<u8>> for Packet {
+    type Error = Error;
+
+    fn try_from(buf: Vec<u8>) -> Result<Self, <Packet as TryFrom<Vec<u8>>>::Error> {
+        let mut reader = BufReader::new(Cursor::new(buf));
+
+        Packet::decode(&mut reader)
+    }
+}

src/tftp/server.rs

@@ -0,0 +1,162 @@
+use std::io;
+use std::net::SocketAddr;
+use std::time::Duration;
+
+use thiserror::Error;
+use tokio::net::UdpSocket;
+
+use crate::tftp::packet::{ErrorCode, Mode};
+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(
+    src: SocketAddr,
+    packet: Packet,
+    callback: impl (Fn(&str) -> Option<Vec<u8>>) + Send + Clone + 'static,
+) -> Result<(), Error> {
+    let socket = UdpSocket::bind("127.0.0.1:0").await?;
+    println!(
+        "{src}: Connecting from {}",
+        socket.local_addr().expect("Socket is bound")
+    );
+
+    let Packet::Read(request) = packet else {
+        Packet::error(ErrorCode::NotDefined, "Operation not supported")
+            .send_to(&socket, &src)
+            .await?;
+
+        return Err(Error::UnsupportedOperation(packet));
+    };
+
+    let filename = request.filename();
+    println!("{src}: {filename} [{:?}]", request.mode());
+
+    let Some(data) = callback(filename) 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 byte
+        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(
+    callback: impl (Fn(&str) -> Option<Vec<u8>>) + Send + Clone + 'static,
+) -> Result<(), Error> {
+    let socket = UdpSocket::bind("127.0.0.1:69").await?;
+
+    println!("Server started");
+    loop {
+        let (packet, src) = Packet::recv_from(&socket).await?;
+
+        let callback = callback.clone();
+        tokio::spawn({
+            async move {
+                if let Err(err) = handle_connection(src, packet, callback).await {
+                    println!("{src}: {err}")
+                }
+            }
+        });
+    }
+}

test

@@ -0,0 +1 @@
+