mirror of
https://github.com/getnora-io/nora.git
synced 2026-04-12 22:00:31 +00:00
* fix: proxy dedup, multi-registry GC, TOCTOU and credential hygiene - Deduplicate proxy_fetch/proxy_fetch_text into generic proxy_fetch_core with response extractor closure (removes ~50 lines of copy-paste) - GC now scans all registry prefixes, not just docker/ - Add tracing::warn to fire-and-forget cache writes in docker proxy - Mark S3 credentials as skip_serializing to prevent accidental leaks - Remove TOCTOU race in LocalStorage get/delete (redundant exists check) * chore: clean up root directory structure - Move Dockerfile.astra and Dockerfile.redos to deploy/ (niche builds should not clutter the project root) - Harden .gitignore to exclude session files, working notes, and internal review scripts * refactor(metrics): replace 13 atomic fields with CounterMap Per-registry download/upload counters were 13 individual AtomicU64 fields, each duplicated across new(), with_persistence(), save(), record_download(), record_upload(), and get_registry_* (6 touch points per counter). Adding a new registry required changes in 6+ places. Now uses CounterMap (HashMap<String, AtomicU64>) for per-registry counters. Adding a new registry = one entry in REGISTRIES const. Added Go registry to REGISTRIES, gaining go metrics for free. * quality: add MSRV, tarpaulin config, proptest for parsers - Set rust-version = 1.75 in workspace Cargo.toml (MSRV policy) - Add tarpaulin.toml: llvm engine, fail-under=25, json+html output - Add coverage/ to .gitignore - Update CI to use tarpaulin.toml instead of inline flags - Add proptest dev-dependency and property tests: - validation.rs: 16 tests (never-panics + invariants for all 4 validators) - pypi.rs: 5 tests (extract_filename never-panics + format assertions) * test: add unit tests for 14 modules, coverage 21% → 30% Add 149 new tests across auth, backup, gc, metrics, mirror parsers, docker (manifest detection, session cleanup, metadata serde), docker_auth (token cache), maven, npm, pypi (normalize, rewrite, extract), raw (content-type guessing), request_id, and s3 (URI encoding). Update tarpaulin.toml: raise fail-under to 30, exclude UI/main from coverage reporting as they require integration tests. * bench: add criterion benchmarks for validation and manifest parsing Add parsing benchmark suite with 14 benchmarks covering: - Storage key, Docker name, digest, and reference validation - Docker manifest media type detection (v2, OCI index, minimal, invalid) Run with: cargo bench --package nora-registry --bench parsing * test: add 48 integration tests via tower oneshot Add integration tests for all HTTP handlers: - health (3), raw (7), cargo (4), maven (4), request_id (2) - pypi (5), npm (5), docker (12), auth (6) Create test_helpers.rs with TestContext pattern. Add tower and http-body-util dev-dependencies. Update tarpaulin fail-under 30 to 40. Coverage: 29.5% to 43.3% (2089/4825 lines) * fix: clean clippy warnings in tests, fix flaky audit test Add #[allow(clippy::unwrap_used)] to 18 test modules. Fix 3 additional clippy lints: writeln_empty_string, needless_update, unnecessary_get_then_check. Fix flaky audit test: replace single sleep(50ms) with retry loop (max 1s). Prefix unused token variable with underscore. cargo clippy --all-targets = 0 warnings (was 245 errors)
172 lines
4.5 KiB
Rust
172 lines
4.5 KiB
Rust
// Copyright (c) 2026 Volkov Pavel | DevITWay
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
//! Secrets management for NORA
|
|
//!
|
|
//! Provides a trait-based architecture for secrets providers:
|
|
//! - `env` - Environment variables (default, 12-Factor App)
|
|
//! - `aws-secrets` - AWS Secrets Manager (v0.4.0+)
|
|
//! - `vault` - HashiCorp Vault (v0.5.0+)
|
|
//! - `k8s` - Kubernetes Secrets (v0.4.0+)
|
|
//!
|
|
//! # Example
|
|
//!
|
|
//! ```rust,ignore
|
|
//! use nora::secrets::{create_secrets_provider, SecretsConfig};
|
|
//!
|
|
//! let config = SecretsConfig::default(); // Uses ENV provider
|
|
//! let provider = create_secrets_provider(&config)?;
|
|
//!
|
|
//! let api_key = provider.get_secret("API_KEY").await?;
|
|
//! println!("Got secret (redacted): {:?}", api_key);
|
|
//! ```
|
|
|
|
mod env;
|
|
pub mod protected;
|
|
|
|
pub use env::EnvProvider;
|
|
#[allow(unused_imports)]
|
|
pub use protected::{ProtectedString, S3Credentials};
|
|
|
|
use async_trait::async_trait;
|
|
use serde::{Deserialize, Serialize};
|
|
use thiserror::Error;
|
|
|
|
#[allow(dead_code)] // Variants used by provider impls; external error handling planned for v0.4
|
|
/// Secrets provider error
|
|
#[derive(Debug, Error)]
|
|
pub enum SecretsError {
|
|
#[error("Secret not found: {0}")]
|
|
NotFound(String),
|
|
|
|
#[error("Provider error: {0}")]
|
|
Provider(String),
|
|
|
|
#[error("Configuration error: {0}")]
|
|
Config(String),
|
|
|
|
#[error("Unsupported provider: {0}")]
|
|
UnsupportedProvider(String),
|
|
}
|
|
|
|
/// Secrets provider trait
|
|
///
|
|
/// Implement this trait to add new secrets backends.
|
|
#[async_trait]
|
|
pub trait SecretsProvider: Send + Sync {
|
|
/// Get a secret by key (required)
|
|
#[allow(dead_code)]
|
|
async fn get_secret(&self, key: &str) -> Result<ProtectedString, SecretsError>;
|
|
|
|
/// Get a secret by key (optional, returns None if not found)
|
|
#[allow(dead_code)]
|
|
async fn get_secret_optional(&self, key: &str) -> Option<ProtectedString> {
|
|
self.get_secret(key).await.ok()
|
|
}
|
|
|
|
/// Get provider name for logging
|
|
fn provider_name(&self) -> &'static str;
|
|
}
|
|
|
|
/// Secrets configuration
|
|
///
|
|
/// # Example config.toml
|
|
///
|
|
/// ```toml
|
|
/// [secrets]
|
|
/// provider = "env"
|
|
/// clear_env = false
|
|
/// ```
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct SecretsConfig {
|
|
/// Provider type: "env", "aws-secrets", "vault", "k8s"
|
|
#[serde(default = "default_provider")]
|
|
pub provider: String,
|
|
|
|
/// Clear environment variables after reading (for env provider)
|
|
#[serde(default)]
|
|
pub clear_env: bool,
|
|
}
|
|
|
|
fn default_provider() -> String {
|
|
"env".to_string()
|
|
}
|
|
|
|
impl Default for SecretsConfig {
|
|
fn default() -> Self {
|
|
Self {
|
|
provider: default_provider(),
|
|
clear_env: false,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Create a secrets provider based on configuration
|
|
///
|
|
/// Currently supports:
|
|
/// - `env` - Environment variables (default)
|
|
///
|
|
/// Future versions will add:
|
|
/// - `aws-secrets` - AWS Secrets Manager
|
|
/// - `vault` - HashiCorp Vault
|
|
/// - `k8s` - Kubernetes Secrets
|
|
pub fn create_secrets_provider(
|
|
config: &SecretsConfig,
|
|
) -> Result<Box<dyn SecretsProvider>, SecretsError> {
|
|
match config.provider.as_str() {
|
|
"env" => {
|
|
let mut provider = EnvProvider::new();
|
|
if config.clear_env {
|
|
provider = provider.with_clear_after_read();
|
|
}
|
|
Ok(Box::new(provider))
|
|
}
|
|
// Future providers:
|
|
// "aws-secrets" => { ... }
|
|
// "vault" => { ... }
|
|
// "k8s" => { ... }
|
|
other => Err(SecretsError::UnsupportedProvider(other.to_string())),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[allow(clippy::unwrap_used)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_default_config() {
|
|
let config = SecretsConfig::default();
|
|
assert_eq!(config.provider, "env");
|
|
assert!(!config.clear_env);
|
|
}
|
|
|
|
#[test]
|
|
fn test_create_env_provider() {
|
|
let config = SecretsConfig::default();
|
|
let provider = create_secrets_provider(&config).unwrap();
|
|
assert_eq!(provider.provider_name(), "env");
|
|
}
|
|
|
|
#[test]
|
|
fn test_create_unsupported_provider() {
|
|
let config = SecretsConfig {
|
|
provider: "unknown".to_string(),
|
|
clear_env: false,
|
|
};
|
|
let result = create_secrets_provider(&config);
|
|
assert!(matches!(result, Err(SecretsError::UnsupportedProvider(_))));
|
|
}
|
|
|
|
#[test]
|
|
fn test_config_from_toml() {
|
|
let toml = r#"
|
|
provider = "env"
|
|
clear_env = true
|
|
"#;
|
|
let config: SecretsConfig = toml::from_str(toml).unwrap();
|
|
assert_eq!(config.provider, "env");
|
|
assert!(config.clear_env);
|
|
}
|
|
}
|