mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-04 20:37:43 +00:00
c5df1f92c2
* improve code for notify * improve code for logger and fix typo (#272) * Add GNU to build.yml (#275) * fix unzip error * fix url change error fix url change error * Simplify user experience and integrate console and endpoint Simplify user experience and integrate console and endpoint * Add gnu to build.yml * upgrade version * feat: add `cargo clippy --fix --allow-dirty` to pre-commit command (#282) Resolves #277 - Add --fix flag to automatically fix clippy warnings - Add --allow-dirty flag to run on dirty Git trees - Improves code quality in pre-commit workflow * fix: the issue where preview fails when the path length exceeds 255 characters (#280) * fix * fix: improve Windows build support and CI/CD workflow (#283) - Fix Windows zip command issue by using PowerShell Compress-Archive - Add Windows support for OSS upload with ossutil - Replace Chinese comments with English in build.yml - Fix bash syntax error in package_zip function - Improve code formatting and consistency - Update various configuration files for better cross-platform support Resolves Windows build failures in GitHub Actions. * fix: update link in README.md leading to a 404 error (#285) * add rustfs.spec for rustfs (#103) add support on loongarch64 * improve cargo.lock * build(deps): bump the dependencies group with 5 updates (#289) Bumps the dependencies group with 5 updates: | Package | From | To | | --- | --- | --- | | [hyper-util](https://github.com/hyperium/hyper-util) | `0.1.15` | `0.1.16` | | [rand](https://github.com/rust-random/rand) | `0.9.1` | `0.9.2` | | [serde_json](https://github.com/serde-rs/json) | `1.0.140` | `1.0.141` | | [strum](https://github.com/Peternator7/strum) | `0.27.1` | `0.27.2` | | [sysinfo](https://github.com/GuillaumeGomez/sysinfo) | `0.36.0` | `0.36.1` | Updates `hyper-util` from 0.1.15 to 0.1.16 - [Release notes](https://github.com/hyperium/hyper-util/releases) - [Changelog](https://github.com/hyperium/hyper-util/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/hyper-util/compare/v0.1.15...v0.1.16) Updates `rand` from 0.9.1 to 0.9.2 - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/rand/compare/rand_core-0.9.1...rand_core-0.9.2) Updates `serde_json` from 1.0.140 to 1.0.141 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.140...v1.0.141) Updates `strum` from 0.27.1 to 0.27.2 - [Release notes](https://github.com/Peternator7/strum/releases) - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/compare/v0.27.1...v0.27.2) Updates `sysinfo` from 0.36.0 to 0.36.1 - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.36.0...v0.36.1) --- updated-dependencies: - dependency-name: hyper-util dependency-version: 0.1.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: rand dependency-version: 0.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: serde_json dependency-version: 1.0.141 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: strum dependency-version: 0.27.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: sysinfo dependency-version: 0.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * improve code for logger * improve * upgrade * refactor: 优化构建工作流,统一 latest 文件处理和简化制品上传 (#293) * Refactor: DatabaseManagerSystem as global Signed-off-by: junxiang Mu <1948535941@qq.com> * fix: fmt Signed-off-by: junxiang Mu <1948535941@qq.com> * Test: add e2e_test for s3select Signed-off-by: junxiang Mu <1948535941@qq.com> * Test: add test script for e2e Signed-off-by: junxiang Mu <1948535941@qq.com> * improve code for registry and intergation * improve code for registry `create_targets_from_config` * fix * Feature up/ilm (#305) * fix * fix * fix * fix delete-marker expiration. add api_restore. * fix * time retry object upload * lock file * make fmt * fix * restore object * fix * fix * serde-rs-xml -> quick-xml * fix * checksum * fix * fix * fix * fix * fix * fix * fix * transfer lang to english * upgrade clap version from 4.5.41 to 4.5.42 * refactor: replace `lazy_static` with `LazyLock` * add router * fix: modify comment * improve code * fix typos * fix * fix: modify name and fmt * improve code for registry * fix test --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: junxiang Mu <1948535941@qq.com> Co-authored-by: loverustfs <155562731+loverustfs@users.noreply.github.com> Co-authored-by: 安正超 <anzhengchao@gmail.com> Co-authored-by: shiro.lee <69624924+shiroleeee@users.noreply.github.com> Co-authored-by: Marco Orlandin <mipnamic@mipnamic.net> Co-authored-by: zhangwenlong <zhangwenlong@loongson.cn> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: junxiang Mu <1948535941@qq.com> Co-authored-by: likewu <likewu@126.com>
220 lines
9.0 KiB
Rust
220 lines
9.0 KiB
Rust
// Copyright 2024 RustFS Team
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use crate::{
|
|
error::TargetError,
|
|
target::{Target, mqtt::MQTTArgs, webhook::WebhookArgs},
|
|
};
|
|
use async_trait::async_trait;
|
|
use rumqttc::QoS;
|
|
use rustfs_config::notify::{
|
|
DEFAULT_DIR, DEFAULT_LIMIT, ENV_NOTIFY_MQTT_KEYS, ENV_NOTIFY_WEBHOOK_KEYS, MQTT_BROKER, MQTT_KEEP_ALIVE_INTERVAL,
|
|
MQTT_PASSWORD, MQTT_QOS, MQTT_QUEUE_DIR, MQTT_QUEUE_LIMIT, MQTT_RECONNECT_INTERVAL, MQTT_TOPIC, MQTT_USERNAME,
|
|
NOTIFY_MQTT_KEYS, NOTIFY_WEBHOOK_KEYS, WEBHOOK_AUTH_TOKEN, WEBHOOK_CLIENT_CERT, WEBHOOK_CLIENT_KEY, WEBHOOK_ENDPOINT,
|
|
WEBHOOK_QUEUE_DIR, WEBHOOK_QUEUE_LIMIT,
|
|
};
|
|
use rustfs_ecstore::config::KVS;
|
|
use std::collections::HashSet;
|
|
use std::time::Duration;
|
|
use tracing::{debug, warn};
|
|
use url::Url;
|
|
|
|
/// Trait for creating targets from configuration
|
|
#[async_trait]
|
|
pub trait TargetFactory: Send + Sync {
|
|
/// Creates a target from configuration
|
|
async fn create_target(&self, id: String, config: &KVS) -> Result<Box<dyn Target + Send + Sync>, TargetError>;
|
|
|
|
/// Validates target configuration
|
|
fn validate_config(&self, id: &str, config: &KVS) -> Result<(), TargetError>;
|
|
|
|
/// Returns a set of valid configuration field names for this target type.
|
|
/// This is used to filter environment variables.
|
|
fn get_valid_fields(&self) -> HashSet<String>;
|
|
|
|
/// Returns a set of valid configuration env field names for this target type.
|
|
/// This is used to filter environment variables.
|
|
fn get_valid_env_fields(&self) -> HashSet<String>;
|
|
}
|
|
|
|
/// Factory for creating Webhook targets
|
|
pub struct WebhookTargetFactory;
|
|
|
|
#[async_trait]
|
|
impl TargetFactory for WebhookTargetFactory {
|
|
async fn create_target(&self, id: String, config: &KVS) -> Result<Box<dyn Target + Send + Sync>, TargetError> {
|
|
// All config values are now read directly from the merged `config` KVS.
|
|
let endpoint = config
|
|
.lookup(WEBHOOK_ENDPOINT)
|
|
.ok_or_else(|| TargetError::Configuration("Missing webhook endpoint".to_string()))?;
|
|
let endpoint_url = Url::parse(&endpoint)
|
|
.map_err(|e| TargetError::Configuration(format!("Invalid endpoint URL: {e} (value: '{endpoint}')")))?;
|
|
|
|
let args = WebhookArgs {
|
|
enable: true, // If we are here, it's already enabled.
|
|
endpoint: endpoint_url,
|
|
auth_token: config.lookup(WEBHOOK_AUTH_TOKEN).unwrap_or_default(),
|
|
queue_dir: config.lookup(WEBHOOK_QUEUE_DIR).unwrap_or(DEFAULT_DIR.to_string()),
|
|
queue_limit: config
|
|
.lookup(WEBHOOK_QUEUE_LIMIT)
|
|
.and_then(|v| v.parse::<u64>().ok())
|
|
.unwrap_or(DEFAULT_LIMIT),
|
|
client_cert: config.lookup(WEBHOOK_CLIENT_CERT).unwrap_or_default(),
|
|
client_key: config.lookup(WEBHOOK_CLIENT_KEY).unwrap_or_default(),
|
|
};
|
|
|
|
let target = crate::target::webhook::WebhookTarget::new(id, args)?;
|
|
Ok(Box::new(target))
|
|
}
|
|
|
|
fn validate_config(&self, _id: &str, config: &KVS) -> Result<(), TargetError> {
|
|
// Validation also uses the merged `config` KVS directly.
|
|
let endpoint = config
|
|
.lookup(WEBHOOK_ENDPOINT)
|
|
.ok_or_else(|| TargetError::Configuration("Missing webhook endpoint".to_string()))?;
|
|
debug!("endpoint: {}", endpoint);
|
|
let parsed_endpoint = endpoint.trim();
|
|
Url::parse(parsed_endpoint)
|
|
.map_err(|e| TargetError::Configuration(format!("Invalid endpoint URL: {e} (value: '{parsed_endpoint}')")))?;
|
|
|
|
let client_cert = config.lookup(WEBHOOK_CLIENT_CERT).unwrap_or_default();
|
|
let client_key = config.lookup(WEBHOOK_CLIENT_KEY).unwrap_or_default();
|
|
|
|
if client_cert.is_empty() != client_key.is_empty() {
|
|
return Err(TargetError::Configuration(
|
|
"Both client_cert and client_key must be specified together".to_string(),
|
|
));
|
|
}
|
|
|
|
let queue_dir = config.lookup(WEBHOOK_QUEUE_DIR).unwrap_or(DEFAULT_DIR.to_string());
|
|
if !queue_dir.is_empty() && !std::path::Path::new(&queue_dir).is_absolute() {
|
|
return Err(TargetError::Configuration("Webhook queue directory must be an absolute path".to_string()));
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn get_valid_fields(&self) -> HashSet<String> {
|
|
NOTIFY_WEBHOOK_KEYS.iter().map(|s| s.to_string()).collect()
|
|
}
|
|
|
|
fn get_valid_env_fields(&self) -> HashSet<String> {
|
|
ENV_NOTIFY_WEBHOOK_KEYS.iter().map(|s| s.to_string()).collect()
|
|
}
|
|
}
|
|
|
|
/// Factory for creating MQTT targets
|
|
pub struct MQTTTargetFactory;
|
|
|
|
#[async_trait]
|
|
impl TargetFactory for MQTTTargetFactory {
|
|
async fn create_target(&self, id: String, config: &KVS) -> Result<Box<dyn Target + Send + Sync>, TargetError> {
|
|
let broker = config
|
|
.lookup(MQTT_BROKER)
|
|
.ok_or_else(|| TargetError::Configuration("Missing MQTT broker".to_string()))?;
|
|
let broker_url = Url::parse(&broker)
|
|
.map_err(|e| TargetError::Configuration(format!("Invalid broker URL: {e} (value: '{broker}')")))?;
|
|
|
|
let topic = config
|
|
.lookup(MQTT_TOPIC)
|
|
.ok_or_else(|| TargetError::Configuration("Missing MQTT topic".to_string()))?;
|
|
|
|
let args = MQTTArgs {
|
|
enable: true, // Assumed enabled.
|
|
broker: broker_url,
|
|
topic,
|
|
qos: config
|
|
.lookup(MQTT_QOS)
|
|
.and_then(|v| v.parse::<u8>().ok())
|
|
.map(|q| match q {
|
|
0 => QoS::AtMostOnce,
|
|
1 => QoS::AtLeastOnce,
|
|
2 => QoS::ExactlyOnce,
|
|
_ => QoS::AtLeastOnce,
|
|
})
|
|
.unwrap_or(QoS::AtLeastOnce),
|
|
username: config.lookup(MQTT_USERNAME).unwrap_or_default(),
|
|
password: config.lookup(MQTT_PASSWORD).unwrap_or_default(),
|
|
max_reconnect_interval: config
|
|
.lookup(MQTT_RECONNECT_INTERVAL)
|
|
.and_then(|v| v.parse::<u64>().ok())
|
|
.map(Duration::from_secs)
|
|
.unwrap_or_else(|| Duration::from_secs(5)),
|
|
keep_alive: config
|
|
.lookup(MQTT_KEEP_ALIVE_INTERVAL)
|
|
.and_then(|v| v.parse::<u64>().ok())
|
|
.map(Duration::from_secs)
|
|
.unwrap_or_else(|| Duration::from_secs(30)),
|
|
queue_dir: config.lookup(MQTT_QUEUE_DIR).unwrap_or(DEFAULT_DIR.to_string()),
|
|
queue_limit: config
|
|
.lookup(MQTT_QUEUE_LIMIT)
|
|
.and_then(|v| v.parse::<u64>().ok())
|
|
.unwrap_or(DEFAULT_LIMIT),
|
|
};
|
|
|
|
let target = crate::target::mqtt::MQTTTarget::new(id, args)?;
|
|
Ok(Box::new(target))
|
|
}
|
|
|
|
fn validate_config(&self, _id: &str, config: &KVS) -> Result<(), TargetError> {
|
|
let broker = config
|
|
.lookup(MQTT_BROKER)
|
|
.ok_or_else(|| TargetError::Configuration("Missing MQTT broker".to_string()))?;
|
|
let url = Url::parse(&broker)
|
|
.map_err(|e| TargetError::Configuration(format!("Invalid broker URL: {e} (value: '{broker}')")))?;
|
|
|
|
match url.scheme() {
|
|
"tcp" | "ssl" | "ws" | "wss" | "mqtt" | "mqtts" => {}
|
|
_ => {
|
|
return Err(TargetError::Configuration("Unsupported broker URL scheme".to_string()));
|
|
}
|
|
}
|
|
|
|
if config.lookup(MQTT_TOPIC).is_none() {
|
|
return Err(TargetError::Configuration("Missing MQTT topic".to_string()));
|
|
}
|
|
|
|
if let Some(qos_str) = config.lookup(MQTT_QOS) {
|
|
let qos = qos_str
|
|
.parse::<u8>()
|
|
.map_err(|_| TargetError::Configuration("Invalid QoS value".to_string()))?;
|
|
if qos > 2 {
|
|
return Err(TargetError::Configuration("QoS must be 0, 1, or 2".to_string()));
|
|
}
|
|
}
|
|
|
|
let queue_dir = config.lookup(MQTT_QUEUE_DIR).unwrap_or_default();
|
|
if !queue_dir.is_empty() {
|
|
if !std::path::Path::new(&queue_dir).is_absolute() {
|
|
return Err(TargetError::Configuration("MQTT queue directory must be an absolute path".to_string()));
|
|
}
|
|
if let Some(qos_str) = config.lookup(MQTT_QOS) {
|
|
if qos_str == "0" {
|
|
warn!("Using queue_dir with QoS 0 may result in event loss");
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn get_valid_fields(&self) -> HashSet<String> {
|
|
NOTIFY_MQTT_KEYS.iter().map(|s| s.to_string()).collect()
|
|
}
|
|
|
|
fn get_valid_env_fields(&self) -> HashSet<String> {
|
|
ENV_NOTIFY_MQTT_KEYS.iter().map(|s| s.to_string()).collect()
|
|
}
|
|
}
|