Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Release-plz
|
593b6e9b06 |
@@ -1,3 +0,0 @@
|
|||||||
[submodule "ipxe/ipxe"]
|
|
||||||
path = ipxe/ipxe
|
|
||||||
url = git@github.com:rkubes/ipxe
|
|
||||||
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [0.1.4](https://git.huizinga.dev/infra/crete/compare/v0.1.3...v0.1.4) - 2026-10-04
|
||||||
|
|
||||||
|
### <!-- 2 -->Bug Fixes
|
||||||
|
|
||||||
|
- Pin committed action
|
||||||
|
|
||||||
|
### <!-- 5 -->Miscellaneous Tasks
|
||||||
|
|
||||||
|
- Migrate to rust audit fork
|
||||||
|
|
||||||
## [0.1.3](https://git.huizinga.dev/infra/crete/compare/v0.1.2...v0.1.3) - 2026-04-21
|
## [0.1.3](https://git.huizinga.dev/infra/crete/compare/v0.1.2...v0.1.3) - 2026-04-21
|
||||||
|
|
||||||
### <!-- 0 -->Features
|
### <!-- 0 -->Features
|
||||||
|
|||||||
Generated
+27
-447
@@ -2,15 +2,6 @@
|
|||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 4
|
version = 4
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "aho-corasick"
|
|
||||||
version = "1.1.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba"
|
|
||||||
dependencies = [
|
|
||||||
"memchr",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anstream"
|
name = "anstream"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
@@ -61,57 +52,6 @@ dependencies = [
|
|||||||
"windows-sys",
|
"windows-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "async-channel"
|
|
||||||
version = "2.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
|
|
||||||
dependencies = [
|
|
||||||
"concurrent-queue",
|
|
||||||
"event-listener-strategy",
|
|
||||||
"futures-core",
|
|
||||||
"pin-project-lite",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "async-fs"
|
|
||||||
version = "2.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5"
|
|
||||||
dependencies = [
|
|
||||||
"async-lock",
|
|
||||||
"blocking",
|
|
||||||
"futures-lite",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "async-lock"
|
|
||||||
version = "3.4.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
|
|
||||||
dependencies = [
|
|
||||||
"event-listener",
|
|
||||||
"event-listener-strategy",
|
|
||||||
"pin-project-lite",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "async-task"
|
|
||||||
version = "4.7.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "async-walkdir"
|
|
||||||
version = "2.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8ed40ca66d45a6775511920324e4ae05c81673f9133c187c4970a3089c3ae27c"
|
|
||||||
dependencies = [
|
|
||||||
"async-fs",
|
|
||||||
"futures-lite",
|
|
||||||
"thiserror",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "atomic-waker"
|
name = "atomic-waker"
|
||||||
version = "1.1.2"
|
version = "1.1.2"
|
||||||
@@ -124,70 +64,6 @@ version = "1.5.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
|
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "axum"
|
|
||||||
version = "0.8.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
|
|
||||||
dependencies = [
|
|
||||||
"axum-core",
|
|
||||||
"axum-macros",
|
|
||||||
"bytes",
|
|
||||||
"form_urlencoded",
|
|
||||||
"futures-util",
|
|
||||||
"http",
|
|
||||||
"http-body",
|
|
||||||
"http-body-util",
|
|
||||||
"hyper",
|
|
||||||
"hyper-util",
|
|
||||||
"itoa",
|
|
||||||
"matchit",
|
|
||||||
"memchr",
|
|
||||||
"mime",
|
|
||||||
"percent-encoding",
|
|
||||||
"pin-project-lite",
|
|
||||||
"serde_core",
|
|
||||||
"serde_json",
|
|
||||||
"serde_path_to_error",
|
|
||||||
"serde_urlencoded",
|
|
||||||
"sync_wrapper",
|
|
||||||
"tokio",
|
|
||||||
"tower",
|
|
||||||
"tower-layer",
|
|
||||||
"tower-service",
|
|
||||||
"tracing",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "axum-core"
|
|
||||||
version = "0.5.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
|
|
||||||
dependencies = [
|
|
||||||
"bytes",
|
|
||||||
"futures-core",
|
|
||||||
"http",
|
|
||||||
"http-body",
|
|
||||||
"http-body-util",
|
|
||||||
"mime",
|
|
||||||
"pin-project-lite",
|
|
||||||
"sync_wrapper",
|
|
||||||
"tower-layer",
|
|
||||||
"tower-service",
|
|
||||||
"tracing",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "axum-macros"
|
|
||||||
version = "0.5.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7aa268c23bfbbd2c4363b9cd302a4f504fb2a9dfe7e3451d66f35dd392e20aca"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.119",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "base64"
|
name = "base64"
|
||||||
version = "0.23.1"
|
version = "0.23.1"
|
||||||
@@ -206,19 +82,6 @@ version = "2.13.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
|
checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "blocking"
|
|
||||||
version = "1.7.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a70e4329df6cb94385eed412ec92375c3cdd8a6e502493d1229b6414e4036dfa"
|
|
||||||
dependencies = [
|
|
||||||
"async-channel",
|
|
||||||
"async-task",
|
|
||||||
"futures-io",
|
|
||||||
"futures-lite",
|
|
||||||
"piper",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bstr"
|
name = "bstr"
|
||||||
version = "1.13.1"
|
version = "1.13.1"
|
||||||
@@ -230,12 +93,6 @@ dependencies = [
|
|||||||
"serde_core",
|
"serde_core",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "build-print"
|
|
||||||
version = "1.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d8e6738dfb11354886f890621b4a34c0b177f75538023f7100b608ab9adbd66b"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bumpalo"
|
name = "bumpalo"
|
||||||
version = "3.20.3"
|
version = "3.20.3"
|
||||||
@@ -327,15 +184,6 @@ version = "1.0.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
|
checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "concurrent-queue"
|
|
||||||
version = "2.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
|
|
||||||
dependencies = [
|
|
||||||
"crossbeam-utils",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "core-foundation"
|
name = "core-foundation"
|
||||||
version = "0.10.1"
|
version = "0.10.1"
|
||||||
@@ -354,39 +202,23 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crete"
|
name = "crete"
|
||||||
version = "0.1.3"
|
version = "0.1.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-walkdir",
|
|
||||||
"axum",
|
|
||||||
"byteorder",
|
|
||||||
"clap",
|
"clap",
|
||||||
"clap_complete",
|
"clap_complete",
|
||||||
"futures",
|
|
||||||
"gix-discover",
|
"gix-discover",
|
||||||
"ipxe",
|
|
||||||
"minijinja",
|
"minijinja",
|
||||||
"netascii",
|
|
||||||
"num_enum",
|
|
||||||
"optional_struct",
|
"optional_struct",
|
||||||
"regex",
|
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"schemars",
|
"schemars",
|
||||||
"semver",
|
"semver",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_yaml",
|
"serde_yaml",
|
||||||
"socket-pktinfo",
|
|
||||||
"socket2",
|
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio",
|
"walkdir",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crossbeam-utils"
|
|
||||||
version = "0.8.23"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "defmt"
|
name = "defmt"
|
||||||
version = "0.3.100"
|
version = "0.3.100"
|
||||||
@@ -466,26 +298,6 @@ dependencies = [
|
|||||||
"windows-sys",
|
"windows-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "event-listener"
|
|
||||||
version = "5.4.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5a23add41df1562121a9393cb065eab5146a1242410f23a644851e90cfd669d2"
|
|
||||||
dependencies = [
|
|
||||||
"parking",
|
|
||||||
"pin-project-lite",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "event-listener-strategy"
|
|
||||||
version = "0.5.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
|
|
||||||
dependencies = [
|
|
||||||
"event-listener",
|
|
||||||
"pin-project-lite",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "faster-hex"
|
name = "faster-hex"
|
||||||
version = "0.10.1"
|
version = "0.10.1"
|
||||||
@@ -534,21 +346,6 @@ dependencies = [
|
|||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "futures"
|
|
||||||
version = "0.3.34"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3"
|
|
||||||
dependencies = [
|
|
||||||
"futures-channel",
|
|
||||||
"futures-core",
|
|
||||||
"futures-executor",
|
|
||||||
"futures-io",
|
|
||||||
"futures-sink",
|
|
||||||
"futures-task",
|
|
||||||
"futures-util",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-channel"
|
name = "futures-channel"
|
||||||
version = "0.3.34"
|
version = "0.3.34"
|
||||||
@@ -565,36 +362,12 @@ version = "0.3.34"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
|
checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "futures-executor"
|
|
||||||
version = "0.3.34"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432"
|
|
||||||
dependencies = [
|
|
||||||
"futures-core",
|
|
||||||
"futures-task",
|
|
||||||
"futures-util",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-io"
|
name = "futures-io"
|
||||||
version = "0.3.34"
|
version = "0.3.34"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
|
checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "futures-lite"
|
|
||||||
version = "2.6.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
|
|
||||||
dependencies = [
|
|
||||||
"fastrand",
|
|
||||||
"futures-core",
|
|
||||||
"futures-io",
|
|
||||||
"parking",
|
|
||||||
"pin-project-lite",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-macro"
|
name = "futures-macro"
|
||||||
version = "0.3.34"
|
version = "0.3.34"
|
||||||
@@ -624,7 +397,6 @@ version = "0.3.34"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
|
checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-channel",
|
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-io",
|
"futures-io",
|
||||||
"futures-macro",
|
"futures-macro",
|
||||||
@@ -927,12 +699,6 @@ version = "1.10.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
|
checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "httpdate"
|
|
||||||
version = "1.0.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hyper"
|
name = "hyper"
|
||||||
version = "1.11.1"
|
version = "1.11.1"
|
||||||
@@ -946,7 +712,6 @@ dependencies = [
|
|||||||
"http",
|
"http",
|
||||||
"http-body",
|
"http-body",
|
||||||
"httparse",
|
"httparse",
|
||||||
"httpdate",
|
|
||||||
"itoa",
|
"itoa",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
@@ -1098,25 +863,6 @@ dependencies = [
|
|||||||
"icu_properties",
|
"icu_properties",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "include_dir"
|
|
||||||
version = "0.7.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
|
|
||||||
dependencies = [
|
|
||||||
"include_dir_macros",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "include_dir_macros"
|
|
||||||
version = "0.7.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
version = "2.14.2"
|
version = "2.14.2"
|
||||||
@@ -1133,14 +879,6 @@ version = "2.12.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0"
|
checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ipxe"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"build-print",
|
|
||||||
"include_dir",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "is_terminal_polyfill"
|
name = "is_terminal_polyfill"
|
||||||
version = "1.70.2"
|
version = "1.70.2"
|
||||||
@@ -1285,12 +1023,6 @@ version = "0.4.34"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
|
checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "matchit"
|
|
||||||
version = "0.8.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memchr"
|
name = "memchr"
|
||||||
version = "2.8.3"
|
version = "2.8.3"
|
||||||
@@ -1312,12 +1044,6 @@ version = "0.3.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5449c8c750f1a07ea702bbd212bd999fceece9b3d1508b17023b3e174583124b"
|
checksum = "5449c8c750f1a07ea702bbd212bd999fceece9b3d1508b17023b3e174583124b"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mime"
|
|
||||||
version = "0.3.17"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "minijinja"
|
name = "minijinja"
|
||||||
version = "2.24.0"
|
version = "2.24.0"
|
||||||
@@ -1357,34 +1083,6 @@ dependencies = [
|
|||||||
"tempfile",
|
"tempfile",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "netascii"
|
|
||||||
version = "0.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "205c45083b6725eb4671392c7c399510ad1498dd0275f1a2e68a70a34ebdf1b1"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num_enum"
|
|
||||||
version = "0.7.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26"
|
|
||||||
dependencies = [
|
|
||||||
"num_enum_derive",
|
|
||||||
"rustversion",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num_enum_derive"
|
|
||||||
version = "0.7.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro-crate",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 2.0.119",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "once_cell"
|
name = "once_cell"
|
||||||
version = "1.21.4"
|
version = "1.21.4"
|
||||||
@@ -1461,12 +1159,6 @@ dependencies = [
|
|||||||
"syn 2.0.119",
|
"syn 2.0.119",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parking"
|
|
||||||
version = "2.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking_lot"
|
name = "parking_lot"
|
||||||
version = "0.12.5"
|
version = "0.12.5"
|
||||||
@@ -1502,17 +1194,6 @@ version = "0.2.17"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
|
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "piper"
|
|
||||||
version = "0.2.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
|
|
||||||
dependencies = [
|
|
||||||
"atomic-waker",
|
|
||||||
"fastrand",
|
|
||||||
"futures-io",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pkg-config"
|
name = "pkg-config"
|
||||||
version = "0.3.34"
|
version = "0.3.34"
|
||||||
@@ -1543,15 +1224,6 @@ dependencies = [
|
|||||||
"zerovec",
|
"zerovec",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro-crate"
|
|
||||||
version = "3.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
|
|
||||||
dependencies = [
|
|
||||||
"toml_edit",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.107"
|
version = "1.0.107"
|
||||||
@@ -1614,34 +1286,11 @@ dependencies = [
|
|||||||
"syn 3.0.6",
|
"syn 3.0.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex"
|
|
||||||
version = "1.13.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
|
|
||||||
dependencies = [
|
|
||||||
"aho-corasick",
|
|
||||||
"memchr",
|
|
||||||
"regex-automata",
|
|
||||||
"regex-syntax",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex-automata"
|
name = "regex-automata"
|
||||||
version = "0.4.18"
|
version = "0.4.18"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2"
|
checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2"
|
||||||
dependencies = [
|
|
||||||
"aho-corasick",
|
|
||||||
"memchr",
|
|
||||||
"regex-syntax",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-syntax"
|
|
||||||
version = "0.8.11"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "repo_path"
|
name = "repo_path"
|
||||||
@@ -1680,7 +1329,9 @@ checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
"bytes",
|
"bytes",
|
||||||
|
"futures-channel",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
|
"futures-util",
|
||||||
"http",
|
"http",
|
||||||
"http-body",
|
"http-body",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
@@ -1696,12 +1347,14 @@ dependencies = [
|
|||||||
"sync_wrapper",
|
"sync_wrapper",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-native-tls",
|
"tokio-native-tls",
|
||||||
|
"tokio-util",
|
||||||
"tower",
|
"tower",
|
||||||
"tower-http",
|
"tower-http",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
"url",
|
"url",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
"wasm-bindgen-futures",
|
"wasm-bindgen-futures",
|
||||||
|
"wasm-streams",
|
||||||
"web-sys",
|
"web-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -1876,29 +1529,6 @@ dependencies = [
|
|||||||
"zmij",
|
"zmij",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_path_to_error"
|
|
||||||
version = "0.1.20"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
|
|
||||||
dependencies = [
|
|
||||||
"itoa",
|
|
||||||
"serde",
|
|
||||||
"serde_core",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_urlencoded"
|
|
||||||
version = "0.7.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
|
|
||||||
dependencies = [
|
|
||||||
"form_urlencoded",
|
|
||||||
"itoa",
|
|
||||||
"ryu",
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_yaml"
|
name = "serde_yaml"
|
||||||
version = "0.9.34+deprecated"
|
version = "0.9.34+deprecated"
|
||||||
@@ -1924,16 +1554,6 @@ version = "2.0.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
|
checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "signal-hook-registry"
|
|
||||||
version = "1.4.8"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
|
|
||||||
dependencies = [
|
|
||||||
"errno",
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "slab"
|
name = "slab"
|
||||||
version = "0.4.12"
|
version = "0.4.12"
|
||||||
@@ -1946,17 +1566,6 @@ version = "1.16.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e"
|
checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "socket-pktinfo"
|
|
||||||
version = "0.4.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "612942246d0cc239cfd83af1dfd39be47f649208a3524e5e9da651910128e0ac"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"socket2",
|
|
||||||
"windows-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "socket2"
|
name = "socket2"
|
||||||
version = "0.6.5"
|
version = "0.6.5"
|
||||||
@@ -2079,25 +1688,11 @@ dependencies = [
|
|||||||
"bytes",
|
"bytes",
|
||||||
"libc",
|
"libc",
|
||||||
"mio",
|
"mio",
|
||||||
"parking_lot",
|
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"signal-hook-registry",
|
|
||||||
"socket2",
|
"socket2",
|
||||||
"tokio-macros",
|
|
||||||
"windows-sys",
|
"windows-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tokio-macros"
|
|
||||||
version = "2.7.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn 3.0.6",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-native-tls"
|
name = "tokio-native-tls"
|
||||||
version = "0.3.1"
|
version = "0.3.1"
|
||||||
@@ -2109,33 +1704,16 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "toml_datetime"
|
name = "tokio-util"
|
||||||
version = "1.1.1+spec-1.1.0"
|
version = "0.7.19"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
|
checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_core",
|
"bytes",
|
||||||
]
|
"futures-core",
|
||||||
|
"futures-sink",
|
||||||
[[package]]
|
"pin-project-lite",
|
||||||
name = "toml_edit"
|
"tokio",
|
||||||
version = "0.25.15+spec-1.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1340ea94a5856333492c9064b02c778b191dd2c853778d9609debdcdfea3a614"
|
|
||||||
dependencies = [
|
|
||||||
"indexmap",
|
|
||||||
"toml_datetime",
|
|
||||||
"toml_parser",
|
|
||||||
"winnow",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "toml_parser"
|
|
||||||
version = "1.1.3+spec-1.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56"
|
|
||||||
dependencies = [
|
|
||||||
"winnow",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2151,7 +1729,6 @@ dependencies = [
|
|||||||
"tokio",
|
"tokio",
|
||||||
"tower-layer",
|
"tower-layer",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
"tracing",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2190,7 +1767,6 @@ version = "0.1.44"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
|
checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"tracing-core",
|
"tracing-core",
|
||||||
]
|
]
|
||||||
@@ -2342,6 +1918,19 @@ dependencies = [
|
|||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wasm-streams"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb"
|
||||||
|
dependencies = [
|
||||||
|
"futures-util",
|
||||||
|
"js-sys",
|
||||||
|
"wasm-bindgen",
|
||||||
|
"wasm-bindgen-futures",
|
||||||
|
"web-sys",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "web-sys"
|
name = "web-sys"
|
||||||
version = "0.3.106"
|
version = "0.3.106"
|
||||||
@@ -2376,15 +1965,6 @@ dependencies = [
|
|||||||
"windows-link",
|
"windows-link",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winnow"
|
|
||||||
version = "1.0.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
|
|
||||||
dependencies = [
|
|
||||||
"memchr",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "writeable"
|
name = "writeable"
|
||||||
version = "0.6.4"
|
version = "0.6.4"
|
||||||
|
|||||||
+5
-13
@@ -1,31 +1,27 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "crete"
|
name = "crete"
|
||||||
version = "0.1.3"
|
version = "0.1.4"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
default-run = "crete"
|
default-run = "crete"
|
||||||
publish = ["infra"]
|
publish = ["infra"]
|
||||||
license = "GPL-3.0-or-later"
|
license = "GPL-3.0-or-later"
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
members = ["ipxe", "xtask"]
|
members = ["xtask"]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
schemars = { version = "1.2.2", features = ["semver1"] }
|
schemars = { version = "1.2.2", features = ["semver1"] }
|
||||||
serde_json = "1.0.151"
|
serde_json = "1.0.151"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
async-walkdir = "2.2.0"
|
|
||||||
byteorder = "1.5.0"
|
|
||||||
clap = { version = "4.6.7", features = ["derive"] }
|
clap = { version = "4.6.7", features = ["derive"] }
|
||||||
clap_complete = "4.6.11"
|
clap_complete = "4.6.11"
|
||||||
futures = "0.3.34"
|
|
||||||
gix-discover = { version = "0.56.0", features = ["sha1"] }
|
gix-discover = { version = "0.56.0", features = ["sha1"] }
|
||||||
minijinja = { version = "2.24.0", features = ["json", "loader"] }
|
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"
|
||||||
regex = "1.13.1"
|
|
||||||
reqwest = { version = "0.13.5", default-features = false, features = [
|
reqwest = { version = "0.13.5", default-features = false, features = [
|
||||||
|
"blocking",
|
||||||
|
"stream",
|
||||||
"native-tls",
|
"native-tls",
|
||||||
] }
|
] }
|
||||||
schemars = { workspace = true }
|
schemars = { workspace = true }
|
||||||
@@ -34,11 +30,7 @@ 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.21"
|
thiserror = "2.0.21"
|
||||||
tokio = { version = "1.52.1", features = ["full"] }
|
walkdir = "2.5.0"
|
||||||
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
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "ipxe"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2024"
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
build-print = "1.0.1"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
include_dir = "0.7.4"
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
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("DOWNLOAD_PROTO_HTTP=1")
|
|
||||||
.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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-1
Submodule ipxe/ipxe deleted from 8892af68a2
@@ -1,4 +0,0 @@
|
|||||||
#!ipxe
|
|
||||||
|
|
||||||
dhcp
|
|
||||||
chain boot.ipxe
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
use include_dir::{Dir, include_dir};
|
|
||||||
|
|
||||||
pub static IPXE_DIR: Dir<'_> = include_dir!("$OUT_DIR/ipxe");
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
#!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 %}
|
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
use std::net::IpAddr;
|
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use clap::{Args, Parser, Subcommand};
|
use clap::{Args, Parser, Subcommand};
|
||||||
@@ -50,11 +49,4 @@ 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,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|||||||
+37
-84
@@ -1,22 +1,18 @@
|
|||||||
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 tokio::process::Command;
|
use walkdir::WalkDir;
|
||||||
|
|
||||||
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::talosconfig::TalosConfig;
|
use crate::{get_configs_path, get_talos_path};
|
||||||
use crate::{get_configs_path, get_talos_path, run_command};
|
|
||||||
|
|
||||||
#[optional_struct]
|
#[optional_struct]
|
||||||
#[derive(Debug, Deserialize, JsonSchema, Clone)]
|
#[derive(Debug, Deserialize, JsonSchema, Clone)]
|
||||||
@@ -72,35 +68,31 @@ struct ClusterDeserialize {
|
|||||||
base: Base,
|
base: Base,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Clone)]
|
#[derive(Debug, Serialize)]
|
||||||
#[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: HashMap<String, Node>,
|
nodes: Vec<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) async fn get(cluster_name: &str, env: &Environment<'static>) -> Self {
|
pub(crate) fn get(cluster_name: &str, env: &Environment) -> 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 = tokio::fs::read_to_string(path).await.unwrap();
|
let content = std::fs::read_to_string(path).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 = tokio::fs::read_to_string(path).await.unwrap();
|
let content = std::fs::read_to_string(path).unwrap();
|
||||||
|
|
||||||
let mut cluster: OptionalClusterDeserialize = serde_yaml::from_str(&content).unwrap();
|
let mut cluster: OptionalClusterDeserialize = serde_yaml::from_str(&content).unwrap();
|
||||||
|
|
||||||
@@ -122,32 +114,28 @@ impl Cluster {
|
|||||||
let cluster = Self {
|
let cluster = Self {
|
||||||
name: cluster_name.into(),
|
name: cluster_name.into(),
|
||||||
version: cluster.version,
|
version: cluster.version,
|
||||||
nodes: Default::default(),
|
nodes: vec![],
|
||||||
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.iter().map(|name| async {
|
let nodes = nodes
|
||||||
let node = Node::get(name, env, &cluster, &default, &base).await;
|
.iter()
|
||||||
(node.hostname().to_owned(), node)
|
.map(|name| Node::get(name, env, &cluster, &default, &base))
|
||||||
});
|
.collect();
|
||||||
|
|
||||||
let nodes = FuturesUnordered::from_iter(nodes).collect().await;
|
|
||||||
|
|
||||||
Self { nodes, ..cluster }
|
Self { nodes, ..cluster }
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_all() -> HashMap<String, Cluster> {
|
pub fn get_all() -> Vec<Cluster> {
|
||||||
let env = PathEnvironment::new_patches();
|
let env = PathEnvironment::new_patches();
|
||||||
|
|
||||||
let names: Vec<_> = WalkDir::new(get_talos_path().join("clusters"))
|
WalkDir::new(get_talos_path().join("clusters"))
|
||||||
.filter_map(|e| async { e.ok() })
|
.into_iter()
|
||||||
.filter(|e| {
|
.filter_map(|e| e.ok())
|
||||||
let e = e.clone();
|
.filter(|e| e.metadata().unwrap().is_file())
|
||||||
async move { e.metadata().await.unwrap().is_file() }
|
.filter_map(|e| {
|
||||||
})
|
|
||||||
.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("");
|
||||||
|
|
||||||
@@ -157,35 +145,18 @@ impl Cluster {
|
|||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
Some(name)
|
Some(Cluster::get(&name, &env))
|
||||||
})
|
})
|
||||||
.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) -> impl Iterator<Item = &Node> {
|
pub fn nodes(&self) -> &[Node] {
|
||||||
self.nodes.values()
|
&self.nodes
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn node(&self, node: &str) -> Option<&Node> {
|
pub fn talosctl_gen_config_command(&self) -> Command {
|
||||||
self.nodes.get(node)
|
let path = get_configs_path().join(&self.name).join("talosconfig");
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn talosconfig(&self) -> String {
|
|
||||||
let mut command = Command::new("talosctl");
|
let mut command = Command::new("talosctl");
|
||||||
command.args([
|
command.args([
|
||||||
"gen",
|
"gen",
|
||||||
@@ -197,59 +168,41 @@ impl Cluster {
|
|||||||
"--output-types",
|
"--output-types",
|
||||||
"talosconfig",
|
"talosconfig",
|
||||||
"-o",
|
"-o",
|
||||||
"-",
|
path.to_str().expect("Path should be valid utf-8"),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
run_command(command).await
|
command
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn talosconfig_path(&self) -> PathBuf {
|
pub fn talosctl_add_endpoint_command(&self) -> Command {
|
||||||
get_configs_path().join(&self.name).join("talosconfig")
|
let path = 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",
|
||||||
self.talosconfig_path()
|
path.to_str().expect("Path should be valid utf-8"),
|
||||||
.to_str()
|
|
||||||
.expect("Path should be valid utf-8"),
|
|
||||||
"endpoint",
|
"endpoint",
|
||||||
&self.control_plane_ip.to_string(),
|
&self.control_plane_ip.to_string(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
run_command(command).await;
|
command
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn talosconfig_write(&self) {
|
pub fn talosctl_merge_command(&self) -> Command {
|
||||||
let config = self.talosconfig().await;
|
let cluster_path = get_configs_path().join(&self.name).join("talosconfig");
|
||||||
|
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",
|
||||||
TalosConfig::merged_path()
|
path.to_str().expect("Path should be valid utf-8"),
|
||||||
.to_str()
|
|
||||||
.expect("Path should be valid utf-8"),
|
|
||||||
"merge",
|
"merge",
|
||||||
self.talosconfig_path()
|
cluster_path.to_str().expect("Path should be valid utf-8"),
|
||||||
.to_str()
|
|
||||||
.expect("Path should be valid utf-8"),
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
run_command(command).await;
|
command
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+27
-28
@@ -2,17 +2,15 @@ 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,
|
||||||
@@ -25,7 +23,10 @@ fn apply_netmask(
|
|||||||
Ok((*ip & *netmask).to_string())
|
Ok((*ip & *netmask).to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn configure_environment(env: &mut Environment) {
|
impl<'a> PathEnvironment<'a> {
|
||||||
|
pub fn new(path: &Path) -> Self {
|
||||||
|
let mut env = Environment::new();
|
||||||
|
|
||||||
// Configure jinja
|
// Configure jinja
|
||||||
env.set_trim_blocks(true);
|
env.set_trim_blocks(true);
|
||||||
env.set_lstrip_blocks(true);
|
env.set_lstrip_blocks(true);
|
||||||
@@ -62,13 +63,6 @@ pub fn configure_environment(env: &mut Environment) {
|
|||||||
})
|
})
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
});
|
});
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> PathEnvironment<'a> {
|
|
||||||
pub fn new(path: &Path) -> Self {
|
|
||||||
let mut env = Environment::new();
|
|
||||||
|
|
||||||
configure_environment(&mut env);
|
|
||||||
|
|
||||||
// Add path loader
|
// Add path loader
|
||||||
env.set_loader(path_loader(&path));
|
env.set_loader(path_loader(&path));
|
||||||
@@ -82,23 +76,6 @@ 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
|
||||||
@@ -109,3 +86,25 @@ 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()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+1
-16
@@ -1,17 +1,13 @@
|
|||||||
#![feature(path_absolute_method)]
|
#![feature(impl_trait_in_assoc_type, 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();
|
||||||
|
|
||||||
@@ -32,14 +28,3 @@ 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()
|
|
||||||
}
|
|
||||||
|
|||||||
+37
-175
@@ -1,27 +1,13 @@
|
|||||||
mod cli;
|
mod cli;
|
||||||
|
|
||||||
use std::net::SocketAddr;
|
use std::process::Command;
|
||||||
use std::path::PathBuf;
|
|
||||||
use std::pin::pin;
|
|
||||||
|
|
||||||
use axum::extract::Request;
|
|
||||||
use axum::http::Uri;
|
|
||||||
use axum::response::IntoResponse;
|
|
||||||
use axum::routing::get;
|
|
||||||
use axum::{Router, debug_handler};
|
|
||||||
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, configure_environment};
|
use crete::environment::PathEnvironment;
|
||||||
use crete::talosconfig::{get_current_context, set_context};
|
use crete::{get_configs_path, get_repo_path, set_repo_path};
|
||||||
use crete::tftp::ServerError;
|
use minijinja::context;
|
||||||
use crete::{get_configs_path, get_repo_path, set_repo_path, tftp};
|
|
||||||
use futures::StreamExt;
|
|
||||||
use futures::future::join_all;
|
|
||||||
use ipxe::IPXE_DIR;
|
|
||||||
use minijinja::{Environment, context};
|
|
||||||
use regex::Regex;
|
|
||||||
use reqwest::{StatusCode, header};
|
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
use crate::cli::{Cli, Commands, GlobalOpts};
|
use crate::cli::{Cli, Commands, GlobalOpts};
|
||||||
@@ -30,204 +16,80 @@ use crate::cli::{Cli, Commands, GlobalOpts};
|
|||||||
enum Error {
|
enum Error {
|
||||||
#[error("No clusters where found")]
|
#[error("No clusters where found")]
|
||||||
NoClustersFound,
|
NoClustersFound,
|
||||||
#[error("Server error: {0}")]
|
|
||||||
ServerError(#[from] ServerError),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
|
fn run_command(mut command: Command) {
|
||||||
let clusters = Cluster::get_all().await;
|
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");
|
||||||
// We don't really care if this fails, as that likely mean that the directory did not exist
|
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();
|
||||||
|
|
||||||
// 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.values().collect::<Vec<_>>(),
|
clusters,
|
||||||
root => opts.repo
|
root => opts.repo
|
||||||
})
|
})
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
tokio::fs::write(path.join(template_name), content)
|
std::fs::write(path.join(template_name), content).unwrap();
|
||||||
.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();
|
||||||
tokio::fs::remove_dir_all(&path).await.ok();
|
if path.exists() {
|
||||||
tokio::fs::create_dir_all(&path).await.unwrap();
|
std::fs::remove_dir_all(&path).unwrap();
|
||||||
|
}
|
||||||
|
std::fs::create_dir(&path).unwrap();
|
||||||
|
|
||||||
// Generate config files
|
// Generate config files
|
||||||
join_all(clusters.values().map(|cluster| async move {
|
for cluster in clusters {
|
||||||
join_all(cluster.nodes().map(|node| {
|
for node in cluster.nodes() {
|
||||||
let cluster = cluster.clone();
|
run_command(node.talosctl_gen_config_command(&cluster));
|
||||||
async move {
|
|
||||||
node.config_write(&cluster).await;
|
|
||||||
}
|
|
||||||
}))
|
|
||||||
.await;
|
|
||||||
|
|
||||||
// Run these commands in parallel with the the node commands
|
|
||||||
// NOTE: These do need to happen in the correct order
|
|
||||||
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 {
|
run_command(cluster.talosctl_gen_config_command());
|
||||||
set_context(context).await;
|
run_command(cluster.talosctl_add_endpoint_command());
|
||||||
|
run_command(cluster.talosctl_merge_command());
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[debug_handler]
|
fn main() -> Result<(), Error> {
|
||||||
async fn handler(req: Request) -> impl IntoResponse {
|
|
||||||
println!("{req:?}");
|
|
||||||
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()
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Make this a proper async function
|
|
||||||
fn get_file(
|
|
||||||
filename: impl ToString,
|
|
||||||
http_url: impl ToString,
|
|
||||||
) -> impl Future<Output = Option<(Vec<u8>, &'static str)>> {
|
|
||||||
// TODO: Make this a static that is initialized once
|
|
||||||
let re =
|
|
||||||
Regex::new(r"^talos/(?<cluster>.+)/(?<node>.+)\.ya?ml$").expect("regex should be valid");
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[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).await?,
|
Commands::Generate => generate(&cli.global_opts)?,
|
||||||
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(())
|
||||||
|
|||||||
+12
-32
@@ -1,17 +1,16 @@
|
|||||||
use std::net::Ipv4Addr;
|
use std::net::Ipv4Addr;
|
||||||
use std::path::PathBuf;
|
use std::process::Command;
|
||||||
|
|
||||||
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, run_command};
|
use crate::{get_configs_path, get_talos_path};
|
||||||
|
|
||||||
#[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")]
|
||||||
@@ -91,7 +90,7 @@ pub(crate) struct NodeDeserialize {
|
|||||||
sops: Secret,
|
sops: Secret,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Clone)]
|
#[derive(Debug, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct Node {
|
pub struct Node {
|
||||||
hostname: String,
|
hostname: String,
|
||||||
@@ -107,9 +106,9 @@ pub struct Node {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Node {
|
impl Node {
|
||||||
pub(crate) async fn get(
|
pub(crate) fn get(
|
||||||
node_name: &str,
|
node_name: &str,
|
||||||
env: &Environment<'static>,
|
env: &Environment,
|
||||||
cluster: &Cluster,
|
cluster: &Cluster,
|
||||||
default: &OptionalNodeDeserialize,
|
default: &OptionalNodeDeserialize,
|
||||||
base: &Base,
|
base: &Base,
|
||||||
@@ -122,7 +121,7 @@ impl Node {
|
|||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
path.add_extension("yaml");
|
path.add_extension("yaml");
|
||||||
let content = tokio::fs::read_to_string(path).await.unwrap();
|
let content = std::fs::read_to_string(path).unwrap();
|
||||||
|
|
||||||
let node: OptionalNodeDeserialize = serde_yaml::from_str(&content).unwrap();
|
let node: OptionalNodeDeserialize = serde_yaml::from_str(&content).unwrap();
|
||||||
|
|
||||||
@@ -173,16 +172,15 @@ impl Node {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Render patches
|
// Render patches
|
||||||
let patches = patches.render(env, cluster, &node).await;
|
let patches = patches.render(env, cluster, &node);
|
||||||
|
|
||||||
Node { patches, ..node }
|
Node { patches, ..node }
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn hostname(&self) -> &str {
|
pub fn talosctl_gen_config_command(&self, cluster: &Cluster) -> Command {
|
||||||
&self.hostname
|
let mut path = get_configs_path().join(&cluster.name).join(&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",
|
||||||
@@ -206,7 +204,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 {
|
||||||
@@ -220,25 +218,7 @@ impl Node {
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
run_command(command).await
|
command
|
||||||
}
|
|
||||||
|
|
||||||
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();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-16
@@ -16,21 +16,15 @@ pub(crate) struct Patches<T> {
|
|||||||
|
|
||||||
pub(crate) type OptionalPatchesString = OptionalPatches<String>;
|
pub(crate) type OptionalPatchesString = OptionalPatches<String>;
|
||||||
|
|
||||||
async fn render(
|
fn render(
|
||||||
patches: Vec<String>,
|
patches: Vec<String>,
|
||||||
env: &Environment<'static>,
|
env: &Environment,
|
||||||
cluster: &Cluster,
|
cluster: &Cluster,
|
||||||
node: &Node,
|
node: &Node,
|
||||||
) -> Vec<serde_yaml::Value> {
|
) -> Vec<serde_yaml::Value> {
|
||||||
let env = env.clone();
|
|
||||||
let cluster = cluster.clone();
|
|
||||||
let node = node.clone();
|
|
||||||
|
|
||||||
// Minijinja will still have blocking I/O internally
|
|
||||||
tokio::task::spawn_blocking(move || {
|
|
||||||
patches
|
patches
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(move |name| {
|
.map(|name| {
|
||||||
let content = env
|
let content = env
|
||||||
.get_template(&name)
|
.get_template(&name)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
@@ -43,9 +37,6 @@ async fn render(
|
|||||||
serde_yaml::from_str(&content).unwrap()
|
serde_yaml::from_str(&content).unwrap()
|
||||||
})
|
})
|
||||||
.collect()
|
.collect()
|
||||||
})
|
|
||||||
.await
|
|
||||||
.unwrap()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Patches<String> {
|
impl Patches<String> {
|
||||||
@@ -59,15 +50,15 @@ impl Patches<String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn render(
|
pub(crate) fn render(
|
||||||
self,
|
self,
|
||||||
env: &Environment<'static>,
|
env: &Environment,
|
||||||
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).await,
|
all: render(self.all.clone(), env, cluster, node),
|
||||||
control_plane: render(self.control_plane.clone(), env, cluster, node).await,
|
control_plane: render(self.control_plane.clone(), env, cluster, node),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-19
@@ -1,6 +1,5 @@
|
|||||||
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;
|
||||||
|
|
||||||
@@ -12,7 +11,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::ClientBuilder::new()
|
let client = reqwest::blocking::ClientBuilder::new()
|
||||||
.user_agent(format!(
|
.user_agent(format!(
|
||||||
"{}/{}",
|
"{}/{}",
|
||||||
std::env!("CARGO_PKG_NAME"),
|
std::env!("CARGO_PKG_NAME"),
|
||||||
@@ -21,30 +20,20 @@ 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,
|
||||||
}
|
}
|
||||||
|
|
||||||
// We can't use async directly inside a custom deserializer, and using the blocking client also
|
let response: Response = serde_json::from_str(&res.text().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)?;
|
.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)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
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),
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
mod error;
|
|
||||||
mod packet;
|
|
||||||
mod server;
|
|
||||||
|
|
||||||
pub use error::Error;
|
|
||||||
pub use packet::Packet;
|
|
||||||
pub use server::{Error as ServerError, serve};
|
|
||||||
@@ -1,355 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,188 +0,0 @@
|
|||||||
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}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user