mirror/mCaptcha
1
0
Fork 1
mirror of https://github.com/mCaptcha/mCaptcha.git synced 2026-02-11 10:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Encode connection URL to database

Browse Source 
- If you have a database password that contains characters like `#` or `*`, sqlx
will error about a InvalidPort, this is due to not encoding the url.
[See issue on sqlx](https://github.com/launchbadge/sqlx/issues/1624).
- Removed useless statements.
This commit is contained in:
Gusted
2022-10-16 23:37:24 +02:00
parent 97abca2520
commit 021f2fe5b4
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
db/db-sqlx-maria/Cargo.toml
View File

@@ -13,6 +13,7 @@ async-trait = "0.1.51"
db-core = {path = "../db-core"} db-core = {path = "../db-core"}
futures = "0.3.15" futures = "0.3.15"
sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "mysql", "time", "offline" ] } sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "mysql", "time", "offline" ] }
urlencoding = "2.1.2"
[dev-dependencies] [dev-dependencies]
actix-rt = "2" actix-rt = "2"

9
db/db-sqlx-maria/src/lib.rs
View File

@@ -68,14 +68,13 @@ impl Connect for ConnectionOptions {
async fn connect(self) -> DBResult<Self::Pool> { async fn connect(self) -> DBResult<Self::Pool> {
let pool = match self { let pool = match self {
Self::Fresh(fresh) => { Self::Fresh(fresh) => {
let mut connect_options = let mut connect_options = sqlx::mysql::MySqlConnectOptions::from_str(
sqlx::mysql::MySqlConnectOptions::from_str(&fresh.url).unwrap(); &urlencoding::encode(&fresh.url),
)
.unwrap();
if fresh.disable_logging { if fresh.disable_logging {
connect_options.disable_statement_logging(); connect_options.disable_statement_logging();
} }
sqlx::mysql::MySqlConnectOptions::from_str(&fresh.url)
.unwrap()
.disable_statement_logging();
fresh fresh
.pool_options .pool_options
.connect_with(connect_options) .connect_with(connect_options)

1
db/db-sqlx-postgres/Cargo.toml
View File

@@ -13,6 +13,7 @@ async-trait = "0.1.51"
db-core = {path = "../db-core"} db-core = {path = "../db-core"}
futures = "0.3.15" futures = "0.3.15"
sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "postgres", "time", "offline" ] } sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "postgres", "time", "offline" ] }
urlencoding = "2.1.2"
[dev-dependencies] [dev-dependencies]
actix-rt = "2" actix-rt = "2"

9
db/db-sqlx-postgres/src/lib.rs
View File

@@ -68,14 +68,13 @@ impl Connect for ConnectionOptions {
async fn connect(self) -> DBResult<Self::Pool> { async fn connect(self) -> DBResult<Self::Pool> {
let pool = match self { let pool = match self {
Self::Fresh(fresh) => { Self::Fresh(fresh) => {
let mut connect_options = let mut connect_options = sqlx::postgres::PgConnectOptions::from_str(
sqlx::postgres::PgConnectOptions::from_str(&fresh.url).unwrap(); &urlencoding::encode(&fresh.url),
)
.unwrap();
if fresh.disable_logging { if fresh.disable_logging {
connect_options.disable_statement_logging(); connect_options.disable_statement_logging();
} }
sqlx::postgres::PgConnectOptions::from_str(&fresh.url)
.unwrap()
.disable_statement_logging();
fresh fresh
.pool_options .pool_options
.connect_with(connect_options) .connect_with(connect_options)