robin/nextcloud-config-parser
1
0
Fork 0
mirror of https://codeberg.org/icewind/nextcloud-config-parser.git synced 2026-06-03 08:34:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix tls redis parsing

Browse source
This commit is contained in:
Robin Appelman 2025-05-02 09:21:16 +02:00
commit 83ba84fa2d
7 changed files with 137 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

50
tests/configs.rs
View file

@ -1,6 +1,6 @@
use nextcloud_config_parser::{
parse, parse_glob, Config, Database, DbConnect, RedisConfig, RedisConnectionAddr,
RedisConnectionInfo, RedisTlsParams, SslOptions,
parse, parse_glob, Config, Database, DbConnect, RedisClusterConnectionInfo, RedisConfig,
RedisConnectionAddr, RedisConnectionInfo, RedisTlsParams, SslOptions,
};
use std::fmt::Debug;
@ -24,9 +24,16 @@ fn config_from_file(path: &str) -> Config {
fn parse_redis(cfg: &str) -> RedisConnectionInfo {
let redis = ConnectionInfo::from_str(cfg).unwrap();
let addr = match redis.addr {
ConnectionAddr::Tcp(host, port) | ConnectionAddr::TcpTls { host, port, .. } => {
RedisConnectionAddr::Tcp { host, port }
}
ConnectionAddr::Tcp(host, port) => RedisConnectionAddr::Tcp {
host,
port,
tls: false,
},
ConnectionAddr::TcpTls { host, port, .. } => RedisConnectionAddr::Tcp {
host,
port,
tls: true,
},
ConnectionAddr::Unix(path) => RedisConnectionAddr::Unix { path },
};
RedisConnectionInfo {
@ -109,6 +116,7 @@ fn test_parse_redis_tls() {
addr: RedisConnectionAddr::Tcp {
host: "127.0.0.1".into(),
port: 6379,
tls: true,
},
db: 0,
username: None,
@ -125,6 +133,38 @@ fn test_parse_redis_tls() {
);
}
#[test]
fn test_parse_redis_cluster_tls() {
let config = config_from_file("tests/configs/redis_cluster_tls.php");
assert_debug_equal(
RedisConfig::Cluster(RedisClusterConnectionInfo {
addr: vec![
RedisConnectionAddr::Tcp {
host: "db1".into(),
port: 6380,
tls: true,
},
RedisConnectionAddr::Tcp {
host: "db1".into(),
port: 6381,
tls: true,
},
],
db: 0,
username: None,
password: Some("xxx".into()),
tls_params: Some(RedisTlsParams {
local_cert: Some("/certs/redis.crt".into()),
local_pk: Some("/certs/redis.key".into()),
ca_file: Some("/certs/ca.crt".into()),
insecure: false,
accept_invalid_hostname: false,
}),
}),
config.redis,
);
}
#[test]
fn test_parse_comment_whitespace() {
let config = config_from_file("tests/configs/comment_whitespace.php");