From: Stefan Hanreich <[email protected]> .. such that it can be used in API definitions.
Authored-by: Stefan Hanreich <[email protected]> Signed-off-by: Christoph Heiss <[email protected]> --- Changes v1 -> v2: * improve schema description proxmox-wireguard/Cargo.toml | 3 +++ proxmox-wireguard/debian/control | 19 +++++++++++++++++++ proxmox-wireguard/src/lib.rs | 17 +++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/proxmox-wireguard/Cargo.toml b/proxmox-wireguard/Cargo.toml index b48ed238..5d3f05fe 100644 --- a/proxmox-wireguard/Cargo.toml +++ b/proxmox-wireguard/Cargo.toml @@ -13,13 +13,16 @@ rust-version.workspace = true ed25519-dalek = "2.1" serde = { workspace = true, features = [ "derive" ] } thiserror.workspace = true +proxmox-schema = { workspace = true, optional = true, features = ["api-types"] } proxmox-serde = { workspace = true, features = [ "ini-ser" ] } proxmox-network-types.workspace = true proxmox-sys = { workspace = true, optional = true } +regex = { workspace = true, optional = true } [dev-dependencies] pretty_assertions.workspace = true [features] default = ["key-generation"] +api-types = ["dep:proxmox-schema", "dep:regex"] key-generation = ["dep:proxmox-sys"] diff --git a/proxmox-wireguard/debian/control b/proxmox-wireguard/debian/control index 9c4c46cd..7c47b8cd 100644 --- a/proxmox-wireguard/debian/control +++ b/proxmox-wireguard/debian/control @@ -37,6 +37,8 @@ Depends: librust-thiserror-2+default-dev Recommends: librust-proxmox-wireguard+key-generation-dev (= ${binary:Version}) +Suggests: + librust-proxmox-wireguard+api-types-dev (= ${binary:Version}) Provides: librust-proxmox-wireguard-0-dev (= ${binary:Version}), librust-proxmox-wireguard-0.1-dev (= ${binary:Version}), @@ -44,6 +46,23 @@ Provides: Description: WireGuard configuration support - Rust source code Source code for Debianized Rust crate "proxmox-wireguard" +Package: librust-proxmox-wireguard+api-types-dev +Architecture: any +Multi-Arch: same +Depends: + ${misc:Depends}, + librust-proxmox-wireguard-dev (= ${binary:Version}), + librust-proxmox-schema-5+api-types-dev (>= 5.0.1-~~), + librust-proxmox-schema-5+default-dev (>= 5.0.1-~~), + librust-regex-1+default-dev (>= 1.5-~~) +Provides: + librust-proxmox-wireguard-0+api-types-dev (= ${binary:Version}), + librust-proxmox-wireguard-0.1+api-types-dev (= ${binary:Version}), + librust-proxmox-wireguard-0.1.0+api-types-dev (= ${binary:Version}) +Description: WireGuard configuration support - feature "api-types" + This metapackage enables feature "api-types" for the Rust proxmox-wireguard + crate, by pulling in any additional dependencies needed by that feature. + Package: librust-proxmox-wireguard+key-generation-dev Architecture: any Multi-Arch: same diff --git a/proxmox-wireguard/src/lib.rs b/proxmox-wireguard/src/lib.rs index a3a517b7..facdeb99 100644 --- a/proxmox-wireguard/src/lib.rs +++ b/proxmox-wireguard/src/lib.rs @@ -17,6 +17,10 @@ use serde::{Deserialize, Serialize}; use std::fmt; use proxmox_network_types::{endpoint::ServiceEndpoint, ip_address::Cidr}; +#[cfg(feature = "api-types")] +use proxmox_schema::{ + api_types::ED25519_BASE64_KEY_REGEX, ApiStringFormat, ApiType, StringSchema, UpdaterType, +}; /// Possible error when handling WireGuard configurations. #[derive(thiserror::Error, Debug, PartialEq, Clone)] @@ -42,6 +46,19 @@ pub struct PublicKey( #[serde(with = "proxmox_serde::byte_array_as_base64")] [u8; ed25519_dalek::PUBLIC_KEY_LENGTH], ); +#[cfg(feature = "api-types")] +impl ApiType for PublicKey { + const API_SCHEMA: proxmox_schema::Schema = + StringSchema::new("ED25519 public key (base64 encoded)") + .format(&ApiStringFormat::Pattern(&ED25519_BASE64_KEY_REGEX)) + .schema(); +} + +#[cfg(feature = "api-types")] +impl UpdaterType for PublicKey { + type Updater = Option<PublicKey>; +} + /// Private key of a WireGuard peer. #[derive(Serialize)] #[serde(transparent)] -- 2.52.0
