gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-31 01:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: stabilize head metadata responses and heal tests (#1732)

Browse Source 
Signed-off-by: LoganZ2 <103290230+LoganZ2@users.noreply.github.com>
Co-authored-by: houseme <housemecn@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
LoganZ2
2026-02-10 09:44:14 +08:00
committed by GitHub
parent 682b5bbb2f
commit ccf3b29df5
7 changed files with 142 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/trusted-proxies/tests/unit/config_tests.rs
+22 -5
View File
@@ -12,16 +12,32 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use rustfs_config::{DEFAULT_TRUSTED_PROXY_PROXIES, ENV_TRUSTED_PROXY_PROXIES};
use rustfs_config::{
DEFAULT_TRUSTED_PROXY_PROXIES, ENV_TRUSTED_PROXY_ENABLE_RFC7239, ENV_TRUSTED_PROXY_MAX_HOPS, ENV_TRUSTED_PROXY_PROXIES,
ENV_TRUSTED_PROXY_VALIDATION_MODE,
};
use rustfs_trusted_proxies::{ConfigLoader, TrustedProxy, TrustedProxyConfig, ValidationMode};
use std::net::IpAddr;
use std::sync::Mutex;
static ENV_MUTEX: Mutex<()> = Mutex::new(());
#[test]
#[allow(unsafe_code)]
fn test_config_loader_default() {
let _guard = ENV_MUTEX.lock().unwrap();
unsafe {
std::env::remove_var(ENV_TRUSTED_PROXY_PROXIES);
}
unsafe {
std::env::remove_var(ENV_TRUSTED_PROXY_VALIDATION_MODE);
}
unsafe {
std::env::remove_var(ENV_TRUSTED_PROXY_MAX_HOPS);
}
unsafe {
std::env::remove_var(ENV_TRUSTED_PROXY_ENABLE_RFC7239);
}
let config = ConfigLoader::from_env_or_default();
assert_eq!(config.server_addr.port(), 9000);
assert!(!config.proxy.proxies.is_empty());
@@ -33,14 +49,15 @@ fn test_config_loader_default() {
#[test]
#[allow(unsafe_code)]
fn test_config_loader_env_vars() {
let _guard = ENV_MUTEX.lock().unwrap();
unsafe {
std::env::set_var(ENV_TRUSTED_PROXY_PROXIES, "192.168.1.0/24,10.0.0.0/8");
}
unsafe {
std::env::set_var("RUSTFS_TRUSTED_PROXY_VALIDATION_MODE", "strict");
std::env::set_var(ENV_TRUSTED_PROXY_VALIDATION_MODE, "strict");
}
unsafe {
std::env::set_var("RUSTFS_TRUSTED_PROXY_MAX_HOPS", "5");
std::env::set_var(ENV_TRUSTED_PROXY_MAX_HOPS, "5");
}
let config = ConfigLoader::from_env();
@@ -54,10 +71,10 @@ fn test_config_loader_env_vars() {
std::env::remove_var(ENV_TRUSTED_PROXY_PROXIES);
}
unsafe {
std::env::remove_var("RUSTFS_TRUSTED_PROXY_VALIDATION_MODE");
std::env::remove_var(ENV_TRUSTED_PROXY_VALIDATION_MODE);
}
unsafe {
std::env::remove_var("RUSTFS_TRUSTED_PROXY_MAX_HOPS");
std::env::remove_var(ENV_TRUSTED_PROXY_MAX_HOPS);
}
unsafe {
std::env::remove_var("SERVER_PORT");