Compare commits
3
Commits
main
..
4dc188e362
| Author | SHA1 | Date | |
|---|---|---|---|
 Dreaded_X
|
4dc188e362
|
||
|
Dreaded_X
|
7c4b34cf9a
|
||
|
Dreaded_X
|
66373c0636
|
@@ -7,7 +7,6 @@ on:
|
||||
- "**/Cargo.lock"
|
||||
schedule:
|
||||
- cron: "0 0 * * *"
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
audit:
|
||||
@@ -16,13 +15,9 @@ jobs:
|
||||
permissions:
|
||||
issues: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Install rust toolchain
|
||||
uses: dtolnay/rust-toolchain@nightly
|
||||
- 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: actions/checkout@v6
|
||||
- uses: dtolnay/rust-toolchain@nightly
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- uses: rustsec/audit-check@v2.0.0
|
||||
with:
|
||||
token: ${{ secrets.GITEA_TOKEN }}
|
||||
|
||||
@@ -7,38 +7,26 @@ on:
|
||||
- "*"
|
||||
pull_request:
|
||||
|
||||
concurrency:
|
||||
group: "${{ github.workflow }}-${{ github.ref }}"
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
prek:
|
||||
name: prek
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Install rust toolchain
|
||||
uses: dtolnay/rust-toolchain@nightly
|
||||
- uses: actions/checkout@v6
|
||||
- uses: dtolnay/rust-toolchain@nightly
|
||||
with:
|
||||
components: rustfmt, clippy
|
||||
- name: Setup rust cache
|
||||
uses: Swatinem/rust-cache@v2
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- uses: j178/prek-action@v2
|
||||
|
||||
cargo-shear:
|
||||
name: cargo shear
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Install rust toolchain
|
||||
uses: dtolnay/rust-toolchain@nightly
|
||||
- name: Setup rust cache
|
||||
uses: Swatinem/rust-cache@v2
|
||||
- name: Install cargo shear
|
||||
uses: taiki-e/install-action@v2
|
||||
- uses: actions/checkout@v6
|
||||
- uses: dtolnay/rust-toolchain@nightly
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- uses: taiki-e/install-action@v2
|
||||
with:
|
||||
tool: cargo-shear
|
||||
- name: cargo shear
|
||||
run: cargo shear --deny-warnings
|
||||
- run: cargo shear --deny-warnings
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
name: Committed
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
concurrency:
|
||||
group: "${{ github.workflow }}-${{ github.ref }}"
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
committed:
|
||||
name: committed
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- uses: crate-ci/committed@v1.1.11
|
||||
with:
|
||||
commits: "origin/${{ gitea.base_ref }}..HEAD"
|
||||
@@ -1,62 +0,0 @@
|
||||
name: Release-plz
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
release-plz:
|
||||
name: Release-plz Release
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
pull-requests: read
|
||||
steps:
|
||||
- &checkout
|
||||
name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
persist-credentials: false
|
||||
- name: Install rust toolchain
|
||||
uses: dtolnay/rust-toolchain@nightly
|
||||
- name: Setup rust cache
|
||||
uses: Swatinem/rust-cache@v2
|
||||
- name: Install release-plz
|
||||
uses: taiki-e/install-action@v2
|
||||
with:
|
||||
tool: release-plz
|
||||
- &git-setup
|
||||
name: Configure git
|
||||
run: |
|
||||
git config user.name "Release-plz"
|
||||
git config user.email "release-plz@noreply.huizinga.dev"
|
||||
git config url.https://${{ gitea.actor }}:${{ secrets.RELEASE_PLZ_TOKEN }}@git.huizinga.dev/.insteadOf https://git.huizinga.dev/
|
||||
- name: release-plz release
|
||||
env:
|
||||
CARGO_REGISTRIES_INFRA_TOKEN: "Bearer ${{ secrets.RELEASE_PLZ_TOKEN }}"
|
||||
run: release-plz release --git-token "${{ secrets.RELEASE_PLZ_TOKEN }}" --forge gitea
|
||||
|
||||
release-plz-pr:
|
||||
name: Release-plz PR
|
||||
runs-on: ubuntu-latest
|
||||
concurrency:
|
||||
group: release-plz-${{ github.ref }}
|
||||
cancel-in-progress: false
|
||||
permissions:
|
||||
contents: write
|
||||
pull-requests: write
|
||||
steps:
|
||||
- *checkout
|
||||
- name: Install rust toolchain
|
||||
uses: dtolnay/rust-toolchain@nightly
|
||||
- name: Setup rust cache
|
||||
uses: Swatinem/rust-cache@v2
|
||||
- name: Install release-plz
|
||||
uses: taiki-e/install-action@v2
|
||||
with:
|
||||
tool: release-plz
|
||||
- *git-setup
|
||||
- name: release-plz release-pr
|
||||
run: release-plz release-pr --git-token "${{ secrets.RELEASE_PLZ_TOKEN }}" --forge gitea
|
||||
@@ -1,25 +1,53 @@
|
||||
name: Release
|
||||
name: Release-plz
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "v*"
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
archlinux:
|
||||
name: Arch Linux
|
||||
release-plz:
|
||||
name: Release-plz Release
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
packages: write
|
||||
contents: write
|
||||
pull-requests: read
|
||||
steps:
|
||||
- name: Checkout
|
||||
- &checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Build package
|
||||
uses: https://git.huizinga.dev/infra/archlinux-package-action@v4
|
||||
with:
|
||||
path: .
|
||||
- name: Upload package
|
||||
fetch-depth: 0
|
||||
persist-credentials: false
|
||||
- uses: dtolnay/rust-toolchain@nightly
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- uses: taiki-e/install-action@v2
|
||||
with:
|
||||
tool: release-plz
|
||||
- &git-setup
|
||||
name: Configure git
|
||||
run: |
|
||||
curl --user ${{ gitea.actor }}:${{ secrets.REGISTRY_TOKEN }} \
|
||||
--upload-file "$(ls | grep -E 'crete-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-.*.pkg.tar.zst')" \
|
||||
https://git.huizinga.dev/api/packages/infra/arch/core
|
||||
git config user.name "Release-plz"
|
||||
git config user.email "release-plz@noreply.huizinga.dev"
|
||||
git config url.https://${{ gitea.actor }}:${{ secrets.GITEA_TOKEN }}@git.huizinga.dev/.insteadOf https://git.huizinga.dev/
|
||||
- env:
|
||||
CARGO_REGISTRIES_INFRA_TOKEN: "Bearer ${{ secrets.REGISTRY_TOKEN }}"
|
||||
run: release-plz release --git-token "${{ secrets.GITEA_TOKEN }}" --forge gitea --dry-run
|
||||
|
||||
release-plz-pr:
|
||||
name: Release-plz PR
|
||||
runs-on: ubuntu-latest
|
||||
concurrency:
|
||||
group: release-plz-${{ github.ref }}
|
||||
cancel-in-progress: false
|
||||
permissions:
|
||||
contents: write
|
||||
pull-requests: write
|
||||
steps:
|
||||
- *checkout
|
||||
- uses: dtolnay/rust-toolchain@nightly
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
- uses: taiki-e/install-action@v2
|
||||
with:
|
||||
tool: release-plz
|
||||
- *git-setup
|
||||
- run: release-plz release-pr --git-token "${{ secrets.GITEA_TOKEN }}" --forge gitea
|
||||
|
||||
@@ -31,7 +31,6 @@ repos:
|
||||
rev: "1.0.0"
|
||||
hooks:
|
||||
- id: mdformat
|
||||
exclude: "^CHANGELOG.md$"
|
||||
|
||||
- repo: local
|
||||
hooks:
|
||||
@@ -76,6 +75,6 @@ repos:
|
||||
glob: .gitea/workflows/*.yaml
|
||||
|
||||
- repo: https://github.com/crate-ci/committed
|
||||
rev: v1.1.11
|
||||
rev: v1.1.8
|
||||
hooks:
|
||||
- id: committed
|
||||
|
||||
@@ -1,14 +1,5 @@
|
||||
[workspace]
|
||||
pr_name = "chore(release): Release v{{ version }}"
|
||||
changelog_path = "./CHANGELOG.md"
|
||||
|
||||
[[package]]
|
||||
name = "crete"
|
||||
changelog_include = ["ipxe"]
|
||||
|
||||
[[package]]
|
||||
name = "ipxe"
|
||||
release = false
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
|
||||
@@ -1,63 +1 @@
|
||||
# Changelog
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [0.1.3](https://git.huizinga.dev/infra/crete/compare/v0.1.2...v0.1.3) - 2026-04-21
|
||||
|
||||
### <!-- 0 -->Features
|
||||
|
||||
- Add function that applies netmask to ip
|
||||
|
||||
### <!-- 3 -->Refactor
|
||||
|
||||
- Use ViaDeserialize to convert ip address
|
||||
|
||||
## [0.1.2](https://git.huizinga.dev/infra/crete/compare/v0.1.1...v0.1.2) - 2026-04-17
|
||||
|
||||
### <!-- 0 -->Features
|
||||
|
||||
- Make dns optional
|
||||
- Allow more than two dns entries
|
||||
|
||||
## [0.1.1](https://git.huizinga.dev/infra/crete/compare/v0.1.0...v0.1.1) - 2026-04-13
|
||||
|
||||
### <!-- 2 -->Bug Fixes
|
||||
|
||||
- No default value for advertise routes
|
||||
|
||||
## [0.1.0](https://git.huizinga.dev/infra/crete/releases/tag/v0.1.0) - 2026-04-07
|
||||
|
||||
### <!-- 0 -->Features
|
||||
|
||||
- _(package)_ Added PKGBUILD
|
||||
- Set user agent
|
||||
- _(performance)_ Disable request features to reduce binary size
|
||||
- Generate talos configs
|
||||
- Show error if no clusters are found in repo
|
||||
- Initial rewrite of python render tool
|
||||
|
||||
### <!-- 3 -->Refactor
|
||||
|
||||
- Big internal refactor
|
||||
|
||||
### <!-- 4 -->Testing
|
||||
|
||||
- Disable building tests
|
||||
|
||||
### <!-- 5 -->Miscellaneous Tasks
|
||||
|
||||
- _(actions)_ Publish Arch Linux package
|
||||
- _(license)_ Add GPL license
|
||||
- _(actions)_ Name steps
|
||||
- _(actions)_ Renamed release-plz workflow file
|
||||
- _(actions)_ Use committed to check pr commits
|
||||
- _(actions)_ Cancel in-progress ci runs when pushing to pr
|
||||
- _(docs)_ Added README
|
||||
- _(actions)_ Setup workflows
|
||||
- Publish to gitea registry
|
||||
- _(pre-commit)_ Update pre commit config
|
||||
|
||||
Generated
+593
-2291
File diff suppressed because it is too large
Load Diff
+15
-25
@@ -1,45 +1,35 @@
|
||||
[package]
|
||||
name = "crete"
|
||||
version = "0.1.3"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
default-run = "crete"
|
||||
publish = ["infra"]
|
||||
license = "GPL-3.0-or-later"
|
||||
|
||||
[workspace]
|
||||
members = ["ipxe", "xtask"]
|
||||
members = ["xtask"]
|
||||
|
||||
[workspace.dependencies]
|
||||
schemars = { version = "1.2.3", features = ["semver1"] }
|
||||
serde_json = "1.0.154"
|
||||
schemars = { version = "1.2.1", features = ["semver1"] }
|
||||
serde_json = "1.0.149"
|
||||
|
||||
[dependencies]
|
||||
async-walkdir = "2.2.0"
|
||||
byteorder = "1.5.0"
|
||||
clap = { version = "4.6.7", features = ["derive"] }
|
||||
clap_complete = "4.6.11"
|
||||
futures = "0.3.34"
|
||||
gix-discover = { version = "0.57.0", features = ["sha1"] }
|
||||
minijinja = { version = "3.0.1", features = ["json", "serde"] }
|
||||
netascii = "0.1.0"
|
||||
num_enum = "0.7.6"
|
||||
clap = { version = "4.6.0", features = ["derive"] }
|
||||
clap_complete = "4.6.0"
|
||||
gix-discover = { version = "0.49.0", features = ["sha1"] }
|
||||
minijinja = { version = "2.18.0", features = ["json", "loader"] }
|
||||
optional_struct = "0.5.2"
|
||||
regex = "1.13.1"
|
||||
reqwest = { version = "0.13.5", default-features = false, features = [
|
||||
reqwest = { version = "0.13.2", default-features = false, features = [
|
||||
"blocking",
|
||||
"stream",
|
||||
"native-tls",
|
||||
] }
|
||||
schemars = { workspace = true }
|
||||
semver = { version = "1.0.28", features = ["serde"] }
|
||||
serde = { version = "1.0.229", features = ["derive"] }
|
||||
semver = { version = "1.0.27", features = ["serde"] }
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
serde_json = { workspace = true }
|
||||
serde_yaml = "0.9.34"
|
||||
thiserror = "2.0.21"
|
||||
tokio = { version = "1.54.0", features = ["full"] }
|
||||
ipxe = { path = "./ipxe" }
|
||||
axum = { version = "0.8.9", features = ["macros"] }
|
||||
socket2 = "0.6.5"
|
||||
socket-pktinfo = "0.4.1"
|
||||
serde-saphyr = "2.0.0"
|
||||
thiserror = "2.0.18"
|
||||
walkdir = "2.5.0"
|
||||
|
||||
[lib]
|
||||
test = false
|
||||
|
||||
@@ -1,674 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) 2026 Tim Huizinga
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) 2026 Tim Huizinga
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
@@ -1,19 +1,15 @@
|
||||
# Maintainer: Tim Huizinga <tim@huizinga.dev>
|
||||
# Maintainer: Firstname Lastname <email@example.org>
|
||||
pkgname=crete
|
||||
pkgver=dummy
|
||||
pkgver=0.1.0
|
||||
pkgrel=1
|
||||
pkgdesc='A tool that takes node and cluster configs and uses it to generate talos configs and render jinja templates'
|
||||
pkgdesc=''
|
||||
url='https://git.huizinga.dev/infra/crete'
|
||||
license=('GPL-3.0-or-later')
|
||||
license=()
|
||||
makedepends=('cargo-nightly')
|
||||
depends=()
|
||||
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
|
||||
source=('LICENSE')
|
||||
sha256sums=('4bffc7da729013886ae68623c0d6145201b20a495879b589990953b2a27e1fbd')
|
||||
|
||||
pkgver() {
|
||||
cargo info $pkgname | grep -Po '^version: \K[\d\.]+'
|
||||
}
|
||||
source=()
|
||||
b2sums=()
|
||||
|
||||
prepare() {
|
||||
export RUSTUP_TOOLCHAIN=nightly
|
||||
@@ -28,7 +24,6 @@ build() {
|
||||
}
|
||||
|
||||
package() {
|
||||
install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" "LICENSE"
|
||||
install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"
|
||||
install -Dm0644 -t "$pkgdir/usr/share/zsh/site-functions" "_$pkgname"
|
||||
install -Dm0755 -t "$pkgdir/usr/share/zsh/site-functions" "_$pkgname"
|
||||
}
|
||||
|
||||
@@ -5,32 +5,6 @@ and render jinja templates.
|
||||
|
||||
## Installation
|
||||
|
||||
### Arch
|
||||
|
||||
First import the verification key:
|
||||
|
||||
```bash
|
||||
wget https://git.huizinga.dev/api/packages/infra/arch/repository.key -O /tmp/repository.key
|
||||
sudo pacman-key --add /tmp/repository.key
|
||||
sudo pacman-key --lsign-key $(gpg --show-keys /tmp/repository.key | sed -n 2p)
|
||||
```
|
||||
|
||||
And add the following to `/etc/pacman.conf`:
|
||||
|
||||
```ini
|
||||
[infra]
|
||||
SigLevel = Required
|
||||
Server = https://git.huizinga.dev/api/packages/infra/arch/core/$arch
|
||||
```
|
||||
|
||||
You can then install `crete` by running:
|
||||
|
||||
```bash
|
||||
sudo pacman -Sy crete
|
||||
```
|
||||
|
||||
### Cargo install
|
||||
|
||||
Add the following to `~/.cargo.config.toml`:
|
||||
|
||||
```toml
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
[package]
|
||||
name = "ipxe"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[build-dependencies]
|
||||
diffy = "0.5.2"
|
||||
gix = { version = "0.89.0", default-features = false, features = [
|
||||
"blocking-network-client",
|
||||
"worktree-mutation",
|
||||
"sha1",
|
||||
"blocking-http-transport-reqwest-rust-tls",
|
||||
] }
|
||||
|
||||
[dependencies]
|
||||
include_dir = "0.7.4"
|
||||
-180
@@ -1,180 +0,0 @@
|
||||
use std::collections::HashMap;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::Command;
|
||||
use std::sync::atomic::AtomicBool;
|
||||
|
||||
use diffy::apply;
|
||||
use diffy::patch_set::{FileOperation, ParseOptions, PatchSet};
|
||||
use gix::Repository;
|
||||
use gix::progress::Discard;
|
||||
|
||||
const URL: &str = "https://github.com/ipxe/ipxe";
|
||||
const REVISION: &str = "2fa08affe9a1a1422766f54b2fb045234b571f06";
|
||||
const FILES: &[&str] = &["bin/ipxe.pxe", "bin-x86_64-efi/ipxe.efi"];
|
||||
|
||||
const SRC_DIR: &str = "src";
|
||||
|
||||
fn main() {
|
||||
let manifest_dir = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap())
|
||||
.canonicalize()
|
||||
.unwrap();
|
||||
let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap())
|
||||
.canonicalize()
|
||||
.unwrap();
|
||||
let repo_dir = out_dir.join("repo");
|
||||
|
||||
let repo = checkout(&out_dir, &repo_dir);
|
||||
|
||||
apply_patches(&repo, &manifest_dir, &repo_dir);
|
||||
println!("cargo::rerun-if-changed=patches");
|
||||
|
||||
build(&manifest_dir, &repo_dir);
|
||||
println!("cargo::rerun-if-changed=src/embed.ipxe");
|
||||
|
||||
copy_files(&repo_dir, &out_dir);
|
||||
}
|
||||
|
||||
fn checkout(out_dir: &Path, repo_dir: &Path) -> Repository {
|
||||
// Stamp file is used instead of comparing against HEAD to guard against incomplete clones
|
||||
let stamp = out_dir.join("checkout.stamp");
|
||||
if std::fs::read_to_string(&stamp).is_ok_and(|stamp| stamp == REVISION)
|
||||
&& let Ok(repo) = gix::open(repo_dir)
|
||||
{
|
||||
return repo;
|
||||
}
|
||||
|
||||
// Cleanup any left-overs
|
||||
std::fs::remove_file(&stamp).ok();
|
||||
std::fs::remove_dir_all(repo_dir).ok();
|
||||
|
||||
std::fs::create_dir_all(repo_dir).unwrap();
|
||||
|
||||
let mut prepare = gix::prepare_clone(URL, repo_dir)
|
||||
.unwrap()
|
||||
.with_revision(Some(REVISION))
|
||||
.unwrap();
|
||||
|
||||
let interrupt = AtomicBool::new(false);
|
||||
let (mut checkout, _) = prepare.fetch_then_checkout(Discard, &interrupt).unwrap();
|
||||
let (repo, _) = checkout.main_worktree(Discard, &interrupt).unwrap();
|
||||
|
||||
std::fs::write(&stamp, REVISION).unwrap();
|
||||
|
||||
repo
|
||||
}
|
||||
|
||||
fn apply_patches(repo: &Repository, manifest_dir: &Path, repo_dir: &Path) {
|
||||
let commit_id = gix::ObjectId::from_hex(REVISION.as_bytes()).unwrap();
|
||||
let tree = repo.find_commit(commit_id).unwrap().tree().unwrap();
|
||||
|
||||
// Get all the patches and sort them based on name
|
||||
let mut patch_files: Vec<PathBuf> = std::fs::read_dir(manifest_dir.join("patches"))
|
||||
.unwrap()
|
||||
.map(|e| e.unwrap().path())
|
||||
.filter(|e| e.extension().is_some_and(|e| e == "patch"))
|
||||
.collect();
|
||||
patch_files.sort();
|
||||
|
||||
let mut patched = HashMap::new();
|
||||
for path in patch_files {
|
||||
let text = std::fs::read_to_string(&path).unwrap();
|
||||
let patch_set = PatchSet::parse(&text, ParseOptions::gitdiff());
|
||||
|
||||
for patch in patch_set {
|
||||
let patch = patch.unwrap();
|
||||
|
||||
match patch.operation().strip_prefix(1) {
|
||||
FileOperation::Modify { original, modified } => {
|
||||
assert_eq!(original, modified);
|
||||
let path = original.to_string();
|
||||
|
||||
// Either get the current in-memory patched file, otherwise get the prisine file
|
||||
let current = patched
|
||||
.remove(&path)
|
||||
.unwrap_or_else(|| pristine(&tree, &path));
|
||||
|
||||
let new = apply(¤t, patch.patch().as_text().unwrap()).unwrap();
|
||||
patched.insert(path, new);
|
||||
}
|
||||
_ => todo!(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If the file was previously patched, but now isn't restore the pristine file
|
||||
for path in modified_files(repo) {
|
||||
if !patched.contains_key(&path) {
|
||||
std::fs::write(repo_dir.join(&path), pristine(&tree, &path)).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
// Write all the patched files
|
||||
for (path, content) in &patched {
|
||||
let path = repo_dir.join(path);
|
||||
let content = content.as_bytes();
|
||||
|
||||
// But only if the file is actually different from the one on disk
|
||||
// This prevents changing the mtime unnecessarily
|
||||
if std::fs::read(&path).ok().as_deref() != Some(content) {
|
||||
std::fs::write(path, content).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn pristine(tree: &gix::Tree<'_>, path: &str) -> String {
|
||||
let entry = tree.lookup_entry_by_path(path).unwrap().unwrap();
|
||||
|
||||
String::from_utf8(entry.object().unwrap().data.clone()).unwrap()
|
||||
}
|
||||
|
||||
fn modified_files(repo: &gix::Repository) -> Vec<String> {
|
||||
repo.status(Discard)
|
||||
.unwrap()
|
||||
.untracked_files(gix::status::UntrackedFiles::None)
|
||||
.into_index_worktree_iter(Vec::<gix::bstr::BString>::new())
|
||||
.unwrap()
|
||||
.map(|item| item.unwrap().rela_path().to_string())
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn build(manifest_dir: &Path, repo_dir: &Path) {
|
||||
let src_dir = repo_dir.join(SRC_DIR);
|
||||
|
||||
let mut command = Command::new("make");
|
||||
command
|
||||
.current_dir(&src_dir)
|
||||
.env_remove("DEBUG")
|
||||
.env_remove("PROFILE")
|
||||
.arg(format!(
|
||||
"EMBED={}",
|
||||
manifest_dir
|
||||
.join("src")
|
||||
.join("embed.ipxe")
|
||||
.to_string_lossy()
|
||||
))
|
||||
.args(FILES);
|
||||
|
||||
if let Ok(flags) = std::env::var("CARGO_MAKEFLAGS") {
|
||||
command.env("MAKEFLAGS", flags);
|
||||
}
|
||||
|
||||
let output = command.output().unwrap();
|
||||
|
||||
if !output.status.success() {
|
||||
panic!("make failed:\n{}", String::from_utf8_lossy(&output.stderr));
|
||||
}
|
||||
}
|
||||
|
||||
fn copy_files(repo_dir: &Path, out_dir: &Path) {
|
||||
let src_dir = repo_dir.join(SRC_DIR);
|
||||
let bin_dir = out_dir.join("bin");
|
||||
|
||||
std::fs::create_dir_all(&bin_dir).unwrap();
|
||||
for file in FILES {
|
||||
let file = Path::new(file);
|
||||
let input = src_dir.join(file);
|
||||
let output = bin_dir.join(file.file_name().unwrap());
|
||||
|
||||
std::fs::copy(input, output).unwrap();
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
diff --git a/src/config/general.h b/src/config/general.h
|
||||
index 43858dceb..54cb1b657 100644
|
||||
--- a/src/config/general.h
|
||||
+++ b/src/config/general.h
|
||||
@@ -60,10 +60,10 @@ FILE_SECBOOT ( PERMITTED );
|
||||
//#define HTTP_ENC_PEERDIST /* PeerDist content encoding */
|
||||
|
||||
/* Disable protocols not historically included in BIOS builds */
|
||||
-#if defined ( PLATFORM_pcbios )
|
||||
- #undef DOWNLOAD_PROTO_HTTPS
|
||||
- #undef HTTP_AUTH_NTLM
|
||||
-#endif
|
||||
+// #if defined ( PLATFORM_pcbios )
|
||||
+// #undef DOWNLOAD_PROTO_HTTPS
|
||||
+// #undef HTTP_AUTH_NTLM
|
||||
+// #endif
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
@@ -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/bin");
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
[toolchain]
|
||||
channel = "nightly-2026-10-01"
|
||||
channel = "nightly-2026-03-12"
|
||||
profile = "default"
|
||||
components = ["rust-analyzer"]
|
||||
|
||||
@@ -140,11 +140,12 @@
|
||||
"array",
|
||||
"null"
|
||||
],
|
||||
"default": null,
|
||||
"items": {
|
||||
"type": "string",
|
||||
"format": "ipv4"
|
||||
}
|
||||
},
|
||||
"maxItems": 2,
|
||||
"minItems": 2
|
||||
},
|
||||
"gateway": {
|
||||
"type": [
|
||||
|
||||
+3
-2
@@ -136,11 +136,12 @@
|
||||
"array",
|
||||
"null"
|
||||
],
|
||||
"default": null,
|
||||
"items": {
|
||||
"type": "string",
|
||||
"format": "ipv4"
|
||||
}
|
||||
},
|
||||
"maxItems": 2,
|
||||
"minItems": 2
|
||||
},
|
||||
"gateway": {
|
||||
"type": [
|
||||
|
||||
@@ -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 clap::{Args, Parser, Subcommand};
|
||||
@@ -50,11 +49,4 @@ pub enum Commands {
|
||||
Generate,
|
||||
/// Generate completions for your current shell
|
||||
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,
|
||||
},
|
||||
}
|
||||
|
||||
+38
-85
@@ -1,22 +1,18 @@
|
||||
use std::collections::HashMap;
|
||||
use std::net::Ipv4Addr;
|
||||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
use std::str::FromStr;
|
||||
|
||||
use async_walkdir::WalkDir;
|
||||
use futures::StreamExt;
|
||||
use futures::stream::FuturesUnordered;
|
||||
use minijinja::Environment;
|
||||
use optional_struct::{Applicable, optional_struct};
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tokio::process::Command;
|
||||
use walkdir::WalkDir;
|
||||
|
||||
use crate::environment::PathEnvironment;
|
||||
use crate::node::{Node, OptionalNodeDeserialize};
|
||||
use crate::patch::Patches;
|
||||
use crate::talosconfig::TalosConfig;
|
||||
use crate::{get_configs_path, get_talos_path, run_command};
|
||||
use crate::{get_configs_path, get_talos_path};
|
||||
|
||||
#[optional_struct]
|
||||
#[derive(Debug, Deserialize, JsonSchema, Clone)]
|
||||
@@ -72,37 +68,33 @@ struct ClusterDeserialize {
|
||||
base: Base,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Clone)]
|
||||
#[derive(Debug, Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct Cluster {
|
||||
pub(crate) name: String,
|
||||
pub(crate) version: Version,
|
||||
nodes: HashMap<String, Node>,
|
||||
nodes: Vec<Node>,
|
||||
cluster_env: ClusterEnv,
|
||||
pub(crate) control_plane_ip: Ipv4Addr,
|
||||
pub(crate) secrets_file: PathBuf,
|
||||
}
|
||||
|
||||
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 default: OptionalClusterDeserialize = if path.exists() {
|
||||
let content = tokio::fs::read_to_string(path).await.unwrap();
|
||||
|
||||
// The deserialization makes a blocking web request
|
||||
tokio::task::spawn_blocking(move || serde_yaml::from_str(&content).unwrap())
|
||||
.await
|
||||
.unwrap()
|
||||
let content = std::fs::read_to_string(path).unwrap();
|
||||
serde_yaml::from_str(&content).unwrap()
|
||||
} else {
|
||||
Default::default()
|
||||
};
|
||||
|
||||
let mut path = get_talos_path().join("clusters").join(cluster_name);
|
||||
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_saphyr::from_str(&content).unwrap();
|
||||
let mut cluster: OptionalClusterDeserialize = serde_yaml::from_str(&content).unwrap();
|
||||
|
||||
// For some reason apply on the cluster does not properly apply to the default settings...
|
||||
// So we manually apply it here first
|
||||
@@ -122,32 +114,28 @@ impl Cluster {
|
||||
let cluster = Self {
|
||||
name: cluster_name.into(),
|
||||
version: cluster.version,
|
||||
nodes: Default::default(),
|
||||
nodes: vec![],
|
||||
cluster_env: cluster.cluster_env,
|
||||
control_plane_ip: cluster.control_plane_ip,
|
||||
secrets_file,
|
||||
};
|
||||
|
||||
let nodes = nodes.iter().map(|name| async {
|
||||
let node = Node::get(name, env, &cluster, &default, &base).await;
|
||||
(node.hostname().to_owned(), node)
|
||||
});
|
||||
|
||||
let nodes = FuturesUnordered::from_iter(nodes).collect().await;
|
||||
let nodes = nodes
|
||||
.iter()
|
||||
.map(|name| Node::get(name, env, &cluster, &default, &base))
|
||||
.collect();
|
||||
|
||||
Self { nodes, ..cluster }
|
||||
}
|
||||
|
||||
pub async fn get_all() -> HashMap<String, Cluster> {
|
||||
pub fn get_all() -> Vec<Cluster> {
|
||||
let env = PathEnvironment::new_patches();
|
||||
|
||||
let names: Vec<_> = WalkDir::new(get_talos_path().join("clusters"))
|
||||
.filter_map(|e| async { e.ok() })
|
||||
.filter(|e| {
|
||||
let e = e.clone();
|
||||
async move { e.metadata().await.unwrap().is_file() }
|
||||
})
|
||||
.filter_map(|e| async move {
|
||||
WalkDir::new(get_talos_path().join("clusters"))
|
||||
.into_iter()
|
||||
.filter_map(|e| e.ok())
|
||||
.filter(|e| e.metadata().unwrap().is_file())
|
||||
.filter_map(|e| {
|
||||
let mut path = PathBuf::from_str(&e.file_name().to_string_lossy()).unwrap();
|
||||
path.set_extension("");
|
||||
|
||||
@@ -157,35 +145,18 @@ impl Cluster {
|
||||
return None;
|
||||
}
|
||||
|
||||
Some(name)
|
||||
Some(Cluster::get(&name, &env))
|
||||
})
|
||||
.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> {
|
||||
self.nodes.values()
|
||||
pub fn nodes(&self) -> &[Node] {
|
||||
&self.nodes
|
||||
}
|
||||
|
||||
pub fn node(&self, node: &str) -> Option<&Node> {
|
||||
self.nodes.get(node)
|
||||
}
|
||||
pub fn talosctl_gen_config_command(&self) -> Command {
|
||||
let path = get_configs_path().join(&self.name).join("talosconfig");
|
||||
|
||||
pub async fn talosconfig(&self) -> String {
|
||||
let mut command = Command::new("talosctl");
|
||||
command.args([
|
||||
"gen",
|
||||
@@ -197,59 +168,41 @@ impl Cluster {
|
||||
"--output-types",
|
||||
"talosconfig",
|
||||
"-o",
|
||||
"-",
|
||||
path.to_str().expect("Path should be valid utf-8"),
|
||||
]);
|
||||
|
||||
run_command(command).await
|
||||
command
|
||||
}
|
||||
|
||||
pub fn talosconfig_path(&self) -> PathBuf {
|
||||
get_configs_path().join(&self.name).join("talosconfig")
|
||||
}
|
||||
pub fn talosctl_add_endpoint_command(&self) -> Command {
|
||||
let path = get_configs_path().join(&self.name).join("talosconfig");
|
||||
|
||||
async fn talosconfig_add_endpoint(&self) {
|
||||
let mut command = Command::new("talosctl");
|
||||
command.args([
|
||||
"config",
|
||||
"--talosconfig",
|
||||
self.talosconfig_path()
|
||||
.to_str()
|
||||
.expect("Path should be valid utf-8"),
|
||||
path.to_str().expect("Path should be valid utf-8"),
|
||||
"endpoint",
|
||||
&self.control_plane_ip.to_string(),
|
||||
]);
|
||||
|
||||
run_command(command).await;
|
||||
command
|
||||
}
|
||||
|
||||
pub async fn talosconfig_write(&self) {
|
||||
let config = self.talosconfig().await;
|
||||
pub fn talosctl_merge_command(&self) -> Command {
|
||||
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");
|
||||
command.args([
|
||||
"config",
|
||||
"--talosconfig",
|
||||
TalosConfig::merged_path()
|
||||
.to_str()
|
||||
.expect("Path should be valid utf-8"),
|
||||
path.to_str().expect("Path should be valid utf-8"),
|
||||
"merge",
|
||||
self.talosconfig_path()
|
||||
.to_str()
|
||||
.expect("Path should be valid utf-8"),
|
||||
cluster_path.to_str().expect("Path should be valid utf-8"),
|
||||
]);
|
||||
|
||||
run_command(command).await;
|
||||
command
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+62
-75
@@ -1,80 +1,62 @@
|
||||
use std::net::Ipv4Addr;
|
||||
use std::ops::Deref;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::str::FromStr;
|
||||
|
||||
use async_walkdir::WalkDir;
|
||||
use futures::{Stream, StreamExt};
|
||||
use minijinja::syntax::SyntaxConfig;
|
||||
use minijinja::{AutoEscape, Environment, path_loader, value};
|
||||
use minijinja::{AutoEscape, Environment, path_loader};
|
||||
use walkdir::WalkDir;
|
||||
|
||||
use crate::{get_configs_path, get_talos_path};
|
||||
|
||||
/// 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
|
||||
/// the templates.
|
||||
#[derive(Clone)]
|
||||
pub struct PathEnvironment<'a> {
|
||||
env: Environment<'a>,
|
||||
path: PathBuf,
|
||||
}
|
||||
|
||||
fn apply_netmask(
|
||||
ip: value::Serde<Ipv4Addr>,
|
||||
netmask: value::Serde<Ipv4Addr>,
|
||||
) -> Result<String, minijinja::Error> {
|
||||
Ok((*ip & *netmask).to_string())
|
||||
}
|
||||
|
||||
pub fn configure_environment(env: &mut Environment) {
|
||||
// Configure jinja
|
||||
// Configure jinja
|
||||
env.set_syntax(
|
||||
SyntaxConfig::builder()
|
||||
.trim_blocks(true)
|
||||
.lstrip_blocks(true)
|
||||
.build()
|
||||
.expect("Syntax config should be valid"),
|
||||
);
|
||||
env.set_undefined_behavior(minijinja::UndefinedBehavior::Strict);
|
||||
env.set_auto_escape_callback(|_| AutoEscape::None);
|
||||
|
||||
// Add filters
|
||||
env.add_filter("to_prefix", |netmask: value::Serde<Ipv4Addr>| {
|
||||
let mask = netmask.to_bits();
|
||||
let prefix = mask.leading_ones();
|
||||
|
||||
if mask.checked_shl(prefix).unwrap_or(0) == 0 {
|
||||
Ok(prefix as u8)
|
||||
} else {
|
||||
Err(minijinja::Error::new(
|
||||
minijinja::ErrorKind::InvalidOperation,
|
||||
"invalid IP prefix length",
|
||||
))
|
||||
}
|
||||
});
|
||||
|
||||
env.add_function("apply_netmask", apply_netmask);
|
||||
|
||||
// Helper function for getting the path to kubeconfig files
|
||||
env.add_filter("kubeconfig", move |names: Vec<String>| {
|
||||
names
|
||||
.iter()
|
||||
.map(|name| {
|
||||
get_configs_path()
|
||||
.join(name)
|
||||
.join("kubeconfig")
|
||||
.to_string_lossy()
|
||||
.to_string()
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
});
|
||||
}
|
||||
|
||||
impl<'a> PathEnvironment<'a> {
|
||||
pub fn new(path: &Path) -> Self {
|
||||
let mut env = Environment::new();
|
||||
|
||||
configure_environment(&mut env);
|
||||
// Configure jinja
|
||||
env.set_trim_blocks(true);
|
||||
env.set_lstrip_blocks(true);
|
||||
env.set_undefined_behavior(minijinja::UndefinedBehavior::Strict);
|
||||
env.set_auto_escape_callback(|_| AutoEscape::None);
|
||||
|
||||
// Add filters
|
||||
env.add_filter("to_prefix", |netmask: String| {
|
||||
let netmask = Ipv4Addr::from_str(&netmask).map_err(|err| {
|
||||
minijinja::Error::new(minijinja::ErrorKind::InvalidOperation, err.to_string())
|
||||
})?;
|
||||
let mask = netmask.to_bits();
|
||||
let prefix = mask.leading_ones();
|
||||
|
||||
if mask.checked_shl(prefix).unwrap_or(0) == 0 {
|
||||
Ok(prefix as u8)
|
||||
} else {
|
||||
Err(minijinja::Error::new(
|
||||
minijinja::ErrorKind::InvalidOperation,
|
||||
"invalid IP prefix length",
|
||||
))
|
||||
}
|
||||
});
|
||||
|
||||
// Helper function for getting the path to kubeconfig files
|
||||
env.add_filter("kubeconfig", move |names: Vec<String>| {
|
||||
names
|
||||
.iter()
|
||||
.map(|name| {
|
||||
get_configs_path()
|
||||
.join(name)
|
||||
.join("kubeconfig")
|
||||
.to_string_lossy()
|
||||
.to_string()
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
});
|
||||
|
||||
// Add path loader
|
||||
env.set_loader(path_loader(&path));
|
||||
@@ -88,23 +70,6 @@ impl<'a> PathEnvironment<'a> {
|
||||
pub(crate) fn new_patches() -> Self {
|
||||
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
|
||||
@@ -115,3 +80,25 @@ impl<'a> Deref for PathEnvironment<'a> {
|
||||
&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,10 +0,0 @@
|
||||
use crete::tftp::ServerError;
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum Error {
|
||||
#[error("No clusters where found")]
|
||||
NoClustersFound,
|
||||
#[error("Server error: {0}")]
|
||||
ServerError(#[from] ServerError),
|
||||
}
|
||||
-55
@@ -1,55 +0,0 @@
|
||||
use crete::cluster::Cluster;
|
||||
use crete::environment::configure_environment;
|
||||
use ipxe::IPXE_DIR;
|
||||
use minijinja::{Environment, context, value};
|
||||
use regex::regex;
|
||||
|
||||
pub async fn get_file(
|
||||
filename: impl ToString,
|
||||
http_url: impl ToString,
|
||||
) -> Option<(Vec<u8>, &'static str)> {
|
||||
let re = regex!(r"^talos/(?<cluster>.+)/(?<node>.+)\.ya?ml$");
|
||||
|
||||
let filename: String = filename.to_string();
|
||||
let re = re.clone();
|
||||
|
||||
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 => value::Serde(clusters.values().collect::<Vec<_>>()),
|
||||
httpUrl => http_url.to_string()
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
Some((content.into(), "text/plain; charset=utf-8"))
|
||||
} else if let Some(filename) = filename.strip_prefix(IPXE_PATTERN) {
|
||||
Some((
|
||||
IPXE_DIR.get_file(filename)?.contents().to_owned(),
|
||||
"application/octet-stream",
|
||||
))
|
||||
} else if let Some(caps) = re.captures(&filename) {
|
||||
let cluster = &caps["cluster"];
|
||||
let node = &caps["node"];
|
||||
|
||||
let clusters = Cluster::get_all().await;
|
||||
let cluster = clusters.get(cluster)?;
|
||||
|
||||
let node = cluster.node(node)?;
|
||||
|
||||
let config = node.config(cluster).await;
|
||||
|
||||
Some((config.into(), "application/yaml; charset=utf-8"))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
-46
@@ -1,46 +0,0 @@
|
||||
use std::path::PathBuf;
|
||||
|
||||
use axum::debug_handler;
|
||||
use axum::extract::Request;
|
||||
use axum::http::Uri;
|
||||
use axum::response::IntoResponse;
|
||||
use reqwest::{StatusCode, header};
|
||||
|
||||
use crate::file::get_file;
|
||||
|
||||
#[debug_handler]
|
||||
pub async fn handler(req: Request) -> impl IntoResponse {
|
||||
let uri: Uri = req
|
||||
.headers()
|
||||
.iter()
|
||||
.find(|(name, _)| header::HOST.eq(name))
|
||||
.map(|(_, value)| value)
|
||||
.expect("Host header should exist")
|
||||
.to_str()
|
||||
.expect("Header value should be valid ASCII")
|
||||
.parse()
|
||||
.expect("Host should be valid Uri");
|
||||
|
||||
let host = uri.host().expect("Uri should have host");
|
||||
let port = uri.port().map(|port| port.as_u16()).unwrap_or(80);
|
||||
|
||||
let Some(path) = req.uri().path().strip_prefix("/") else {
|
||||
return StatusCode::BAD_REQUEST.into_response();
|
||||
};
|
||||
|
||||
let Some((file, content_type)) = get_file(path, format!("http://{host}:{port}")).await else {
|
||||
return StatusCode::NOT_FOUND.into_response();
|
||||
};
|
||||
|
||||
let path = PathBuf::from(path);
|
||||
let filename = path.file_name().unwrap();
|
||||
let filename = filename.to_str().unwrap();
|
||||
|
||||
let content_type = [(header::CONTENT_TYPE, content_type)];
|
||||
let disposition = [(
|
||||
header::CONTENT_DISPOSITION,
|
||||
format!("inline; filename=\"{filename}\""),
|
||||
)];
|
||||
|
||||
(content_type, disposition, file).into_response()
|
||||
}
|
||||
+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::sync::OnceLock;
|
||||
|
||||
use tokio::process::Command;
|
||||
|
||||
pub mod cluster;
|
||||
pub mod environment;
|
||||
pub mod node;
|
||||
pub mod patch;
|
||||
pub mod schematic;
|
||||
pub mod secret;
|
||||
pub mod talosconfig;
|
||||
pub mod tftp;
|
||||
|
||||
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 {
|
||||
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()
|
||||
}
|
||||
|
||||
+45
-76
@@ -1,126 +1,95 @@
|
||||
mod cli;
|
||||
mod error;
|
||||
mod file;
|
||||
mod http;
|
||||
|
||||
use std::net::SocketAddr;
|
||||
use std::pin::pin;
|
||||
use std::process::Command;
|
||||
|
||||
use axum::Router;
|
||||
use axum::routing::get;
|
||||
use clap::{CommandFactory, Parser};
|
||||
use clap_complete::{Shell, generate as generate_complete};
|
||||
use crete::cluster::Cluster;
|
||||
use crete::environment::PathEnvironment;
|
||||
use crete::talosconfig::{get_current_context, set_context};
|
||||
use crete::{get_configs_path, get_repo_path, set_repo_path, tftp};
|
||||
use futures::StreamExt;
|
||||
use futures::future::join_all;
|
||||
use minijinja::{context, value};
|
||||
use crete::{get_configs_path, get_repo_path, set_repo_path};
|
||||
use minijinja::context;
|
||||
use thiserror::Error;
|
||||
|
||||
use crate::cli::{Cli, Commands, GlobalOpts};
|
||||
use crate::error::Error;
|
||||
use crate::file::get_file;
|
||||
use crate::http::handler;
|
||||
|
||||
async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
|
||||
let clusters = Cluster::get_all().await;
|
||||
#[derive(Debug, Error)]
|
||||
enum Error {
|
||||
#[error("No clusters where found")]
|
||||
NoClustersFound,
|
||||
}
|
||||
|
||||
fn run_command(mut command: Command) {
|
||||
let output = command.output().unwrap();
|
||||
if !output.stdout.is_empty() {
|
||||
println!("{}", String::from_utf8_lossy(&output.stdout).trim_end());
|
||||
}
|
||||
if !output.stderr.is_empty() {
|
||||
println!("{}", String::from_utf8_lossy(&output.stderr).trim_end());
|
||||
}
|
||||
}
|
||||
|
||||
fn generate(opts: &GlobalOpts) -> Result<(), Error> {
|
||||
set_repo_path(&opts.repo);
|
||||
|
||||
let clusters = Cluster::get_all();
|
||||
|
||||
if clusters.is_empty() {
|
||||
return Err(Error::NoClustersFound);
|
||||
}
|
||||
|
||||
let path = opts.repo.join("rendered");
|
||||
// We don't really care if this fails, as that likely mean that the directory did not exist
|
||||
tokio::fs::remove_dir_all(&path).await.ok();
|
||||
tokio::fs::create_dir_all(&path).await.unwrap();
|
||||
if path.exists() {
|
||||
std::fs::remove_dir_all(&path).unwrap();
|
||||
}
|
||||
std::fs::create_dir(&path).unwrap();
|
||||
|
||||
// Render templates
|
||||
let template_env = PathEnvironment::new(&get_repo_path().join("templates"));
|
||||
|
||||
let mut stream = pin!(template_env.files());
|
||||
while let Some(template_name) = stream.next().await {
|
||||
for template_name in &template_env {
|
||||
let template = template_env.get_template(&template_name).unwrap();
|
||||
|
||||
let content = template
|
||||
.render(context! {
|
||||
clusters => value::Serde(clusters.values().collect::<Vec<_>>()),
|
||||
root => value::Serde(&opts.repo)
|
||||
clusters,
|
||||
root => opts.repo
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
tokio::fs::write(path.join(template_name), content)
|
||||
.await
|
||||
.unwrap();
|
||||
std::fs::write(path.join(template_name), content).unwrap();
|
||||
}
|
||||
|
||||
let context = get_current_context().await;
|
||||
|
||||
// Remove existing config files and create output directory
|
||||
let path = get_configs_path();
|
||||
tokio::fs::remove_dir_all(&path).await.ok();
|
||||
tokio::fs::create_dir_all(&path).await.unwrap();
|
||||
if path.exists() {
|
||||
std::fs::remove_dir_all(&path).unwrap();
|
||||
}
|
||||
std::fs::create_dir(&path).unwrap();
|
||||
|
||||
// Generate config files
|
||||
join_all(clusters.values().map(|cluster| async move {
|
||||
join_all(cluster.nodes().map(|node| {
|
||||
let cluster = cluster.clone();
|
||||
async move {
|
||||
node.config_write(&cluster).await;
|
||||
}
|
||||
}))
|
||||
.await;
|
||||
for cluster in clusters {
|
||||
for node in cluster.nodes() {
|
||||
run_command(node.talosctl_gen_config_command(&cluster));
|
||||
}
|
||||
|
||||
// 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 {
|
||||
set_context(context).await;
|
||||
run_command(cluster.talosctl_gen_config_command());
|
||||
run_command(cluster.talosctl_add_endpoint_command());
|
||||
run_command(cluster.talosctl_merge_command());
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Error> {
|
||||
fn main() -> Result<(), Error> {
|
||||
let cli = Cli::parse();
|
||||
|
||||
set_repo_path(&cli.global_opts.repo);
|
||||
|
||||
match cli.command {
|
||||
Commands::Generate => generate(&cli.global_opts).await?,
|
||||
Commands::Generate => generate(&cli.global_opts)?,
|
||||
Commands::ShellCompletions => generate_complete(
|
||||
Shell::from_env().unwrap_or(Shell::Bash),
|
||||
&mut Cli::command(),
|
||||
"crete",
|
||||
&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| async move {
|
||||
get_file(filename, format!("http://{ip}:{port}"))
|
||||
.await
|
||||
.map(|(file, _)| file)
|
||||
})
|
||||
.await?;
|
||||
}
|
||||
};
|
||||
|
||||
Ok(())
|
||||
|
||||
+15
-43
@@ -1,17 +1,16 @@
|
||||
use std::net::Ipv4Addr;
|
||||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
|
||||
use minijinja::Environment;
|
||||
use optional_struct::{Applicable, optional_struct};
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tokio::process::Command;
|
||||
|
||||
use crate::cluster::{Base, Cluster};
|
||||
use crate::patch::{OptionalPatches, OptionalPatchesString, Patches};
|
||||
use crate::schematic::Schematic;
|
||||
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)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
@@ -54,8 +53,7 @@ struct Network {
|
||||
ip: Ipv4Addr,
|
||||
netmask: Ipv4Addr,
|
||||
gateway: Ipv4Addr,
|
||||
#[serde(default)]
|
||||
dns: Option<Vec<Ipv4Addr>>,
|
||||
dns: [Ipv4Addr; 2],
|
||||
#[optional_rename(OptionalTailscale)]
|
||||
#[optional_wrap]
|
||||
tailscale: Tailscale,
|
||||
@@ -91,7 +89,7 @@ pub(crate) struct NodeDeserialize {
|
||||
sops: Secret,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Clone)]
|
||||
#[derive(Debug, Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct Node {
|
||||
hostname: String,
|
||||
@@ -102,14 +100,14 @@ pub struct Node {
|
||||
ntp: String,
|
||||
install: Install,
|
||||
kernel_args: Vec<String>,
|
||||
patches: Patches<serde_json::Value>,
|
||||
patches: Patches<serde_yaml::Value>,
|
||||
sops: Secret,
|
||||
}
|
||||
|
||||
impl Node {
|
||||
pub(crate) async fn get(
|
||||
pub(crate) fn get(
|
||||
node_name: &str,
|
||||
env: &Environment<'static>,
|
||||
env: &Environment,
|
||||
cluster: &Cluster,
|
||||
default: &OptionalNodeDeserialize,
|
||||
base: &Base,
|
||||
@@ -122,21 +120,14 @@ impl Node {
|
||||
.to_string();
|
||||
|
||||
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_saphyr::from_str(&content).unwrap();
|
||||
let node: OptionalNodeDeserialize = serde_yaml::from_str(&content).unwrap();
|
||||
|
||||
// We want all vectors to be empty vectors by default
|
||||
// Sadly we have to this manually
|
||||
// TODO: Find a better way of doing this
|
||||
let default = OptionalNodeDeserialize {
|
||||
network: Some(OptionalNetwork {
|
||||
tailscale: Some(OptionalTailscale {
|
||||
advertise_routes: Some(false),
|
||||
..Default::default()
|
||||
}),
|
||||
..Default::default()
|
||||
}),
|
||||
patches: Some(OptionalPatches {
|
||||
all: Some(vec![]),
|
||||
control_plane: Some(vec![]),
|
||||
@@ -173,16 +164,15 @@ impl Node {
|
||||
};
|
||||
|
||||
// Render patches
|
||||
let patches = patches.render(env, cluster, &node).await;
|
||||
let patches = patches.render(env, cluster, &node);
|
||||
|
||||
Node { patches, ..node }
|
||||
}
|
||||
|
||||
pub fn hostname(&self) -> &str {
|
||||
&self.hostname
|
||||
}
|
||||
pub fn talosctl_gen_config_command(&self, cluster: &Cluster) -> Command {
|
||||
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");
|
||||
command.args([
|
||||
"gen",
|
||||
@@ -206,7 +196,7 @@ impl Node {
|
||||
"--with-docs=false",
|
||||
"--with-examples=false",
|
||||
"-o",
|
||||
"-",
|
||||
path.to_str().expect("Path should be valid utf-8"),
|
||||
]);
|
||||
|
||||
for patch in &self.patches.all {
|
||||
@@ -220,25 +210,7 @@ impl Node {
|
||||
]);
|
||||
}
|
||||
|
||||
run_command(command).await
|
||||
}
|
||||
|
||||
pub fn config_path(&self, cluster: &Cluster) -> PathBuf {
|
||||
let mut path = get_configs_path().join(&cluster.name).join(&self.hostname);
|
||||
path.add_extension("yaml");
|
||||
|
||||
path
|
||||
}
|
||||
|
||||
pub async fn config_write(&self, cluster: &Cluster) {
|
||||
let config = self.config(cluster).await;
|
||||
|
||||
let path = self.config_path(cluster);
|
||||
tokio::fs::create_dir_all(path.parent().expect("config should have parent"))
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
tokio::fs::write(path, config).await.unwrap();
|
||||
command
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+23
-32
@@ -1,4 +1,4 @@
|
||||
use minijinja::{Environment, context, value};
|
||||
use minijinja::{Environment, context};
|
||||
use optional_struct::optional_struct;
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
@@ -16,36 +16,27 @@ pub(crate) struct Patches<T> {
|
||||
|
||||
pub(crate) type OptionalPatchesString = OptionalPatches<String>;
|
||||
|
||||
async fn render(
|
||||
fn render(
|
||||
patches: Vec<String>,
|
||||
env: &Environment<'static>,
|
||||
env: &Environment,
|
||||
cluster: &Cluster,
|
||||
node: &Node,
|
||||
) -> Vec<serde_json::Value> {
|
||||
let env = env.clone();
|
||||
let cluster = cluster.clone();
|
||||
let node = node.clone();
|
||||
) -> Vec<serde_yaml::Value> {
|
||||
patches
|
||||
.into_iter()
|
||||
.map(|name| {
|
||||
let content = env
|
||||
.get_template(&name)
|
||||
.unwrap()
|
||||
.render(context! {
|
||||
node,
|
||||
cluster
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
// Minijinja will still have blocking I/O internally
|
||||
tokio::task::spawn_blocking(move || {
|
||||
patches
|
||||
.into_iter()
|
||||
.map(move |name| {
|
||||
let content = env
|
||||
.get_template(&name)
|
||||
.unwrap()
|
||||
.render(context! {
|
||||
node => value::Serde(&node),
|
||||
cluster => value::Serde(&cluster)
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
serde_saphyr::from_str(&content).unwrap()
|
||||
})
|
||||
.collect()
|
||||
})
|
||||
.await
|
||||
.unwrap()
|
||||
serde_yaml::from_str(&content).unwrap()
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
impl Patches<String> {
|
||||
@@ -59,15 +50,15 @@ impl Patches<String> {
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn render(
|
||||
pub(crate) fn render(
|
||||
self,
|
||||
env: &Environment<'static>,
|
||||
env: &Environment,
|
||||
cluster: &Cluster,
|
||||
node: &Node,
|
||||
) -> Patches<serde_json::Value> {
|
||||
) -> Patches<serde_yaml::Value> {
|
||||
Patches {
|
||||
all: render(self.all.clone(), env, cluster, node).await,
|
||||
control_plane: render(self.control_plane.clone(), env, cluster, node).await,
|
||||
all: render(self.all.clone(), env, cluster, node),
|
||||
control_plane: render(self.control_plane.clone(), env, cluster, node),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+8
-27
@@ -1,6 +1,5 @@
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Deserializer, Serialize};
|
||||
use tokio::runtime::Handle;
|
||||
|
||||
use crate::get_talos_path;
|
||||
|
||||
@@ -12,38 +11,20 @@ where
|
||||
let path = get_talos_path().join("schematics").join(name);
|
||||
let content = std::fs::read_to_string(path).unwrap().trim().to_owned();
|
||||
|
||||
let client = reqwest::ClientBuilder::new()
|
||||
.user_agent(format!(
|
||||
"{}/{}",
|
||||
std::env!("CARGO_PKG_NAME"),
|
||||
std::env!("CARGO_PKG_VERSION")
|
||||
))
|
||||
.build()
|
||||
.unwrap();
|
||||
let client = reqwest::blocking::Client::new();
|
||||
let res = client
|
||||
.post("https://factory.talos.dev/schematics")
|
||||
.body(content)
|
||||
.send()
|
||||
.map_err(serde::de::Error::custom)?;
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct Response {
|
||||
id: String,
|
||||
}
|
||||
|
||||
// We can't use async directly inside a custom deserializer, and using the blocking client also
|
||||
// does not work as it will try to start tokio inside of tokio.
|
||||
// So we have do this to work around it.
|
||||
// NOTE: This requires that the deserialization happens inside spawn_blocking
|
||||
let response = Handle::current().block_on(async {
|
||||
let res = client
|
||||
.post("https://factory.talos.dev/schematics")
|
||||
.body(content)
|
||||
.send()
|
||||
.await
|
||||
.map_err(serde::de::Error::custom)?;
|
||||
|
||||
let response: Response =
|
||||
serde_json::from_str(&res.text().await.map_err(serde::de::Error::custom)?)
|
||||
.map_err(serde::de::Error::custom)?;
|
||||
|
||||
Ok(response)
|
||||
})?;
|
||||
let response: Response = serde_json::from_str(&res.text().map_err(serde::de::Error::custom)?)
|
||||
.map_err(serde::de::Error::custom)?;
|
||||
|
||||
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_saphyr::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,191 +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, AsyncFdRegisterError};
|
||||
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,
|
||||
#[error("AsyncFd: {0}")]
|
||||
AsyncFd(#[from] AsyncFdRegisterError<PktInfoUdpSocket>),
|
||||
}
|
||||
|
||||
pub async fn handle_connection<F, Fut>(
|
||||
info: PktInfo,
|
||||
packet: Packet,
|
||||
callback: F,
|
||||
) -> Result<(), Error>
|
||||
where
|
||||
F: Fn(String, 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.to_string(), 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(String, 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 = unsafe { AsyncFd::register(socket)? };
|
||||
|
||||
let mut buf = [0u8; PACKET_SIZE];
|
||||
|
||||
println!("Tftp server started on {addr}");
|
||||
loop {
|
||||
let mut guard = async_fd.readable().await?;
|
||||
|
||||
let (packet, info) = match guard.try_io(|inner| inner.get_ref().recv(&mut buf)) {
|
||||
Ok(Ok((_, info))) => (buf.try_into()?, info),
|
||||
Ok(Err(e)) => return Err(e)?,
|
||||
// Socket was not ready
|
||||
Err(_would_block) => continue,
|
||||
};
|
||||
|
||||
let callback = callback.clone();
|
||||
let src = info.addr_src;
|
||||
tokio::spawn({
|
||||
async move {
|
||||
if let Err(err) = handle_connection(info, packet, callback).await {
|
||||
println!("{src}: {err}")
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
[default.extend-words]
|
||||
rela = "rela"
|
||||
+1
-1
@@ -4,7 +4,7 @@ version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
repo_path = "1.4.1"
|
||||
repo_path = "1.2.4"
|
||||
schemars = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
crete = { path = ".." }
|
||||
|
||||
Reference in New Issue
Block a user