mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2025-11-25 06:02:34 +02:00
* Optimizations and build speedup With this commit I have changed several components to be more efficient. This can be less llvm-lines generated or less `clone()` calls. ### Config - Re-ordered the `make_config` macro to be more efficient - Created a custom Deserializer for `ConfigBuilder` less code and more efficient - Use struct's for the `prepare_json` function instead of generating a custom JSON object. This generates less code and is more efficient. - Updated the `get_support_string` function to handle the masking differently. This generates less code and also was able to remove some sub-macro-calls ### Error - Added an extra new call to prevent duplicate Strings in generated macro code. This generated less llvm-lines and seems to be more efficient. - Created a custom Serializer for `ApiError` and `CompactApiError` This makes that struct smaller in size, so better for memory, but also less llvm-lines. ### General - Removed `once_lock` and replace it all with Rust's std LazyLock - Added and fixed some Clippy lints which reduced `clone()` calls for example. - Updated build profiles for more efficiency Also added a new profile specifically for CI, which should decrease the build check - Updated several GitHub Workflows for better security and use the new `ci` build profile - Updated to Rust v1.90.0 which uses a new linker `rust-lld` which should help in faster building - Updated the Cargo.toml for all crates to better use the `workspace` variables - Added a `typos` Workflow and Pre-Commit, which should help in detecting spell error's. Also fixed a few found by it. Signed-off-by: BlackDex <black.dex@gmail.com> * Fix release profile Signed-off-by: BlackDex <black.dex@gmail.com> * Update typos and remove mimalloc check from pre-commit checks Signed-off-by: BlackDex <black.dex@gmail.com> * Misc fixes and updated typos Signed-off-by: BlackDex <black.dex@gmail.com> * Update crates and workflows Signed-off-by: BlackDex <black.dex@gmail.com> * Fix formating and pre-commit Signed-off-by: BlackDex <black.dex@gmail.com> * Update to Rust v1.91 and update crates Signed-off-by: BlackDex <black.dex@gmail.com> * Update web-vault to v2025.10.1 and xx to v1.8.0 Signed-off-by: BlackDex <black.dex@gmail.com> --------- Signed-off-by: BlackDex <black.dex@gmail.com>
38 lines
1.4 KiB
Rust
38 lines
1.4 KiB
Rust
use std::{net::IpAddr, num::NonZeroU32, sync::LazyLock, time::Duration};
|
|
|
|
use governor::{clock::DefaultClock, state::keyed::DashMapStateStore, Quota, RateLimiter};
|
|
|
|
use crate::{Error, CONFIG};
|
|
|
|
type Limiter<T = IpAddr> = RateLimiter<T, DashMapStateStore<T>, DefaultClock>;
|
|
|
|
static LIMITER_LOGIN: LazyLock<Limiter> = LazyLock::new(|| {
|
|
let seconds = Duration::from_secs(CONFIG.login_ratelimit_seconds());
|
|
let burst = NonZeroU32::new(CONFIG.login_ratelimit_max_burst()).expect("Non-zero login ratelimit burst");
|
|
RateLimiter::keyed(Quota::with_period(seconds).expect("Non-zero login ratelimit seconds").allow_burst(burst))
|
|
});
|
|
|
|
static LIMITER_ADMIN: LazyLock<Limiter> = LazyLock::new(|| {
|
|
let seconds = Duration::from_secs(CONFIG.admin_ratelimit_seconds());
|
|
let burst = NonZeroU32::new(CONFIG.admin_ratelimit_max_burst()).expect("Non-zero admin ratelimit burst");
|
|
RateLimiter::keyed(Quota::with_period(seconds).expect("Non-zero admin ratelimit seconds").allow_burst(burst))
|
|
});
|
|
|
|
pub fn check_limit_login(ip: &IpAddr) -> Result<(), Error> {
|
|
match LIMITER_LOGIN.check_key(ip) {
|
|
Ok(_) => Ok(()),
|
|
Err(_e) => {
|
|
err_code!("Too many login requests", 429);
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn check_limit_admin(ip: &IpAddr) -> Result<(), Error> {
|
|
match LIMITER_ADMIN.check_key(ip) {
|
|
Ok(_) => Ok(()),
|
|
Err(_e) => {
|
|
err_code!("Too many admin requests", 429);
|
|
}
|
|
}
|
|
}
|