Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-23 05:20:28 +01:00
Merge branch 'BlackDex-fix-upload-limits-and-logging' into main
Dieser Commit ist enthalten in:
Commit
527bc1f625
1 geänderte Dateien mit 5 neuen und 4 gelöschten Zeilen
|
@ -336,10 +336,11 @@ async fn launch_rocket(pool: db::DbPool, extra_debug: bool) -> Result<(), Error>
|
||||||
|
|
||||||
let mut config = rocket::Config::from(rocket::Config::figment());
|
let mut config = rocket::Config::from(rocket::Config::figment());
|
||||||
config.temp_dir = canonicalize(CONFIG.tmp_folder()).unwrap().into();
|
config.temp_dir = canonicalize(CONFIG.tmp_folder()).unwrap().into();
|
||||||
config.limits = Limits::new() //
|
config.cli_colors = false; // Make sure Rocket does not color any values for logging.
|
||||||
.limit("json", 10.megabytes())
|
config.limits = Limits::new()
|
||||||
.limit("data-form", 150.megabytes())
|
.limit("json", 20.megabytes()) // 20MB should be enough for very large imports, something like 5000+ vault entries
|
||||||
.limit("file", 150.megabytes());
|
.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
|
||||||
|
|
||||||
// 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
|
||||||
|
|
Laden …
In neuem Issue referenzieren