make link codes unaware of upper and lower case

This commit is contained in:
Dietrich 2021-05-30 10:34:36 +02:00 committed by Franz Dietrich
parent 50da81889e
commit a5cfdeff54
5 changed files with 41 additions and 38 deletions

57
Cargo.lock generated
View File

@ -733,9 +733,9 @@ checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7"
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.6.1" version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
[[package]] [[package]]
name = "byte-tools" name = "byte-tools"
@ -800,9 +800,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.67" version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
dependencies = [ dependencies = [
"jobserver", "jobserver",
] ]
@ -1041,9 +1041,9 @@ dependencies = [
[[package]] [[package]]
name = "crossbeam-epoch" name = "crossbeam-epoch"
version = "0.9.4" version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94" checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"crossbeam-utils", "crossbeam-utils",
@ -1054,9 +1054,9 @@ dependencies = [
[[package]] [[package]]
name = "crossbeam-queue" name = "crossbeam-queue"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756" checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"crossbeam-utils", "crossbeam-utils",
@ -1064,11 +1064,10 @@ dependencies = [
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.8.4" version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
dependencies = [ dependencies = [
"autocfg 1.0.1",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"lazy_static", "lazy_static",
] ]
@ -1771,7 +1770,7 @@ dependencies = [
"http", "http",
"indexmap", "indexmap",
"slab", "slab",
"tokio 1.6.0", "tokio 1.6.1",
"tokio-util 0.6.7", "tokio-util 0.6.7",
"tracing", "tracing",
] ]
@ -1889,9 +1888,9 @@ checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
[[package]] [[package]]
name = "httpdate" name = "httpdate"
version = "1.0.0" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9" checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
[[package]] [[package]]
name = "humansize" name = "humansize"
@ -1910,9 +1909,9 @@ dependencies = [
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "0.14.7" version = "0.14.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54" checksum = "d3f71a7eea53a3f8257a7b4795373ff886397178cd634430ea94e12d7fe4fe34"
dependencies = [ dependencies = [
"bytes 1.0.1", "bytes 1.0.1",
"futures-channel", "futures-channel",
@ -1926,7 +1925,7 @@ dependencies = [
"itoa", "itoa",
"pin-project 1.0.7", "pin-project 1.0.7",
"socket2 0.4.0", "socket2 0.4.0",
"tokio 1.6.0", "tokio 1.6.1",
"tower-service", "tower-service",
"tracing", "tracing",
"want", "want",
@ -1941,7 +1940,7 @@ dependencies = [
"bytes 1.0.1", "bytes 1.0.1",
"hyper", "hyper",
"native-tls", "native-tls",
"tokio 1.6.0", "tokio 1.6.1",
"tokio-native-tls", "tokio-native-tls",
] ]
@ -2135,9 +2134,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.94" version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
[[package]] [[package]]
name = "libloading" name = "libloading"
@ -2228,9 +2227,9 @@ checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
[[package]] [[package]]
name = "memoffset" name = "memoffset"
version = "0.6.3" version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
dependencies = [ dependencies = [
"autocfg 1.0.1", "autocfg 1.0.1",
] ]
@ -3276,7 +3275,7 @@ dependencies = [
"serde", "serde",
"serde_urlencoded", "serde_urlencoded",
"time 0.2.26", "time 0.2.26",
"tokio 1.6.0", "tokio 1.6.1",
"tokio-native-tls", "tokio-native-tls",
"url", "url",
"wasm-bindgen", "wasm-bindgen",
@ -4157,9 +4156,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.6.0" version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd3076b5c8cc18138b8f8814895c11eb4de37114a5d127bafdc5e55798ceef37" checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975"
dependencies = [ dependencies = [
"autocfg 1.0.1", "autocfg 1.0.1",
"bytes 1.0.1", "bytes 1.0.1",
@ -4187,7 +4186,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
dependencies = [ dependencies = [
"native-tls", "native-tls",
"tokio 1.6.0", "tokio 1.6.1",
] ]
[[package]] [[package]]
@ -4227,7 +4226,7 @@ dependencies = [
"futures-sink", "futures-sink",
"log", "log",
"pin-project-lite 0.2.6", "pin-project-lite 0.2.6",
"tokio 1.6.0", "tokio 1.6.1",
] ]
[[package]] [[package]]
@ -4544,9 +4543,9 @@ dependencies = [
[[package]] [[package]]
name = "unicode-normalization" name = "unicode-normalization"
version = "0.1.17" version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" checksum = "33717dca7ac877f497014e10d73f3acf948c342bee31b5ca7892faf94ccc6b49"
dependencies = [ dependencies = [
"tinyvec", "tinyvec",
] ]

View File

@ -17,12 +17,12 @@ dependencies = ["build_client_release", "build_server_release"]
description = "Build client" description = "Build client"
install_crate = { crate_name = "wasm-pack", binary = "wasm-pack", test_arg = "-V" } install_crate = { crate_name = "wasm-pack", binary = "wasm-pack", test_arg = "-V" }
command = "wasm-pack" command = "wasm-pack"
args = ["build", "app", "--target", "web", "--out-name", "package", "--dev"] args = ["build", "app", "--target", "web", "--out-name", "app", "--dev"]
[tasks.build_client_release] [tasks.build_client_release]
extend = "build_client" extend = "build_client"
description = "Build client in release mode" description = "Build client in release mode"
args = ["build", "app", "--target", "web", "--out-name", "package", "--release"] args = ["build", "app", "--target", "web", "--out-name", "app", "--release"]
[tasks.build_server] [tasks.build_server]
description = "Build server" description = "Build server"

View File

@ -18,8 +18,8 @@ actix-identity = "0.3"
actix-rt = "1.1" actix-rt = "1.1"
actix-slog = "0.2" actix-slog = "0.2"
actix-web = "3" actix-web = "3"
actix-web-static-files = "3.0" actix-web-static-files = "3"
actix-files = "0.5.0" actix-files = "0.5"
anyhow = "1.0" anyhow = "1.0"
argonautica = "0.2" argonautica = "0.2"
clap = "2.33" clap = "2.33"

View File

@ -231,7 +231,11 @@ impl LinkDbOperations<Self> for Link {
code: &str, code: &str,
server_config: &ServerConfig, server_config: &ServerConfig,
) -> Result<Self, ServerError> { ) -> Result<Self, ServerError> {
let link = sqlx::query_as!(Self, "Select * from links where code = ? ", code) let link = sqlx::query_as!(
Self,
"Select * from links where code = ? COLLATE NOCASE",
code
)
.fetch_one(&server_config.db_pool) .fetch_one(&server_config.db_pool)
.await; .await;
tracing::info!("Found link: {:?}", &link); tracing::info!("Found link: {:?}", &link);

View File

@ -86,8 +86,8 @@ pub async fn wasm_app(config: web::Data<crate::ServerConfig>) -> Result<HttpResp
<body> <body>
<section id="app"><div class="lds-ellipsis">Loading: <div></div><div></div><div></div><div></div></div></section> <section id="app"><div class="lds-ellipsis">Loading: <div></div><div></div><div></div><div></div></div></section>
<script type="module"> <script type="module">
import init from '/app/pkg/package.js'; import init from '/app/pkg/app.js';
init('/app/pkg/package_bg.wasm'); init('/app/pkg/app_bg.wasm');
</script> </script>
</body> </body>
</html>"#, </html>"#,