8ba58ba11e
* grand Noise squaheroo * fix merge conflicts and adapt code for the key rotation changes (#5824) * remove file that should have been ignored
413 lines
13 KiB
Rust
413 lines
13 KiB
Rust
// Copyright 2023-2024 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
use celes::Country;
|
|
use nym_crypto::asymmetric::ed25519::{self, serde_helpers::bs58_ed25519_pubkey};
|
|
use nym_crypto::asymmetric::x25519::{
|
|
self, serde_helpers::bs58_x25519_pubkey, serde_helpers::option_bs58_x25519_pubkey,
|
|
};
|
|
use nym_noise_keys::VersionedNoiseKey;
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::net::IpAddr;
|
|
|
|
pub use crate::api::SignedHostInformation;
|
|
pub use nym_bin_common::build_information::BinaryBuildInformationOwned;
|
|
|
|
#[derive(Clone, Default, Debug, Copy, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct NodeRoles {
|
|
pub mixnode_enabled: bool,
|
|
pub gateway_enabled: bool,
|
|
pub network_requester_enabled: bool,
|
|
pub ip_packet_router_enabled: bool,
|
|
}
|
|
|
|
impl NodeRoles {
|
|
pub fn can_operate_mixnode(&self) -> bool {
|
|
self.mixnode_enabled
|
|
}
|
|
|
|
pub fn can_operate_entry_gateway(&self) -> bool {
|
|
self.gateway_enabled
|
|
}
|
|
|
|
pub fn can_operate_exit_gateway(&self) -> bool {
|
|
self.gateway_enabled && self.network_requester_enabled && self.ip_packet_router_enabled
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy, Default, Debug, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct AnnouncePorts {
|
|
pub verloc_port: Option<u16>,
|
|
pub mix_port: Option<u16>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct HostInformation {
|
|
/// Ip address(es) of this host, such as `1.1.1.1`.
|
|
#[cfg_attr(feature = "openapi", schema(value_type = Vec<String>, format = Byte, example = json!(["1.1.1.1"])))]
|
|
pub ip_address: Vec<IpAddr>,
|
|
|
|
/// Optional hostname of this node, for example `nymtech.net`.
|
|
#[cfg_attr(feature = "openapi", schema(example = "nymtech.net"))]
|
|
pub hostname: Option<String>,
|
|
|
|
/// Public keys associated with this node.
|
|
pub keys: HostKeys,
|
|
}
|
|
|
|
impl HostInformation {
|
|
pub fn check_ips(&self) -> bool {
|
|
for ip in &self.ip_address {
|
|
if ip.is_unspecified() || ip.is_loopback() || ip.is_multicast() {
|
|
return false;
|
|
}
|
|
}
|
|
true
|
|
}
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
pub struct LegacyHostInformationV3 {
|
|
pub ip_address: Vec<IpAddr>,
|
|
pub hostname: Option<String>,
|
|
pub keys: LegacyHostKeysV3,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
pub struct LegacyHostInformationV2 {
|
|
pub ip_address: Vec<IpAddr>,
|
|
pub hostname: Option<String>,
|
|
pub keys: LegacyHostKeysV2,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
pub struct LegacyHostInformationV1 {
|
|
pub ip_address: Vec<IpAddr>,
|
|
pub hostname: Option<String>,
|
|
pub keys: LegacyHostKeysV1,
|
|
}
|
|
|
|
impl From<HostInformation> for LegacyHostInformationV3 {
|
|
fn from(value: HostInformation) -> Self {
|
|
LegacyHostInformationV3 {
|
|
ip_address: value.ip_address,
|
|
hostname: value.hostname,
|
|
keys: value.keys.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<LegacyHostInformationV3> for LegacyHostInformationV2 {
|
|
fn from(value: LegacyHostInformationV3) -> Self {
|
|
LegacyHostInformationV2 {
|
|
ip_address: value.ip_address,
|
|
hostname: value.hostname,
|
|
keys: value.keys.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<LegacyHostInformationV2> for LegacyHostInformationV1 {
|
|
fn from(value: LegacyHostInformationV2) -> Self {
|
|
LegacyHostInformationV1 {
|
|
ip_address: value.ip_address,
|
|
hostname: value.hostname,
|
|
keys: value.keys.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
#[serde(from = "HostKeysDeHelper")]
|
|
pub struct HostKeys {
|
|
/// Base58-encoded ed25519 public key of this node. Currently, it corresponds to either mixnode's or gateway's identity.
|
|
#[schemars(with = "String")]
|
|
#[cfg_attr(feature = "openapi", schema(value_type = String))]
|
|
#[serde(with = "bs58_ed25519_pubkey")]
|
|
pub ed25519_identity: ed25519::PublicKey,
|
|
|
|
#[deprecated(note = "use explicit primary_x25519_sphinx_key instead")]
|
|
#[schemars(with = "String")]
|
|
#[cfg_attr(feature = "openapi", schema(value_type = String))]
|
|
#[serde(with = "bs58_x25519_pubkey")]
|
|
pub x25519_sphinx: x25519::PublicKey,
|
|
|
|
/// Current, active, x25519 sphinx key clients are expected to use when constructing packets
|
|
/// with this node in the route.
|
|
pub primary_x25519_sphinx_key: SphinxKey,
|
|
|
|
/// Pre-announced x25519 sphinx key clients will use during the following key rotation
|
|
pub pre_announced_x25519_sphinx_key: Option<SphinxKey>,
|
|
|
|
/// Base58-encoded x25519 public key of this node used for the noise protocol.
|
|
#[serde(default)]
|
|
pub x25519_versioned_noise: Option<VersionedNoiseKey>,
|
|
}
|
|
|
|
// we need the intermediate struct to help us with the new explicit sphinx key fields
|
|
#[allow(deprecated)]
|
|
impl From<HostKeysDeHelper> for HostKeys {
|
|
fn from(value: HostKeysDeHelper) -> Self {
|
|
let primary_x25519_sphinx_key = match value.primary_x25519_sphinx_key {
|
|
None => {
|
|
// legacy
|
|
SphinxKey::new_legacy(value.x25519_sphinx)
|
|
}
|
|
Some(primary_x25519_sphinx_key) => primary_x25519_sphinx_key,
|
|
};
|
|
|
|
HostKeys {
|
|
ed25519_identity: value.ed25519_identity,
|
|
x25519_sphinx: value.x25519_sphinx,
|
|
primary_x25519_sphinx_key,
|
|
pre_announced_x25519_sphinx_key: value.pre_announced_x25519_sphinx_key,
|
|
x25519_versioned_noise: value.x25519_versioned_noise,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
struct HostKeysDeHelper {
|
|
/// Base58-encoded ed25519 public key of this node. Currently, it corresponds to either mixnode's or gateway's identity.
|
|
#[serde(alias = "ed25519")]
|
|
#[serde(with = "bs58_ed25519_pubkey")]
|
|
pub ed25519_identity: ed25519::PublicKey,
|
|
|
|
#[deprecated(note = "use explicit primary_x25519_sphinx_key instead")]
|
|
#[serde(alias = "x25519")]
|
|
#[serde(with = "bs58_x25519_pubkey")]
|
|
pub x25519_sphinx: x25519::PublicKey,
|
|
|
|
/// Current, active, x25519 sphinx key clients are expected to use when constructing packets
|
|
/// with this node in the route.
|
|
pub primary_x25519_sphinx_key: Option<SphinxKey>,
|
|
|
|
/// Pre-announced x25519 sphinx key clients will use during the following key rotation
|
|
#[serde(default)]
|
|
pub pre_announced_x25519_sphinx_key: Option<SphinxKey>,
|
|
|
|
/// Base58-encoded x25519 public key of this node used for the noise protocol.
|
|
#[serde(default)]
|
|
pub x25519_versioned_noise: Option<VersionedNoiseKey>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct SphinxKey {
|
|
pub rotation_id: u32,
|
|
|
|
#[serde(with = "bs58_x25519_pubkey")]
|
|
#[schemars(with = "String")]
|
|
#[cfg_attr(feature = "openapi", schema(value_type = String))]
|
|
pub public_key: x25519::PublicKey,
|
|
}
|
|
|
|
impl SphinxKey {
|
|
pub fn new_legacy(public_key: x25519::PublicKey) -> SphinxKey {
|
|
SphinxKey {
|
|
rotation_id: u32::MAX,
|
|
public_key,
|
|
}
|
|
}
|
|
|
|
pub fn is_legacy(&self) -> bool {
|
|
self.rotation_id == u32::MAX
|
|
}
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
pub struct LegacyHostKeysV3 {
|
|
#[serde(alias = "ed25519")]
|
|
#[serde(with = "bs58_ed25519_pubkey")]
|
|
pub ed25519_identity: ed25519::PublicKey,
|
|
|
|
#[serde(alias = "x25519")]
|
|
#[serde(with = "bs58_x25519_pubkey")]
|
|
pub x25519_sphinx: x25519::PublicKey,
|
|
|
|
#[serde(default)]
|
|
#[serde(with = "option_bs58_x25519_pubkey")]
|
|
pub x25519_noise: Option<x25519::PublicKey>,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
pub struct LegacyHostKeysV2 {
|
|
pub ed25519_identity: String,
|
|
pub x25519_sphinx: String,
|
|
pub x25519_noise: String,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
pub struct LegacyHostKeysV1 {
|
|
pub ed25519: String,
|
|
pub x25519: String,
|
|
}
|
|
|
|
impl From<HostKeys> for LegacyHostKeysV3 {
|
|
fn from(value: HostKeys) -> Self {
|
|
LegacyHostKeysV3 {
|
|
ed25519_identity: value.ed25519_identity,
|
|
x25519_sphinx: value.primary_x25519_sphinx_key.public_key,
|
|
x25519_noise: value.x25519_versioned_noise.map(|k| k.x25519_pubkey),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<LegacyHostKeysV3> for LegacyHostKeysV2 {
|
|
fn from(value: LegacyHostKeysV3) -> Self {
|
|
LegacyHostKeysV2 {
|
|
ed25519_identity: value.ed25519_identity.to_base58_string(),
|
|
x25519_sphinx: value.x25519_sphinx.to_base58_string(),
|
|
x25519_noise: value
|
|
.x25519_noise
|
|
.map(|k| k.to_base58_string())
|
|
.unwrap_or_default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<LegacyHostKeysV2> for LegacyHostKeysV1 {
|
|
fn from(value: LegacyHostKeysV2) -> Self {
|
|
LegacyHostKeysV1 {
|
|
ed25519: value.ed25519_identity,
|
|
x25519: value.x25519_sphinx,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Default, Debug, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct HostSystem {
|
|
/// Name of the operating system of the host machine.
|
|
pub system_name: Option<String>,
|
|
|
|
/// Version of the kernel of the host machine, if applicable.
|
|
pub kernel_version: Option<String>,
|
|
|
|
/// Version of the operating system of the host machine, if applicable.
|
|
pub os_version: Option<String>,
|
|
|
|
/// The CPU architecture of the host machine (eg. x86, amd64, aarch64, ...).
|
|
pub cpu_arch: Option<String>,
|
|
|
|
/// Hardware information of the host machine.
|
|
pub hardware: Option<Hardware>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct Hardware {
|
|
/// The information of the host CPU.
|
|
pub cpu: Vec<Cpu>,
|
|
|
|
/// Total memory, in bytes, available on the host.
|
|
pub total_memory: u64,
|
|
|
|
/// Detailed information about availability of crypto-specific instructions for future optimisations.
|
|
pub crypto: Option<CryptoHardware>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct Cpu {
|
|
pub name: String,
|
|
|
|
/// The CPU frequency in MHz.
|
|
pub frequency: u64,
|
|
|
|
pub vendor_id: String,
|
|
|
|
pub brand: String,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct CryptoHardware {
|
|
/// Flag to indicate whether the host machine supports AES-NI x86 extension instruction set
|
|
pub aesni: bool,
|
|
|
|
/// Flag to indicate whether the host machine supports AVX2 x86 extension instruction set
|
|
pub avx2: bool,
|
|
|
|
/// Number of SMT logical processors available.
|
|
pub smt_logical_processor_count: Vec<u32>,
|
|
|
|
/// Flag to indicate whether the host machine supports OSXSAVE instruction
|
|
pub osxsave: bool,
|
|
|
|
/// Flag to indicate whether the host machine supports Intel Software Guard Extensions (SGX) set of instruction codes
|
|
pub sgx: bool,
|
|
|
|
/// Flag to indicate whether the host machine supports XSAVE instruction
|
|
pub xsave: bool,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct NodeDescription {
|
|
/// moniker defines a human-readable name for the node.
|
|
pub moniker: String,
|
|
|
|
/// website defines an optional website link.
|
|
pub website: String,
|
|
|
|
/// security contact defines an optional email for security contact.
|
|
pub security_contact: String,
|
|
|
|
/// details define other optional details.
|
|
pub details: String,
|
|
}
|
|
|
|
/// Auxiliary details of the associated Nym Node.
|
|
#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize, JsonSchema)]
|
|
#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
|
|
pub struct AuxiliaryDetails {
|
|
/// Optional ISO 3166 alpha-2 two-letter country code of the node's **physical** location
|
|
#[cfg_attr(feature = "openapi", schema(example = "PL", value_type = Option<String>))]
|
|
#[schemars(with = "Option<String>")]
|
|
#[schemars(length(equal = 2))]
|
|
pub location: Option<Country>,
|
|
|
|
#[serde(default)]
|
|
pub announce_ports: AnnouncePorts,
|
|
|
|
/// Specifies whether this node operator has agreed to the terms and conditions
|
|
/// as defined at <https://nymtech.net/terms-and-conditions/operators/v1.0.0>
|
|
// make sure to include the default deserialisation as this field hasn't existed when the struct was first created
|
|
#[serde(default)]
|
|
pub accepted_operator_terms_and_conditions: bool,
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn legacy_host_information_deserialisation() {
|
|
let legacy_raw = r#"
|
|
{
|
|
"data": {
|
|
"ip_address": [
|
|
"194.182.184.55"
|
|
],
|
|
"hostname": null,
|
|
"keys": {
|
|
"ed25519_identity": "2RMWm7PoadaoWpk3KhT2tcFFfA4oKUyC44KwmVvjxNDS",
|
|
"x25519_sphinx": "Awn4R2AHX91tYeiMJMxW3mFfoePuHWzZYUFdDQnydZCD",
|
|
"x25519_noise": null
|
|
}
|
|
},
|
|
"signature": "5JcXh766JANhz3bu2hMBS8onTLihQn6vnGgduJg1qd8JAcPGPbXBwBTKmmQPYCVGeZYFHW4CMGhfHVBu2A1rE5f7"
|
|
}
|
|
"#;
|
|
|
|
let res = serde_json::from_str::<SignedHostInformation>(legacy_raw);
|
|
assert!(res.is_ok());
|
|
}
|
|
}
|