topaLE
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Migrate from Rocket to Rkt 

This commit migrates from the current, more then 2 year old, Rocket
crate to the Rkt fork. This removes 8 duplicate and outdated crates.
It also removes and adds some other crates. The only crate which now
triggers `cargo deny` is `rsa`, which is still not patched but at the
latest version.

Some other changes:
- Optimized static files to be ETag cachable
  This prevents these files from always being sent, and less traffic
- Optimized logging for request/response.
  Previously domain and path was always fetched/parsed and caused
  allocations etc... Now, if logging is set to `warn` these fairings are
  not even registered. Also, the `domain_path` is fetched once, same as
  for the `routes`

Signed-off-by: BlackDex <black.dex@gmail.com>
pull/7817/head
BlackDex 3 months ago
parent
58a980f850
commit
dad1477d45
No known key found for this signature in database GPG Key ID: 58C80A2AA6C765E1
18 changed files with 325 additions and 350 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 357
      Cargo.lock
  2. 6
      Cargo.toml
  3. 1
      src/api/core/accounts.rs
  4. 2
      src/api/core/ciphers.rs
  5. 4
      src/api/core/organizations.rs
  6. 1
      src/api/core/two_factor/authenticator.rs
  7. 1
      src/api/core/two_factor/duo.rs
  8. 1
      src/api/core/two_factor/email.rs
  9. 2
      src/api/core/two_factor/webauthn.rs
  10. 1
      src/api/core/two_factor/yubikey.rs
  11. 2
      src/api/mod.rs
  12. 29
      src/api/notifications.rs
  13. 86
      src/api/web.rs
  14. 4
      src/auth.rs
  15. 6
      src/error.rs
  16. 4
      src/mail.rs
  17. 56
      src/main.rs
  18. 112
      src/util.rs

357
Cargo.lock
View File

@ -327,12 +327,6 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5161fb43cb8f231f06983cb2b8f9ee9cee14be0b1356d8383398cc0f312800d1" checksum = "5161fb43cb8f231f06983cb2b8f9ee9cee14be0b1356d8383398cc0f312800d1"
[[package]]
name = "atomic"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
[[package]] [[package]]
name = "atomic" name = "atomic"
version = "0.6.1" version = "0.6.1"
@ -376,7 +370,7 @@ dependencies = [
"bytes", "bytes",
"fastrand", "fastrand",
"hex", "hex",
"http 1.5.0", "http",
"sha1 0.10.7", "sha1 0.10.7",
"time", "time",
"tokio", "tokio",
@ -414,8 +408,8 @@ dependencies = [
"bytes", "bytes",
"bytes-utils", "bytes-utils",
"fastrand", "fastrand",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"tracing", "tracing",
@ -442,7 +436,7 @@ dependencies = [
"aws-types", "aws-types",
"bytes", "bytes",
"fastrand", "fastrand",
"http 1.5.0", "http",
"regex-lite", "regex-lite",
"tracing", "tracing",
] ]
@ -467,7 +461,7 @@ dependencies = [
"aws-types", "aws-types",
"bytes", "bytes",
"fastrand", "fastrand",
"http 1.5.0", "http",
"regex-lite", "regex-lite",
"tracing", "tracing",
] ]
@ -493,7 +487,7 @@ dependencies = [
"aws-smithy-xml", "aws-smithy-xml",
"aws-types", "aws-types",
"fastrand", "fastrand",
"http 1.5.0", "http",
"regex-lite", "regex-lite",
"tracing", "tracing",
] ]
@ -512,7 +506,7 @@ dependencies = [
"form_urlencoded", "form_urlencoded",
"hex", "hex",
"hmac 0.13.0", "hmac 0.13.0",
"http 1.5.0", "http",
"percent-encoding", "percent-encoding",
"sha2 0.11.0", "sha2 0.11.0",
"time", "time",
@ -542,8 +536,8 @@ dependencies = [
"bytes-utils", "bytes-utils",
"futures-core", "futures-core",
"futures-util", "futures-util",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"http-body-util", "http-body-util",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
@ -598,8 +592,8 @@ dependencies = [
"aws-smithy-types", "aws-smithy-types",
"bytes", "bytes",
"fastrand", "fastrand",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"http-body-util", "http-body-util",
"pin-project-lite", "pin-project-lite",
"pin-utils", "pin-utils",
@ -617,7 +611,7 @@ dependencies = [
"aws-smithy-runtime-api-macros", "aws-smithy-runtime-api-macros",
"aws-smithy-types", "aws-smithy-types",
"bytes", "bytes",
"http 1.5.0", "http",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
"tracing", "tracing",
@ -643,7 +637,7 @@ checksum = "e8f395d93304280b64b7632fea798d177e74897fe7f063416ce627cd6fa24829"
dependencies = [ dependencies = [
"aws-smithy-runtime-api", "aws-smithy-runtime-api",
"aws-smithy-types", "aws-smithy-types",
"http 1.5.0", "http",
] ]
[[package]] [[package]]
@ -655,8 +649,8 @@ dependencies = [
"base64-simd", "base64-simd",
"bytes", "bytes",
"bytes-utils", "bytes-utils",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"http-body-util", "http-body-util",
"itoa", "itoa",
"num-integer", "num-integer",
@ -1896,7 +1890,7 @@ version = "0.10.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3"
dependencies = [ dependencies = [
"atomic 0.6.1", "atomic",
"pear", "pear",
"serde", "serde",
"toml 0.8.23", "toml 0.8.23",
@ -2203,7 +2197,7 @@ dependencies = [
"fnv", "fnv",
"futures-core", "futures-core",
"futures-sink", "futures-sink",
"http 1.5.0", "http",
"indexmap 2.14.2", "indexmap 2.14.2",
"slab", "slab",
"tokio", "tokio",
@ -2412,17 +2406,6 @@ dependencies = [
"jetscii", "jetscii",
] ]
[[package]]
name = "http"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
dependencies = [
"bytes",
"fnv",
"itoa",
]
[[package]] [[package]]
name = "http" name = "http"
version = "1.5.0" version = "1.5.0"
@ -2433,17 +2416,6 @@ dependencies = [
"itoa", "itoa",
] ]
[[package]]
name = "http-body"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
dependencies = [
"bytes",
"http 0.2.12",
"pin-project-lite",
]
[[package]] [[package]]
name = "http-body" name = "http-body"
version = "1.1.0" version = "1.1.0"
@ -2451,7 +2423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c"
dependencies = [ dependencies = [
"bytes", "bytes",
"http 1.5.0", "http",
] ]
[[package]] [[package]]
@ -2462,8 +2434,8 @@ checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-core", "futures-core",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"pin-project-lite", "pin-project-lite",
] ]
@ -2488,29 +2460,6 @@ dependencies = [
"typenum", "typenum",
] ]
[[package]]
name = "hyper"
version = "0.14.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
dependencies = [
"bytes",
"futures-channel",
"futures-core",
"futures-util",
"http 0.2.12",
"http-body 0.4.6",
"httparse",
"httpdate",
"itoa",
"pin-project-lite",
"socket2 0.5.10",
"tokio",
"tower-service",
"tracing",
"want",
]
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "1.11.1" version = "1.11.1"
@ -2522,9 +2471,10 @@ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"h2", "h2",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"httparse", "httparse",
"httpdate",
"itoa", "itoa",
"pin-project-lite", "pin-project-lite",
"smallvec", "smallvec",
@ -2538,12 +2488,12 @@ version = "0.27.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53" checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53"
dependencies = [ dependencies = [
"http 1.5.0", "http",
"hyper 1.11.1", "hyper",
"hyper-util", "hyper-util",
"rustls 0.23.45", "rustls",
"tokio", "tokio",
"tokio-rustls 0.26.6", "tokio-rustls",
"tower-service", "tower-service",
] ]
@ -2557,15 +2507,15 @@ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"httparse", "httparse",
"hyper 1.11.1", "hyper",
"ipnet", "ipnet",
"libc", "libc",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"socket2 0.6.5", "socket2",
"system-configuration", "system-configuration",
"tokio", "tokio",
"tower-service", "tower-service",
@ -2742,7 +2692,7 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222" checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222"
dependencies = [ dependencies = [
"socket2 0.6.5", "socket2",
"widestring", "widestring",
"windows-registry", "windows-registry",
"windows-result", "windows-result",
@ -2999,12 +2949,12 @@ dependencies = [
"nom 8.0.0", "nom 8.0.0",
"percent-encoding", "percent-encoding",
"quoted_printable", "quoted_printable",
"rustls 0.23.45", "rustls",
"rustls-native-certs", "rustls-native-certs",
"serde", "serde",
"socket2 0.6.5", "socket2",
"tokio", "tokio",
"tokio-rustls 0.26.6", "tokio-rustls",
"tracing", "tracing",
"url", "url",
] ]
@ -3217,7 +3167,7 @@ dependencies = [
"bytes", "bytes",
"encoding_rs", "encoding_rs",
"futures-util", "futures-util",
"http 1.5.0", "http",
"httparse", "httparse",
"memchr", "memchr",
"mime", "mime",
@ -3411,7 +3361,7 @@ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"chrono", "chrono",
"getrandom 0.2.17", "getrandom 0.2.17",
"http 1.5.0", "http",
"rand 0.8.8", "rand 0.8.8",
"serde", "serde",
"serde_json", "serde_json",
@ -3462,7 +3412,7 @@ dependencies = [
"base64 0.23.1", "base64 0.23.1",
"bytes", "bytes",
"futures", "futures",
"http 1.5.0", "http",
"jiff", "jiff",
"log", "log",
"md-5", "md-5",
@ -3485,8 +3435,8 @@ checksum = "4d6588678f3040a3eab1819364dcbc6a746a8286d1ceb23a70a6614faa01dc6c"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"opendal-core", "opendal-core",
"reqwest", "reqwest",
] ]
@ -3514,7 +3464,7 @@ dependencies = [
"base64 0.23.1", "base64 0.23.1",
"bytes", "bytes",
"crc-fast", "crc-fast",
"http 1.5.0", "http",
"log", "log",
"md-5", "md-5",
"opendal-core", "opendal-core",
@ -3537,7 +3487,7 @@ dependencies = [
"dyn-clone", "dyn-clone",
"ed25519-dalek", "ed25519-dalek",
"hmac 0.12.1", "hmac 0.12.1",
"http 1.5.0", "http",
"itertools", "itertools",
"log", "log",
"oauth2", "oauth2",
@ -4251,6 +4201,12 @@ dependencies = [
"syn 3.0.6", "syn 3.0.6",
] ]
[[package]]
name = "ref-swap"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09c30c54dffee5b40af088d5d50aa3455c91a0127164b51f0215efc4cb28fb3c"
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.13.1" version = "1.13.1"
@ -4306,7 +4262,7 @@ dependencies = [
"bytes", "bytes",
"form_urlencoded", "form_urlencoded",
"hex", "hex",
"http 1.5.0", "http",
"log", "log",
"percent-encoding", "percent-encoding",
"quick-xml 0.42.0", "quick-xml 0.42.0",
@ -4325,7 +4281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "906bfd028f96bfe73fdb892ce26f3b3f99b4f30feb9bd024be58bd6657f68b2b" checksum = "906bfd028f96bfe73fdb892ce26f3b3f99b4f30feb9bd024be58bd6657f68b2b"
dependencies = [ dependencies = [
"bytes", "bytes",
"http 1.5.0", "http",
"log", "log",
"quick-xml 0.42.0", "quick-xml 0.42.0",
"reqsign-aws-core", "reqsign-aws-core",
@ -4345,7 +4301,7 @@ dependencies = [
"bytes", "bytes",
"hex", "hex",
"hmac 0.13.0", "hmac 0.13.0",
"http 1.5.0", "http",
"jiff", "jiff",
"log", "log",
"percent-encoding", "percent-encoding",
@ -4379,10 +4335,10 @@ dependencies = [
"futures-core", "futures-core",
"futures-util", "futures-util",
"h2", "h2",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"http-body-util", "http-body-util",
"hyper 1.11.1", "hyper",
"hyper-rustls", "hyper-rustls",
"hyper-util", "hyper-util",
"js-sys", "js-sys",
@ -4390,7 +4346,7 @@ dependencies = [
"mime", "mime",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"rustls 0.23.45", "rustls",
"rustls-pki-types", "rustls-pki-types",
"rustls-platform-verifier", "rustls-platform-verifier",
"serde", "serde",
@ -4398,7 +4354,7 @@ dependencies = [
"serde_urlencoded", "serde_urlencoded",
"sync_wrapper", "sync_wrapper",
"tokio", "tokio",
"tokio-rustls 0.26.6", "tokio-rustls",
"tokio-util", "tokio-util",
"tower", "tower",
"tower-http", "tower-http",
@ -4441,118 +4397,117 @@ dependencies = [
] ]
[[package]] [[package]]
name = "rmp" name = "rkt"
version = "0.8.15" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c"
dependencies = [
"num-traits",
]
[[package]]
name = "rmpv"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a4e1d4b9b938a26d2996af33229f0ca0956c652c1375067f0b45291c1df8417"
dependencies = [
"rmp",
]
[[package]]
name = "rocket"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a516907296a31df7dc04310e7043b61d71954d703b603cc6867a026d7e72d73f" checksum = "1105eb4e327458258fa921de564fd9bd45b9f8fd27d771e5fb82314c703eb8a3"
dependencies = [ dependencies = [
"async-stream", "async-stream",
"async-trait", "async-trait",
"atomic 0.5.3",
"binascii", "binascii",
"bytes", "bytes",
"cookie",
"either", "either",
"figment", "figment",
"futures", "futures",
"http",
"hyper",
"hyper-util",
"indexmap 2.14.2", "indexmap 2.14.2",
"log", "libc",
"memchr", "memchr",
"multer", "multer",
"num_cpus", "num_cpus",
"parking_lot", "parking_lot",
"pin-project-lite", "pin-project-lite",
"rand 0.8.8", "rand 0.10.3",
"ref-cast", "ref-cast",
"rocket_codegen", "ref-swap",
"rocket_http", "rkt_codegen",
"rkt_http",
"rustls",
"rustls-pki-types",
"serde", "serde",
"serde_json", "serde_json",
"state", "state",
"tempfile", "tempfile",
"time", "time",
"tokio", "tokio",
"tokio-rustls",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
"tracing",
"ubyte", "ubyte",
"version_check", "version_check",
"yansi", "yansi",
] ]
[[package]] [[package]]
name = "rocket_codegen" name = "rkt_codegen"
version = "0.5.1" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "575d32d7ec1a9770108c879fc7c47815a80073f96ca07ff9525a94fcede1dd46" checksum = "55143dea09d0f0c86aeb8d5cd0998b80a7920518bbb412dc860292be9524a259"
dependencies = [ dependencies = [
"devise", "devise",
"glob", "glob",
"indexmap 2.14.2", "indexmap 2.14.2",
"proc-macro2", "proc-macro2",
"quote", "quote",
"rocket_http", "rkt_http",
"syn 2.0.119", "syn 2.0.119",
"unicode-xid", "unicode-xid",
"version_check", "version_check",
] ]
[[package]] [[package]]
name = "rocket_http" name = "rkt_http"
version = "0.5.1" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e274915a20ee3065f611c044bd63c40757396b6dbc057d6046aec27f14f882b9" checksum = "ccb2598aa857ab8d59d009604d862a7780c1213d3e162321bd30f72e93129637"
dependencies = [ dependencies = [
"cookie", "cookie",
"either", "either",
"futures",
"http 0.2.12",
"hyper 0.14.32",
"indexmap 2.14.2", "indexmap 2.14.2",
"log",
"memchr", "memchr",
"pear", "pear",
"percent-encoding", "percent-encoding",
"pin-project-lite",
"ref-cast", "ref-cast",
"rustls 0.21.12",
"rustls-pemfile",
"serde", "serde",
"smallvec",
"stable-pattern", "stable-pattern",
"state", "state",
"time", "time",
"tokio", "tinyvec",
"tokio-rustls 0.24.1",
"uncased", "uncased",
] ]
[[package]] [[package]]
name = "rocket_ws" name = "rkt_ws"
version = "0.1.1" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25f1877668c937b701177c349f21383c556cd3bb4ba8fa1d07fa96ccb3a8782e" checksum = "cc1a9b1739c2b945e0aae4efb1ccb0cea1a410893143651077977f57e376cfab"
dependencies = [ dependencies = [
"rocket", "rkt",
"tokio-tungstenite", "tokio-tungstenite",
] ]
[[package]]
name = "rmp"
version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ba8be72d372b2c9b35542551678538b562e7cf86c3315773cae48dfbfe7790c"
dependencies = [
"num-traits",
]
[[package]]
name = "rmpv"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a4e1d4b9b938a26d2996af33229f0ca0956c652c1375067f0b45291c1df8417"
dependencies = [
"rmp",
]
[[package]] [[package]]
name = "rpassword" name = "rpassword"
version = "7.5.4" version = "7.5.4"
@ -4645,18 +4600,6 @@ dependencies = [
"windows-sys 0.61.2", "windows-sys 0.61.2",
] ]
[[package]]
name = "rustls"
version = "0.21.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
dependencies = [
"log",
"ring",
"rustls-webpki 0.101.7",
"sct",
]
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.23.45" version = "0.23.45"
@ -4667,7 +4610,7 @@ dependencies = [
"once_cell", "once_cell",
"ring", "ring",
"rustls-pki-types", "rustls-pki-types",
"rustls-webpki 0.103.15", "rustls-webpki",
"subtle", "subtle",
"zeroize", "zeroize",
] ]
@ -4684,15 +4627,6 @@ dependencies = [
"security-framework", "security-framework",
] ]
[[package]]
name = "rustls-pemfile"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
dependencies = [
"base64 0.21.7",
]
[[package]] [[package]]
name = "rustls-pki-types" name = "rustls-pki-types"
version = "1.15.1" version = "1.15.1"
@ -4713,10 +4647,10 @@ dependencies = [
"jni", "jni",
"log", "log",
"once_cell", "once_cell",
"rustls 0.23.45", "rustls",
"rustls-native-certs", "rustls-native-certs",
"rustls-platform-verifier-android", "rustls-platform-verifier-android",
"rustls-webpki 0.103.15", "rustls-webpki",
"security-framework", "security-framework",
"security-framework-sys", "security-framework-sys",
"webpki-root-certs", "webpki-root-certs",
@ -4729,16 +4663,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"
[[package]]
name = "rustls-webpki"
version = "0.101.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
dependencies = [
"ring",
"untrusted",
]
[[package]] [[package]]
name = "rustls-webpki" name = "rustls-webpki"
version = "0.103.15" version = "0.103.15"
@ -4825,16 +4749,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "sct"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
dependencies = [
"ring",
"untrusted",
]
[[package]] [[package]]
name = "sec1" name = "sec1"
version = "0.7.3" version = "0.7.3"
@ -5165,16 +5079,6 @@ version = "1.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e" checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e"
[[package]]
name = "socket2"
version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
dependencies = [
"libc",
"windows-sys 0.52.0",
]
[[package]] [[package]]
name = "socket2" name = "socket2"
version = "0.6.5" version = "0.6.5"
@ -5500,7 +5404,7 @@ dependencies = [
"parking_lot", "parking_lot",
"pin-project-lite", "pin-project-lite",
"signal-hook-registry", "signal-hook-registry",
"socket2 0.6.5", "socket2",
"tokio-macros", "tokio-macros",
"windows-sys 0.61.2", "windows-sys 0.61.2",
] ]
@ -5516,23 +5420,13 @@ dependencies = [
"syn 3.0.6", "syn 3.0.6",
] ]
[[package]]
name = "tokio-rustls"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
"rustls 0.21.12",
"tokio",
]
[[package]] [[package]]
name = "tokio-rustls" name = "tokio-rustls"
version = "0.26.6" version = "0.26.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db" checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db"
dependencies = [ dependencies = [
"rustls 0.23.45", "rustls",
"tokio", "tokio",
] ]
@ -5549,9 +5443,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-tungstenite" name = "tokio-tungstenite"
version = "0.21.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" checksum = "17a073bfed563fa236697a068031408a93cd9522e08abf9933ead3e73411bd71"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"log", "log",
@ -5705,8 +5599,8 @@ dependencies = [
"bytes", "bytes",
"futures-core", "futures-core",
"futures-util", "futures-util",
"http 1.5.0", "http",
"http-body 1.1.0", "http-body",
"http-body-util", "http-body-util",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
@ -5799,21 +5693,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]] [[package]]
name = "tungstenite" name = "tungstenite"
version = "0.21.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" checksum = "e48ac77174b19c110a50ab2128b24215ac9cb40e0e12e093fb602d175c569d22"
dependencies = [ dependencies = [
"byteorder",
"bytes", "bytes",
"data-encoding", "data-encoding",
"http 1.5.0", "http",
"httparse", "httparse",
"log", "log",
"rand 0.8.8", "rand 0.10.3",
"sha1 0.10.7", "sha1 0.11.0",
"thiserror 1.0.69", "thiserror 2.0.21",
"url",
"utf-8",
] ]
[[package]] [[package]]
@ -5890,12 +5781,6 @@ version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
[[package]]
name = "utf-8"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]] [[package]]
name = "utf8_iter" name = "utf8_iter"
version = "1.0.4" version = "1.0.4"
@ -5957,7 +5842,7 @@ dependencies = [
"handlebars", "handlebars",
"hickory-resolver", "hickory-resolver",
"html5gum", "html5gum",
"http 1.5.0", "http",
"ipnet", "ipnet",
"job_scheduler_ng", "job_scheduler_ng",
"jsonwebtoken", "jsonwebtoken",
@ -5983,11 +5868,11 @@ dependencies = [
"reqsign-core", "reqsign-core",
"reqwest", "reqwest",
"ring", "ring",
"rkt",
"rkt_ws",
"rmpv", "rmpv",
"rocket",
"rocket_ws",
"rpassword", "rpassword",
"rustls 0.23.45", "rustls",
"semver", "semver",
"serde", "serde",
"serde_json", "serde_json",

6
Cargo.toml
View File

@ -79,9 +79,9 @@ num-traits = "0.2.19"
num-derive = "0.5.1" num-derive = "0.5.1"
bigdecimal = "0.4.11" bigdecimal = "0.4.11"
# Web framework # Web framework fork from Rocket https://github.com/rustfoo/rkt
rocket = { version = "0.5.1", default-features = false, features = ["json", "tls"] } rocket = { package = "rkt", version = "1.2.0", default-features = false, features = ["json", "tls"] }
rocket_ws = { version = "0.1.1" } rocket_ws = { package = "rkt_ws", version = "1.2.0" }
# WebSockets libraries # WebSockets libraries
rmpv = "1.3.1" # MessagePack library rmpv = "1.3.1" # MessagePack library

1
src/api/core/accounts.rs
View File

@ -1323,6 +1323,7 @@ async fn post_delete_account(data: Json<PasswordOrOtpData>, headers: Headers, co
delete_account(data, headers, conn).await delete_account(data, headers, conn).await
} }
#[suppress(dubious_payload)]
#[delete("/accounts", data = "<data>")] #[delete("/accounts", data = "<data>")]
async fn delete_account(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn) -> EmptyResult { async fn delete_account(data: Json<PasswordOrOtpData>, headers: Headers, conn: DbConn) -> EmptyResult {
let data: PasswordOrOtpData = data.into_inner(); let data: PasswordOrOtpData = data.into_inner();

2
src/api/core/ciphers.rs
View File

@ -1532,6 +1532,7 @@ async fn delete_cipher_admin(cipher_id: CipherId, headers: Headers, conn: DbConn
// permanent delete // permanent delete
} }
#[suppress(dubious_payload)]
#[delete("/ciphers", data = "<data>")] #[delete("/ciphers", data = "<data>")]
async fn delete_cipher_selected( async fn delete_cipher_selected(
data: Json<CipherIdsData>, data: Json<CipherIdsData>,
@ -1565,6 +1566,7 @@ async fn delete_cipher_selected_put(
// soft delete // soft delete
} }
#[suppress(dubious_payload)]
#[delete("/ciphers/admin", data = "<data>")] #[delete("/ciphers/admin", data = "<data>")]
async fn delete_cipher_selected_admin( async fn delete_cipher_selected_admin(
data: Json<CipherIdsData>, data: Json<CipherIdsData>,

4
src/api/core/organizations.rs
View File

@ -215,6 +215,7 @@ async fn create_organization(headers: Headers, data: Json<OrgData>, conn: DbConn
Ok(Json(org.to_json())) Ok(Json(org.to_json()))
} }
#[suppress(dubious_payload)]
#[delete("/organizations/<org_id>", data = "<data>")] #[delete("/organizations/<org_id>", data = "<data>")]
async fn delete_organization( async fn delete_organization(
org_id: OrganizationId, org_id: OrganizationId,
@ -711,6 +712,7 @@ struct BulkCollectionIds {
ids: Vec<CollectionId>, ids: Vec<CollectionId>,
} }
#[suppress(dubious_payload)]
#[delete("/organizations/<org_id>/collections", data = "<data>")] #[delete("/organizations/<org_id>/collections", data = "<data>")]
async fn bulk_delete_organization_collections( async fn bulk_delete_organization_collections(
org_id: OrganizationId, org_id: OrganizationId,
@ -1593,6 +1595,7 @@ async fn edit_member(
member_to_edit.save(&conn).await member_to_edit.save(&conn).await
} }
#[suppress(dubious_payload)]
#[delete("/organizations/<org_id>/users", data = "<data>")] #[delete("/organizations/<org_id>/users", data = "<data>")]
async fn bulk_delete_member( async fn bulk_delete_member(
org_id: OrganizationId, org_id: OrganizationId,
@ -2677,6 +2680,7 @@ async fn delete_group_impl(
group.delete(org_id, conn).await group.delete(org_id, conn).await
} }
#[suppress(dubious_payload)]
#[delete("/organizations/<org_id>/groups", data = "<data>")] #[delete("/organizations/<org_id>/groups", data = "<data>")]
async fn bulk_delete_groups( async fn bulk_delete_groups(
org_id: OrganizationId, org_id: OrganizationId,

1
src/api/core/two_factor/authenticator.rs
View File

@ -177,6 +177,7 @@ struct DisableAuthenticatorData {
user_verification_token: String, user_verification_token: String,
} }
#[suppress(dubious_payload)]
#[delete("/two-factor/authenticator", data = "<data>")] #[delete("/two-factor/authenticator", data = "<data>")]
async fn disable_authenticator(data: Json<DisableAuthenticatorData>, headers: Headers, conn: DbConn) -> EmptyResult { async fn disable_authenticator(data: Json<DisableAuthenticatorData>, headers: Headers, conn: DbConn) -> EmptyResult {
let user = headers.user; let user = headers.user;

1
src/api/core/two_factor/duo.rs
View File

@ -143,6 +143,7 @@ async fn activate_duo_put(data: Json<EnableDuoData>, headers: Headers, conn: DbC
activate_duo(data, headers, conn).await activate_duo(data, headers, conn).await
} }
#[suppress(dubious_payload)]
#[delete("/two-factor/duo", data = "<data>")] #[delete("/two-factor/duo", data = "<data>")]
async fn disable_duo(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> EmptyResult { async fn disable_duo(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> EmptyResult {
let user = headers.user; let user = headers.user;

1
src/api/core/two_factor/email.rs
View File

@ -255,6 +255,7 @@ async fn email(data: Json<EmailData>, headers: Headers, conn: DbConn) -> JsonRes
Ok(Json(json!({}))) Ok(Json(json!({})))
} }
#[suppress(dubious_payload)]
#[delete("/two-factor/email", data = "<data>")] #[delete("/two-factor/email", data = "<data>")]
async fn disable_email(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> EmptyResult { async fn disable_email(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> EmptyResult {
let user = headers.user; let user = headers.user;

2
src/api/core/two_factor/webauthn.rs
View File

@ -325,11 +325,13 @@ struct DeleteWebauthnData {
user_verification_token: String, user_verification_token: String,
} }
#[suppress(dubious_payload)]
#[delete("/two-factor/webauthn", data = "<data>")] #[delete("/two-factor/webauthn", data = "<data>")]
async fn delete_webauthn(data: Json<DeleteWebauthnData>, headers: Headers, conn: DbConn) -> JsonResult { async fn delete_webauthn(data: Json<DeleteWebauthnData>, headers: Headers, conn: DbConn) -> JsonResult {
inner_delete_webauthns(&data.user_verification_token, |key| key.id != data.id, headers, &conn).await inner_delete_webauthns(&data.user_verification_token, |key| key.id != data.id, headers, &conn).await
} }
#[suppress(dubious_payload)]
#[delete("/two-factor/webauthn/all", data = "<data>")] #[delete("/two-factor/webauthn/all", data = "<data>")]
async fn delete_webauthns(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> JsonResult { async fn delete_webauthns(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> JsonResult {
inner_delete_webauthns(&data.user_verification_token, |_| false, headers, &conn).await inner_delete_webauthns(&data.user_verification_token, |_| false, headers, &conn).await

1
src/api/core/two_factor/yubikey.rs
View File

@ -202,6 +202,7 @@ async fn activate_yubikey_put(data: Json<EnableYubikeyData>, headers: Headers, c
activate_yubikey(data, headers, conn).await activate_yubikey(data, headers, conn).await
} }
#[suppress(dubious_payload)]
#[delete("/two-factor/yubikey", data = "<data>")] #[delete("/two-factor/yubikey", data = "<data>")]
async fn delete_yubikeys(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> EmptyResult { async fn delete_yubikeys(data: Json<VerificationTokenData>, headers: Headers, conn: DbConn) -> EmptyResult {
let user = headers.user; let user = headers.user;

2
src/api/mod.rs
View File

@ -30,7 +30,7 @@ pub use crate::api::{
}, },
web::catchers as web_catchers, web::catchers as web_catchers,
web::routes as web_routes, web::routes as web_routes,
web::{invalidate_css_cache, static_files}, web::{STATIC_FILES, invalidate_css_cache},
}; };
use crate::{ use crate::{
CONFIG, CONFIG,

29
src/api/notifications.rs
View File

@ -4,6 +4,7 @@ use std::{
time::{Duration, Instant}, time::{Duration, Instant},
}; };
use bytes::Bytes;
use chrono::{NaiveDateTime, Utc}; use chrono::{NaiveDateTime, Utc};
use rmpv::Value; use rmpv::Value;
use rocket::{Route, futures::StreamExt}; use rocket::{Route, futures::StreamExt};
@ -212,7 +213,7 @@ fn websockets_hub<'r>(
if last_received.elapsed() > WS_CLIENT_TIMEOUT { if last_received.elapsed() > WS_CLIENT_TIMEOUT {
break; break;
} }
yield Message::Ping(create_ping()); yield Message::Ping(PING);
} }
} }
} }
@ -295,7 +296,7 @@ fn anonymous_websockets_hub<'r>(ws: WebSocket, token: String, ip: ClientIp) -> R
if last_received.elapsed() > WS_CLIENT_TIMEOUT { if last_received.elapsed() > WS_CLIENT_TIMEOUT {
break; break;
} }
yield Message::Ping(create_ping()); yield Message::Ping(PING);
} }
} }
} }
@ -307,7 +308,7 @@ fn anonymous_websockets_hub<'r>(ws: WebSocket, token: String, ip: ClientIp) -> R
// Websockets server // Websockets server
// //
fn serialize(val: &Value) -> Vec<u8> { fn serialize(val: &Value) -> Bytes {
use rmpv::encode::write_value; use rmpv::encode::write_value;
let mut buf = Vec::new(); let mut buf = Vec::new();
@ -335,7 +336,7 @@ fn serialize(val: &Value) -> Vec<u8> {
} }
len_buf.append(&mut buf); len_buf.append(&mut buf);
len_buf len_buf.into()
} }
fn serialize_date(date: NaiveDateTime) -> Value { fn serialize_date(date: NaiveDateTime) -> Value {
@ -358,7 +359,9 @@ fn convert_option<T: Into<Value>>(option: Option<T>) -> Value {
} }
const RECORD_SEPARATOR: u8 = 0x1e; const RECORD_SEPARATOR: u8 = 0x1e;
const INITIAL_RESPONSE: [u8; 3] = [0x7b, 0x7d, RECORD_SEPARATOR]; // {, }, <RS> const INITIAL_RESPONSE: Bytes = Bytes::from_static(&[0x7b, 0x7d, RECORD_SEPARATOR]); // {, }, <RS>
// Same result as `serialize(&Value::Array(vec![6.into()]))`
const PING: Bytes = Bytes::from_static(&[0x02, 0x91, 0x06]);
#[derive(Deserialize, Copy, Clone, Eq, PartialEq)] #[derive(Deserialize, Copy, Clone, Eq, PartialEq)]
struct InitialMessage<'a> { struct InitialMessage<'a> {
@ -379,10 +382,10 @@ pub struct WebSocketUsers {
} }
impl WebSocketUsers { impl WebSocketUsers {
async fn send_update(&self, user_id: &UserId, data: &[u8]) { async fn send_update(&self, user_id: &UserId, data: &Bytes) {
if let Some(user) = self.map.get(user_id.as_ref()).map(|v| v.clone()) { if let Some(user) = self.map.get(user_id.as_ref()).map(|v| v.clone()) {
for (_, sender) in &user { for (_, sender) in &user {
if let Err(e) = sender.send(Message::binary(data)).await { if let Err(e) = sender.send(Message::binary(data.clone())).await {
error!("Error sending WS update {e}"); error!("Error sending WS update {e}");
} }
} }
@ -614,11 +617,11 @@ impl AnonymousWebSocketSubscriptions {
} }
} }
async fn send_update(&self, token: &str, data: &[u8]) { async fn send_update(&self, token: &str, data: &Bytes) {
// Clone the senders so the map isn't kept locked while sending. // Clone the senders so the map isn't kept locked while sending.
let senders = self.map.get(token).map(|v| v.clone()).unwrap_or_default(); let senders = self.map.get(token).map(|v| v.clone()).unwrap_or_default();
for (_, sender) in senders { for (_, sender) in senders {
if let Err(e) = sender.send(Message::binary(data)).await { if let Err(e) = sender.send(Message::binary(data.clone())).await {
error!("Error sending WS update {e}"); error!("Error sending WS update {e}");
} }
} }
@ -652,7 +655,7 @@ impl AnonymousWebSocketSubscriptions {
] ]
] ]
*/ */
fn create_update(payload: Vec<(Value, Value)>, ut: UpdateType, acting_device_id: Option<DeviceId>) -> Vec<u8> { fn create_update(payload: Vec<(Value, Value)>, ut: UpdateType, acting_device_id: Option<DeviceId>) -> Bytes {
use rmpv::Value as V; use rmpv::Value as V;
let value = V::Array(vec![ let value = V::Array(vec![
@ -670,7 +673,7 @@ fn create_update(payload: Vec<(Value, Value)>, ut: UpdateType, acting_device_id:
serialize(&value) serialize(&value)
} }
fn create_anonymous_update(payload: Vec<(Value, Value)>, ut: UpdateType, user_id: &UserId) -> Vec<u8> { fn create_anonymous_update(payload: Vec<(Value, Value)>, ut: UpdateType, user_id: &UserId) -> Bytes {
use rmpv::Value as V; use rmpv::Value as V;
let value = V::Array(vec![ let value = V::Array(vec![
@ -691,10 +694,6 @@ fn create_anonymous_update(payload: Vec<(Value, Value)>, ut: UpdateType, user_id
serialize(&value) serialize(&value)
} }
fn create_ping() -> Vec<u8> {
serialize(&Value::Array(vec![6.into()]))
}
// https://github.com/bitwarden/server/blob/375af7c43b10d9da03525d41452f95de3f921541/src/Core/Enums/PushType.cs // https://github.com/bitwarden/server/blob/375af7c43b10d9da03525d41452f95de3f921541/src/Core/Enums/PushType.cs
#[derive(Copy, Clone, Eq, PartialEq)] #[derive(Copy, Clone, Eq, PartialEq)]
pub enum UpdateType { pub enum UpdateType {

86
src/api/web.rs
View File

@ -1,6 +1,7 @@
use std::{ use std::{
collections::HashMap,
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::{Arc, RwLock}, sync::{Arc, LazyLock, RwLock},
}; };
use rocket::{ use rocket::{
@ -256,7 +257,7 @@ fn alive_head(_conn: DbConn) -> EmptyResult {
// This endpoint/function is used during development and development only. // This endpoint/function is used during development and development only.
// It allows to easily develop the admin interface by always loading the files from disk instead from a slice of bytes // It allows to easily develop the admin interface by always loading the files from disk instead from a slice of bytes
// This will only be active during a debug build and only when `RELOAD_TEMPLATES` is set to `true` // This will only be active during a debug build and only when `RELOAD_TEMPLATES` is set to `true`
// NOTE: Do not forget to add any new files added to the `static_files` function below! // NOTE: Do not forget to add any new files added to the `STATIC_FILES` HashMap below!
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
#[get("/vw_static/<filename>", rank = 1)] #[get("/vw_static/<filename>", rank = 1)]
pub async fn static_files_dev(filename: PathBuf) -> Option<NamedFile> { pub async fn static_files_dev(filename: PathBuf) -> Option<NamedFile> {
@ -276,32 +277,61 @@ pub async fn static_files_dev(filename: PathBuf) -> Option<NamedFile> {
None None
} }
pub struct StaticFile {
pub content_type: ContentType,
pub bytes: &'static [u8],
pub etag: String,
}
pub static STATIC_FILES: LazyLock<HashMap<&'static str, StaticFile>> = LazyLock::new(|| {
[
("404.png", ContentType::PNG, &include_bytes!("../static/images/404.png")[..]),
("mail-github.png", ContentType::PNG, &include_bytes!("../static/images/mail-github.png")[..]),
("logo-gray.png", ContentType::PNG, &include_bytes!("../static/images/logo-gray.png")[..]),
("error-x.svg", ContentType::SVG, &include_bytes!("../static/images/error-x.svg")[..]),
("hibp.png", ContentType::PNG, &include_bytes!("../static/images/hibp.png")[..]),
("vaultwarden-icon.png", ContentType::PNG, &include_bytes!("../static/images/vaultwarden-icon.png")[..]),
("vaultwarden-favicon.png", ContentType::PNG, &include_bytes!("../static/images/vaultwarden-favicon.png")[..]),
("404.css", ContentType::CSS, &include_bytes!("../static/scripts/404.css")[..]),
("admin.css", ContentType::CSS, &include_bytes!("../static/scripts/admin.css")[..]),
("admin.js", ContentType::JavaScript, &include_bytes!("../static/scripts/admin.js")[..]),
("admin_settings.js", ContentType::JavaScript, &include_bytes!("../static/scripts/admin_settings.js")[..]),
("admin_users.js", ContentType::JavaScript, &include_bytes!("../static/scripts/admin_users.js")[..]),
(
"admin_organizations.js",
ContentType::JavaScript,
&include_bytes!("../static/scripts/admin_organizations.js")[..],
),
(
"admin_diagnostics.js",
ContentType::JavaScript,
&include_bytes!("../static/scripts/admin_diagnostics.js")[..],
),
("bootstrap.css", ContentType::CSS, &include_bytes!("../static/scripts/bootstrap.css")[..]),
("bootstrap.bundle.js", ContentType::JavaScript, &include_bytes!("../static/scripts/bootstrap.bundle.js")[..]),
("jdenticon-3.3.0.js", ContentType::JavaScript, &include_bytes!("../static/scripts/jdenticon-3.3.0.js")[..]),
("datatables.js", ContentType::JavaScript, &include_bytes!("../static/scripts/datatables.js")[..]),
("datatables.css", ContentType::CSS, &include_bytes!("../static/scripts/datatables.css")[..]),
]
.into_iter()
.map(|(name, content_type, bytes)| {
(
name,
StaticFile {
content_type,
bytes,
etag: sha256_hex(bytes),
},
)
})
.collect()
});
#[get("/vw_static/<filename>", rank = 2)] #[get("/vw_static/<filename>", rank = 2)]
pub fn static_files(filename: &str) -> Result<(ContentType, &'static [u8]), Error> { pub fn static_files(filename: &str) -> Result<EtagCached<(ContentType, &'static [u8])>, Error> {
match filename { if let Some(file) = STATIC_FILES.get(filename) {
"404.png" => Ok((ContentType::PNG, include_bytes!("../static/images/404.png"))), Ok(EtagCached::new((file.content_type.clone(), file.bytes), &file.etag))
"mail-github.png" => Ok((ContentType::PNG, include_bytes!("../static/images/mail-github.png"))), } else {
"logo-gray.png" => Ok((ContentType::PNG, include_bytes!("../static/images/logo-gray.png"))), err!(format!("Static file not found: {filename}"))
"error-x.svg" => Ok((ContentType::SVG, include_bytes!("../static/images/error-x.svg"))),
"hibp.png" => Ok((ContentType::PNG, include_bytes!("../static/images/hibp.png"))),
"vaultwarden-icon.png" => Ok((ContentType::PNG, include_bytes!("../static/images/vaultwarden-icon.png"))),
"vaultwarden-favicon.png" => Ok((ContentType::PNG, include_bytes!("../static/images/vaultwarden-favicon.png"))),
"404.css" => Ok((ContentType::CSS, include_bytes!("../static/scripts/404.css"))),
"admin.css" => Ok((ContentType::CSS, include_bytes!("../static/scripts/admin.css"))),
"admin.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/admin.js"))),
"admin_settings.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/admin_settings.js"))),
"admin_users.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/admin_users.js"))),
"admin_organizations.js" => {
Ok((ContentType::JavaScript, include_bytes!("../static/scripts/admin_organizations.js")))
}
"admin_diagnostics.js" => {
Ok((ContentType::JavaScript, include_bytes!("../static/scripts/admin_diagnostics.js")))
}
"bootstrap.css" => Ok((ContentType::CSS, include_bytes!("../static/scripts/bootstrap.css"))),
"bootstrap.bundle.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/bootstrap.bundle.js"))),
"jdenticon-3.3.0.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/jdenticon-3.3.0.js"))),
"datatables.js" => Ok((ContentType::JavaScript, include_bytes!("../static/scripts/datatables.js"))),
"datatables.css" => Ok((ContentType::CSS, include_bytes!("../static/scripts/datatables.css"))),
_ => err!(format!("Static file not found: {filename}")),
} }
} }

4
src/auth.rs
View File

@ -77,7 +77,7 @@ pub async fn initialize_keys() -> Result<(), Error> {
let rsa_key_filename = crate::storage::file_name(&CONFIG.private_rsa_key()) let rsa_key_filename = crate::storage::file_name(&CONFIG.private_rsa_key())
.ok_or_else(|| IoError::other("Private RSA key path missing filename"))?; .ok_or_else(|| IoError::other("Private RSA key path missing filename"))?;
let operator = CONFIG.opendal_operator_for_path_type(&PathType::RsaKey).map_err(IoError::other)?; let operator = CONFIG.opendal_operator_for_path_type(&PathType::RsaKey)?;
let priv_key_buffer = match operator.read(&rsa_key_filename).await { let priv_key_buffer = match operator.read(&rsa_key_filename).await {
Ok(buffer) => Some(buffer), Ok(buffer) => Some(buffer),
@ -1139,7 +1139,7 @@ impl<'r> FromRequest<'r> for ClientIp {
type Error = (); type Error = ();
async fn from_request(req: &'r Request<'_>) -> Outcome<Self, Self::Error> { async fn from_request(req: &'r Request<'_>) -> Outcome<Self, Self::Error> {
let remote = req.remote().map(|r| r.ip()); let remote = req.remote().and_then(rocket::listener::Endpoint::ip);
let ip = if CONFIG._ip_header_enabled() && ip_header_is_trusted(remote) { let ip = if CONFIG._ip_header_enabled() && ip_header_is_trusted(remote) {
client_ip_from_header(req, &CONFIG.ip_header(), |ip| ip_header_is_trusted(Some(ip))) client_ip_from_header(req, &CONFIG.ip_header(), |ip| ip_header_is_trusted(Some(ip)))

6
src/error.rs
View File

@ -165,10 +165,12 @@ impl Error {
self self
} }
#[must_use]
pub fn get_event(&self) -> &Option<ErrorEvent> { pub fn get_event(&self) -> &Option<ErrorEvent> {
&self.event &self.event
} }
#[must_use]
pub fn message(&self) -> &str { pub fn message(&self) -> &str {
&self.message &self.message
} }
@ -425,12 +427,12 @@ macro_rules! err_json {
macro_rules! err_handler { macro_rules! err_handler {
($expr:expr) => {{ ($expr:expr) => {{
error!(target: "auth", "Unauthorized Error: {}", $expr); error!(target: "auth", "Unauthorized Error: {}", $expr);
return ::rocket::request::Outcome::Error((rocket::http::Status::Unauthorized, $expr)); return ::rocket::request::Outcome::Error((::rocket::http::Status::Unauthorized, $expr));
}}; }};
($usr_msg:expr, $log_value:expr) => {{ ($usr_msg:expr, $log_value:expr) => {{
let usr_msg = $usr_msg; let usr_msg = $usr_msg;
let log_value = $log_value; let log_value = $log_value;
error!(target: "auth", "Unauthorized Error: {usr_msg}. {log_value}"); error!(target: "auth", "Unauthorized Error: {usr_msg}. {log_value}");
return ::rocket::request::Outcome::Error((rocket::http::Status::Unauthorized, usr_msg)); return ::rocket::request::Outcome::Error((::rocket::http::Status::Unauthorized, usr_msg));
}}; }};
} }

4
src/mail.rs
View File

@ -738,8 +738,8 @@ async fn send_email(address: &str, subject: &str, body_html: String, body_text:
let smtp_from = Address::from_str(&CONFIG.smtp_from())?; let smtp_from = Address::from_str(&CONFIG.smtp_from())?;
let body = if CONFIG.smtp_embed_images() { let body = if CONFIG.smtp_embed_images() {
let logo_gray_body = Body::new(crate::api::static_files("logo-gray.png").unwrap().1.to_vec()); let logo_gray_body = Body::new(crate::api::STATIC_FILES["logo-gray.png"].bytes.to_vec());
let mail_github_body = Body::new(crate::api::static_files("mail-github.png").unwrap().1.to_vec()); let mail_github_body = Body::new(crate::api::STATIC_FILES["mail-github.png"].bytes.to_vec());
MultiPart::alternative().singlepart(SinglePart::plain(body_text)).multipart( MultiPart::alternative().singlepart(SinglePart::plain(body_text)).multipart(
MultiPart::related() MultiPart::related()
.singlepart(SinglePart::html(body_html)) .singlepart(SinglePart::html(body_html))

56
src/main.rs
View File

@ -13,6 +13,9 @@ static GLOBAL: MiMalloc = MiMalloc;
#[macro_use] #[macro_use]
extern crate rocket; extern crate rocket;
// `rkt` codegen generates code using `rkt::` and not `rocket::`
// This ensures both `rocket` and `rkt` point to the same crate
extern crate rocket as rkt;
#[macro_use] #[macro_use]
extern crate serde; extern crate serde;
#[macro_use] #[macro_use]
@ -273,9 +276,10 @@ fn init_logging() -> Result<log::LevelFilter, Error> {
log::LevelFilter::Off log::LevelFilter::Off
}; };
// Only show Rocket underscore `_` logs when the level is Debug or higher // Only show some Rocket/Rkt logs when the level is Debug or higher
// These replace the Rocket underscore `_` logs. Rkt logs some of them as Info.
// Else this will bloat the log output with useless messages. // Else this will bloat the log output with useless messages.
let rocket_underscore_level = if level >= log::LevelFilter::Debug { let rkt_debug_level = if level >= log::LevelFilter::Debug {
log::LevelFilter::Warn log::LevelFilter::Warn
} else { } else {
log::LevelFilter::Off log::LevelFilter::Off
@ -296,24 +300,18 @@ fn init_logging() -> Result<log::LevelFilter, Error> {
log::LevelFilter::Off log::LevelFilter::Off
}; };
// NOTE: Rocket has been replaced with Rkt, since the crate is called `rkt`, `rocket` does not work even though we use this throughout the code!
let mut default_levels = HashMap::from([ let mut default_levels = HashMap::from([
// Hide unknown certificate errors if using self-signed // Hide unknown certificate errors if using self-signed
("rustls::session", log::LevelFilter::Off), ("rustls::session", log::LevelFilter::Off),
// Hide failed to close stream messages // Hide failed to close stream messages
("hyper::server", log::LevelFilter::Warn), ("hyper::server", log::LevelFilter::Warn),
// Silence Rocket `_` logs // Silence Rkt logs, this covers all `rocket::*`/`rkt::*` targets
("_", rocket_underscore_level), ("rkt", log::LevelFilter::Warn),
("rocket::response::responder::_", rocket_underscore_level), // Rkt request/data guard logs (previously the Rocket `_` logs)
("rocket::server::_", rocket_underscore_level), ("rkt::codegen", rkt_debug_level),
("vaultwarden::api::admin::_", rocket_underscore_level), // Rkt per-connection warnings, like client header read timeouts (15s) on idle keep-alive connections and connections cancelled during shutdown
("vaultwarden::api::notifications::_", rocket_underscore_level), ("rkt::error", log::LevelFilter::Error),
// Silence Rocket logs
("rocket::launch", log::LevelFilter::Error),
("rocket::launch_", log::LevelFilter::Error),
("rocket::rocket", log::LevelFilter::Warn),
("rocket::server", log::LevelFilter::Warn),
("rocket::fairing::fairings", log::LevelFilter::Warn),
("rocket::shield::shield", log::LevelFilter::Warn),
("hyper::proto", log::LevelFilter::Off), ("hyper::proto", log::LevelFilter::Off),
("hyper::client", log::LevelFilter::Off), ("hyper::client", log::LevelFilter::Off),
// Filter handlebars logs // Filter handlebars logs
@ -563,20 +561,26 @@ async fn create_db_pool() -> db::DbPool {
async fn launch_rocket(pool: db::DbPool, extra_debug: bool) -> Result<(), Error> { async fn launch_rocket(pool: db::DbPool, extra_debug: bool) -> Result<(), Error> {
let basepath = &CONFIG.domain_path(); let basepath = &CONFIG.domain_path();
let mut config = rocket::Config::from(rocket::Config::figment()); let limits = Limits::new()
// We install our own signal handlers below; disable Rocket's built-in handlers
config.shutdown.ctrlc = false;
#[cfg(unix)]
config.shutdown.signals.clear();
config.temp_dir = canonicalize(CONFIG.tmp_folder()).unwrap().into();
config.cli_colors = false; // Make sure Rocket does not color any values for logging.
config.limits = Limits::new()
.limit("json", 20.megabytes()) // 20MB should be enough for very large imports, something like 5000+ vault entries .limit("json", 20.megabytes()) // 20MB should be enough for very large imports, something like 5000+ vault entries
.limit("data-form", 525.megabytes()) // This needs to match the maximum allowed file size for Send .limit("data-form", 525.megabytes()) // This needs to match the maximum allowed file size for Send
.limit("file", 525.megabytes()); // This needs to match the maximum allowed file size for attachments .limit("file", 525.megabytes()); // This needs to match the maximum allowed file size for attachments
let mut config = rocket::Config::figment()
.merge(("shutdown.ctrlc", false)) // We install our own signal handlers below; disable Rocket's built-in handlers
.merge(("temp_dir", canonicalize(CONFIG.tmp_folder()).unwrap()))
.merge(("cli_colors", rocket::config::CliColors::Never)) // Make sure Rocket does not color any values for logging
.merge(("limits", limits));
#[cfg(unix)]
{
config = config.merge(("shutdown.signals", Vec::<String>::new()));
}
if CONFIG._ip_header_enabled() {
config = config.merge(("ip_header", CONFIG.ip_header()));
}
// If adding more paths here, consider also adding them to // If adding more paths here, consider also adding them to
// crate::utils::LOGGED_ROUTES to make sure they appear in the log // crate::utils::LOGGED_ROUTES to make sure they appear in the log
let instance = rocket::custom(config) let instance = rocket::custom(config)
@ -595,7 +599,7 @@ async fn launch_rocket(pool: db::DbPool, extra_debug: bool) -> Result<(), Error>
.manage(Arc::clone(&WS_ANONYMOUS_SUBSCRIPTIONS)) .manage(Arc::clone(&WS_ANONYMOUS_SUBSCRIPTIONS))
.attach(util::AppHeaders()) .attach(util::AppHeaders())
.attach(util::Cors()) .attach(util::Cors())
.attach(util::BetterLogging(extra_debug)) .attach(util::BetterLogging::new(extra_debug, basepath.clone()))
.ignite() .ignite()
.await?; .await?;

112
src/util.rs
View File

@ -299,72 +299,114 @@ impl<'r, R: 'r + Responder<'r, 'static> + Send> Responder<'r, 'static> for EtagC
// Effectively ignores, any static file route, and the alive endpoint // Effectively ignores, any static file route, and the alive endpoint
const LOGGED_ROUTES: [&str; 7] = ["/api", "/admin", "/identity", "/icons", "/attachments", "/events", "/notifications"]; const LOGGED_ROUTES: [&str; 7] = ["/api", "/admin", "/identity", "/icons", "/attachments", "/events", "/notifications"];
// Same format as the `Display` of a Rocket route, which Rkt does not have anymore
struct RouteDisplay<'a>(&'a rocket::Route);
impl fmt::Display for RouteDisplay<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let route = self.0;
if let Some(name) = &route.name {
write!(f, "({name}) ")?;
}
write!(f, "{} {}", route.method.map_or("ANY", |m| m.as_str()), route.uri)?;
if route.rank > 1 {
write!(f, " [{}]", route.rank)?;
}
if let Some(format) = &route.format {
write!(f, " {format}")?;
}
Ok(())
}
}
// Boolean is extra debug, when true, we ignore the whitelist above and also print the mounts // Boolean is extra debug, when true, we ignore the whitelist above and also print the mounts
pub struct BetterLogging(pub bool); pub struct BetterLogging {
extra: bool,
log_request: bool,
log_response: bool,
domain_path: String,
}
impl BetterLogging {
pub fn new(extra: bool, domain_path: String) -> Self {
Self {
extra,
log_request: log_enabled!(target: "request", log::Level::Info),
log_response: log_enabled!(target: "response", log::Level::Info),
domain_path,
}
}
fn should_log(&self, method: Method, path: &str) -> bool {
if self.extra {
return true;
}
if method == Method::Options {
return false;
}
let subpath = path.strip_prefix(&self.domain_path).unwrap_or(path);
LOGGED_ROUTES.iter().any(|r| subpath.starts_with(r))
}
}
#[rocket::async_trait] #[rocket::async_trait]
impl Fairing for BetterLogging { impl Fairing for BetterLogging {
fn info(&self) -> Info { fn info(&self) -> Info {
let mut kind = Kind::Liftoff;
if self.log_request {
kind = kind | Kind::Request;
}
if self.log_response {
kind = kind | Kind::Response;
}
Info { Info {
name: "Better Logging", name: "Better Logging",
kind: Kind::Liftoff | Kind::Request | Kind::Response, kind,
} }
} }
async fn on_liftoff(&self, rocket: &Rocket<Orbit>) { async fn on_liftoff(&self, rocket: &Rocket<Orbit>) {
if self.0 { if self.extra {
info!(target: "routes", "Routes loaded:"); info!(target: "routes", "Routes loaded:");
let mut routes: Vec<_> = rocket.routes().collect(); let mut routes: Vec<_> = rocket.routes().collect();
routes.sort_by_key(|r| r.uri.path()); routes.sort_by(|a, b| a.uri.path().as_str().cmp(b.uri.path().as_str()));
for route in routes { for route in routes {
let method = route.method.map_or("ANY", |m| m.as_str());
if route.rank < 0 { if route.rank < 0 {
info!(target: "routes", "{:<6} {}", route.method, route.uri); info!(target: "routes", "{:<6} {}", method, route.uri);
} else { } else {
info!(target: "routes", "{:<6} {} [{}]", route.method, route.uri, route.rank); info!(target: "routes", "{:<6} {} [{}]", method, route.uri, route.rank);
} }
} }
} }
let config = rocket.config(); for endpoint in rocket.endpoints() {
let scheme = if config.tls_enabled() { info!(target: "start", "Rocket has launched from {endpoint}");
"https" }
} else {
"http"
};
let addr = format!("{scheme}://{}:{}", config.address, config.port);
info!(target: "start", "Rocket has launched from {addr}");
} }
async fn on_request(&self, request: &mut Request<'_>, _data: &mut Data<'_>) { async fn on_request(&self, request: &mut Request<'_>, _data: &mut Data<'_>) {
let uri = request.uri();
let uri_path = uri.path();
let method = request.method(); let method = request.method();
if !self.0 && method == Method::Options { if !self.should_log(method, uri_path.as_str()) {
return; return;
} }
let uri = request.uri(); let path = uri_path.url_decode_lossy();
let uri_path = uri.path(); match uri.query() {
let uri_path_str = uri_path.url_decode_lossy(); Some(q) => info!(target: "request", "{method} {path}?{}", &q[..q.len().min(30)]),
let uri_subpath = uri_path_str.strip_prefix(&CONFIG.domain_path()).unwrap_or(&uri_path_str); None => info!(target: "request", "{method} {path}"),
if self.0 || LOGGED_ROUTES.iter().any(|r| uri_subpath.starts_with(r)) {
match uri.query() {
Some(q) => info!(target: "request", "{method} {uri_path_str}?{}", &q[..q.len().min(30)]),
None => info!(target: "request", "{method} {uri_path_str}"),
}
} }
} }
async fn on_response<'r>(&self, request: &'r Request<'_>, response: &mut Response<'r>) { async fn on_response<'r>(&self, request: &'r Request<'_>, response: &mut Response<'r>) {
if !self.0 && request.method() == Method::Options { let uri = request.uri();
if !self.should_log(request.method(), uri.path().as_str()) {
return; return;
} }
let uri_path = request.uri().path(); let status = response.status();
let uri_path_str = uri_path.url_decode_lossy(); match request.route() {
let uri_subpath = uri_path_str.strip_prefix(&CONFIG.domain_path()).unwrap_or(&uri_path_str); Some(r) => info!(target: "response", "{} => {status}", RouteDisplay(r)),
if self.0 || LOGGED_ROUTES.iter().any(|r| uri_subpath.starts_with(r)) { None => info!(target: "response", "{status}"),
let status = response.status();
if let Some(route) = request.route() {
info!(target: "response", "{route} => {status}");
} else {
info!(target: "response", "{status}");
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save