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

improve handling of mysql ssl options

Browse source
This commit is contained in:
Robin Appelman 2021-08-03 17:23:44 +02:00
commit 4b8c9530fb
6 changed files with 226 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/lib.rs
View file

@ -127,6 +127,18 @@ pub enum NotAConfigError {
NotAnArray(PathBuf),
}
#[derive(Debug)]
pub enum SslOptions {
Enabled {
key: String,
cert: String,
ca: String,
verify: bool,
},
Disabled,
Default,
}
#[derive(Debug)]
pub enum Database {
Sqlite {
@ -137,14 +149,14 @@ pub enum Database {
username: String,
password: String,
connect: DbConnect,
disable_ssl: bool,
ssl_options: SslOptions,
},
Postgres {
database: String,
username: String,
password: String,
connect: DbConnect,
disable_ssl: bool,
ssl_options: SslOptions,
},
}
@ -172,14 +184,25 @@ impl From<Database> for sqlx::any::AnyConnectOptions {
username,
password,
connect,
disable_ssl,
ssl_options,
} => {
let mut options = MySqlConnectOptions::default()
.database(&database)
.username(&username)
.password(&password);
if disable_ssl {
options = options.ssl_mode(MySqlSslMode::Disabled);
match ssl_options {
SslOptions::Enabled { ca, verify, .. } => {
options = options.ssl_ca(ca);
options = options.ssl_mode(if verify {
MySqlSslMode::VerifyIdentity
} else {
MySqlSslMode::VerifyCa
});
}
SslOptions::Disabled => {
options = options.ssl_mode(MySqlSslMode::Disabled);
}
SslOptions::Default => {}
}
match connect {
DbConnect::Socket(socket) => {
@ -196,13 +219,13 @@ impl From<Database> for sqlx::any::AnyConnectOptions {
username,
password,
connect,
disable_ssl,
ssl_options,
} => {
let mut options = PgConnectOptions::default()
.database(&database)
.username(&username)
.password(&password);
if disable_ssl {
if matches!(ssl_options, SslOptions::Disabled) {
options = options.ssl_mode(PgSslMode::Disable);
}
match connect {