diff --git a/cowserve/Cargo.lock b/cowserve/Cargo.lock index b9da70f..4d31502 100644 --- a/cowserve/Cargo.lock +++ b/cowserve/Cargo.lock @@ -241,6 +241,16 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.4" @@ -433,6 +443,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.0" @@ -893,6 +918,24 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "nom" version = "7.1.3" @@ -976,6 +1019,50 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +[[package]] +name = "openssl" +version = "0.10.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -1298,12 +1385,44 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "serde" version = "1.0.185" @@ -1441,8 +1560,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +source = "git+https://github.com/launchbadge/sqlx?rev=487b89a4b6c67aacd7c15b0814a450801333153c#487b89a4b6c67aacd7c15b0814a450801333153c" dependencies = [ "sqlx-core", "sqlx-macros", @@ -1454,8 +1572,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +source = "git+https://github.com/launchbadge/sqlx?rev=487b89a4b6c67aacd7c15b0814a450801333153c#487b89a4b6c67aacd7c15b0814a450801333153c" dependencies = [ "ahash", "atoi", @@ -1477,6 +1594,7 @@ dependencies = [ "indexmap 2.0.0", "log", "memchr", + "native-tls", "once_cell", "paste", "percent-encoding", @@ -1497,8 +1615,7 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +source = "git+https://github.com/launchbadge/sqlx?rev=487b89a4b6c67aacd7c15b0814a450801333153c#487b89a4b6c67aacd7c15b0814a450801333153c" dependencies = [ "proc-macro2", "quote", @@ -1510,8 +1627,7 @@ dependencies = [ [[package]] name = "sqlx-macros-core" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +source = "git+https://github.com/launchbadge/sqlx?rev=487b89a4b6c67aacd7c15b0814a450801333153c#487b89a4b6c67aacd7c15b0814a450801333153c" dependencies = [ "dotenvy", "either", @@ -1536,8 +1652,7 @@ dependencies = [ [[package]] name = "sqlx-mysql" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +source = "git+https://github.com/launchbadge/sqlx?rev=487b89a4b6c67aacd7c15b0814a450801333153c#487b89a4b6c67aacd7c15b0814a450801333153c" dependencies = [ "atoi", "base64", @@ -1581,8 +1696,7 @@ dependencies = [ [[package]] name = "sqlx-postgres" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +source = "git+https://github.com/launchbadge/sqlx?rev=487b89a4b6c67aacd7c15b0814a450801333153c#487b89a4b6c67aacd7c15b0814a450801333153c" dependencies = [ "atoi", "base64", @@ -1623,8 +1737,7 @@ dependencies = [ [[package]] name = "sqlx-sqlite" version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +source = "git+https://github.com/launchbadge/sqlx?rev=487b89a4b6c67aacd7c15b0814a450801333153c#487b89a4b6c67aacd7c15b0814a450801333153c" dependencies = [ "atoi", "chrono", diff --git a/cowserve/Cargo.toml b/cowserve/Cargo.toml index 9444b9a..fb21e03 100644 --- a/cowserve/Cargo.toml +++ b/cowserve/Cargo.toml @@ -14,7 +14,10 @@ tonic = "0.9.2" [dependencies.sqlx] version = "0.7.1" -features = ["chrono", "uuid", "postgres", "runtime-tokio", "time"] +features = ["chrono", "uuid", "postgres", "runtime-tokio", "time", "tls-native-tls"] +# see https://github.com/launchbadge/sqlx/pull/2670 +git = "https://github.com/launchbadge/sqlx" +rev = "487b89a4b6c67aacd7c15b0814a450801333153c" [dependencies.tokio] version = "1.29.1"