mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2024-11-16 02:07:08 +00:00
8ab200224e
* Fix BWDC when re-run with cleared cache Using the BWDC with a cleared cache caused invited users to be converted to accepted users. The problem was a wrong check for the `restore` function. Fixes #4114 * Remove useless variable During some refactoring this seems to be overlooked. This variable gets filled but isn't used at all afterwards. Fixes #4105 * Check some `.git` paths to force a rebuild When a checked-out repo switches to a specific tag, and that tag does not have anything else changed in the files except the tag, it could happen that the build process doesn't see any changes, while it could be that the version string needs to be different. This commit ensures that if some specific paths are changed within the .git directory, cargo will be triggered to rebuild. Fixes #4087 * Do not delete dir on file delete Previously during a `delete_file` check we also tried to delete the parent directory and ignored all errors, like not being empty for example. Since this function is called `delete_file` and does not mention anything in regards to a directory i have removed that code and it will now only delete the file and leave the rest as-is. If this somehow is still needed or wanted, which i do not think we want, then we should create a new function. Fixes #4081 * Fix healthcheck when using an ENV file If someone is using a `.env` file or configured the `ENV_FILE` variable to use that as it's configuration, this was missed by the healthcheck. So, `DOMAIN` and `ROCKET_TLS` were not seen, and not used in these cases. This commit fixes this by checking for this file and if it exists, then it will load those variables first. Fixes #4112 * Add missing route While there was a function and a derive, this endpoint wasn't part of the routes. Since Bitwarden does have this endpoint ill add the route instead of deleting it. Fixes #4076 Fixes #4144 * Update crates to update the openssl crate Because of a bug in the openssl-sys crate we pinned the version to an older version. This issue has been fixed and was released 2 days ago. This commit updates the openssl crates including others. This should also fix the issues with building Vaultwarden using newer versions of LibreSSL. Fixes #4051
86 lines
3.3 KiB
Rust
86 lines
3.3 KiB
Rust
use std::env;
|
|
use std::process::Command;
|
|
|
|
fn main() {
|
|
// This allow using #[cfg(sqlite)] instead of #[cfg(feature = "sqlite")], which helps when trying to add them through macros
|
|
#[cfg(feature = "sqlite")]
|
|
println!("cargo:rustc-cfg=sqlite");
|
|
#[cfg(feature = "mysql")]
|
|
println!("cargo:rustc-cfg=mysql");
|
|
#[cfg(feature = "postgresql")]
|
|
println!("cargo:rustc-cfg=postgresql");
|
|
#[cfg(feature = "query_logger")]
|
|
println!("cargo:rustc-cfg=query_logger");
|
|
|
|
#[cfg(not(any(feature = "sqlite", feature = "mysql", feature = "postgresql")))]
|
|
compile_error!(
|
|
"You need to enable one DB backend. To build with previous defaults do: cargo build --features sqlite"
|
|
);
|
|
|
|
#[cfg(all(not(debug_assertions), feature = "query_logger"))]
|
|
compile_error!("Query Logging is only allowed during development, it is not intended for production usage!");
|
|
|
|
// 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, std::io::Error> {
|
|
let out = Command::new(args[0]).args(&args[1..]).output()?;
|
|
if !out.status.success() {
|
|
use std::io::{Error, ErrorKind};
|
|
return Err(Error::new(ErrorKind::Other, "Command not successful"));
|
|
}
|
|
Ok(String::from_utf8(out.stdout).unwrap().trim().to_string())
|
|
}
|
|
|
|
/// 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, std::io::Error> {
|
|
// 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/HEAD");
|
|
println!("cargo:rerun-if-changed=.git/refs/tags/");
|
|
|
|
// 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}"))
|
|
}
|
|
}
|