mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-11-19 00:45:57 +02:00
* Modernize Rust code and fix input handling - Adopt newer std APIs, reduce allocations, and consolidate caching on Moka. - Update the Rust toolchain and most dependencies, tighten lints, and expand test coverage. - Fix favicon ranking for URLs with query strings or fragments, and try the next icon when SVG sanitization fails. - Prevent panics when masking 2FA email addresses containing Unicode or missing an @. - Prevent panics on Unicode database paths and recognize short postgres: URLs. - Treat whitespace-only collection and member external IDs as absent and avoid redundant membership updates. - Align stable builds’ global IP classification with Rust’s standard library. Signed-off-by: BlackDex <black.dex@gmail.com> * Update crates and some fixes - Bump Rocket, rocket_ws, Diesel, SQLite bindings, and html5gum. - Reuse WebSocket payload buffers and detect upgrades from the response. - Match favicon rel tokens case-insensitively, honor the first base href, and stop scanning at the end of the head or the start of the body. Signed-off-by: BlackDex <black.dex@gmail.com> --------- Signed-off-by: BlackDex <black.dex@gmail.com>
83 lines
3.2 KiB
Rust
83 lines
3.2 KiB
Rust
use std::{env, io::Error, process::Command};
|
|
|
|
fn main() {
|
|
// These allow using e.g. #[cfg(mysql)] instead of #[cfg(feature = "mysql")], which helps when trying to add them through macros
|
|
#[cfg(feature = "sqlite_system")] // The `sqlite` feature implies this one.
|
|
println!("cargo:rustc-cfg=sqlite");
|
|
#[cfg(feature = "mysql")]
|
|
println!("cargo:rustc-cfg=mysql");
|
|
#[cfg(feature = "postgresql")]
|
|
println!("cargo:rustc-cfg=postgresql");
|
|
#[cfg(not(any(feature = "sqlite_system", feature = "mysql", feature = "postgresql")))]
|
|
compile_error!(
|
|
"You need to enable one DB backend. To build with previous defaults do: cargo build --features sqlite"
|
|
);
|
|
|
|
#[cfg(feature = "s3")]
|
|
println!("cargo:rustc-cfg=s3");
|
|
|
|
// Rerun when these paths are changed.
|
|
// Someone could have checked-out a tag or specific commit, but no other files changed.
|
|
println!("cargo:rerun-if-changed=.git");
|
|
println!("cargo:rerun-if-changed=.git/HEAD");
|
|
println!("cargo:rerun-if-changed=.git/index");
|
|
println!("cargo:rerun-if-changed=.git/refs/tags");
|
|
|
|
// Support $BWRS_VERSION for legacy compatibility, but default to $VW_VERSION.
|
|
// If neither exist, read from git.
|
|
let maybe_vaultwarden_version =
|
|
env::var("VW_VERSION").or_else(|_| env::var("BWRS_VERSION")).or_else(|_| version_from_git_info());
|
|
|
|
if let Ok(version) = maybe_vaultwarden_version {
|
|
println!("cargo:rustc-env=VW_VERSION={version}");
|
|
println!("cargo:rustc-env=CARGO_PKG_VERSION={version}");
|
|
}
|
|
}
|
|
|
|
fn run(args: &[&str]) -> Result<String, Error> {
|
|
let out = Command::new(args[0]).args(&args[1..]).output()?;
|
|
if !out.status.success() {
|
|
return Err(Error::other("Command not successful"));
|
|
}
|
|
Ok(String::from_utf8(out.stdout).unwrap().trim().to_owned())
|
|
}
|
|
|
|
/// This method reads info from Git, namely tags, branch, and revision
|
|
/// To access these values, use:
|
|
/// - `env!("GIT_EXACT_TAG")`
|
|
/// - `env!("GIT_LAST_TAG")`
|
|
/// - `env!("GIT_BRANCH")`
|
|
/// - `env!("GIT_REV")`
|
|
/// - `env!("VW_VERSION")`
|
|
fn version_from_git_info() -> Result<String, Error> {
|
|
// The exact tag for the current commit, can be empty when
|
|
// the current commit doesn't have an associated tag
|
|
let exact_tag = run(&["git", "describe", "--abbrev=0", "--tags", "--exact-match"]).ok();
|
|
if let Some(ref exact) = exact_tag {
|
|
println!("cargo:rustc-env=GIT_EXACT_TAG={exact}");
|
|
}
|
|
|
|
// The last available tag, equal to exact_tag when
|
|
// the current commit is tagged
|
|
let last_tag = run(&["git", "describe", "--abbrev=0", "--tags"])?;
|
|
println!("cargo:rustc-env=GIT_LAST_TAG={last_tag}");
|
|
|
|
// The current branch name
|
|
let branch = run(&["git", "rev-parse", "--abbrev-ref", "HEAD"])?;
|
|
println!("cargo:rustc-env=GIT_BRANCH={branch}");
|
|
|
|
// The current git commit hash
|
|
let rev = run(&["git", "rev-parse", "HEAD"])?;
|
|
let rev_short = rev.get(..8).unwrap_or_default();
|
|
println!("cargo:rustc-env=GIT_REV={rev_short}");
|
|
|
|
// Combined version
|
|
if let Some(exact) = exact_tag {
|
|
Ok(exact)
|
|
} else if &branch != "main" && &branch != "master" && &branch != "HEAD" {
|
|
Ok(format!("{last_tag}-{rev_short} ({branch})"))
|
|
} else {
|
|
Ok(format!("{last_tag}-{rev_short}"))
|
|
}
|
|
}
|